Jingga/oms-FleetManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-FleetManagement.git synced 2026-02-16 13:28:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use direct data access for response data

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-30 03:42:46 +02:00
parent 2951f6d275
commit 2ea7a004d6
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Controller/ApiController.php
View File

@ -75,7 +75,7 @@ final class ApiController extends Controller
public function apiVehicleTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiVehicleTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateVehicleTypeCreate($request))) { if (!empty($val = $this->validateVehicleTypeCreate($request))) {
$response->set($request->uri->__toString(), new FormValidation($val)); $response->data[$request->uri->__toString()] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
@ -150,7 +150,7 @@ final class ApiController extends Controller
public function apiVehicleTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiVehicleTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateVehicleTypeL11nCreate($request))) { if (!empty($val = $this->validateVehicleTypeL11nCreate($request))) {
$response->set('vehicle_type_l11n_create', new FormValidation($val)); $response->data['vehicle_type_l11n_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
@ -219,7 +219,7 @@ final class ApiController extends Controller
public function apiFuelTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiFuelTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateFuelTypeCreate($request))) { if (!empty($val = $this->validateFuelTypeCreate($request))) {
$response->set($request->uri->__toString(), new FormValidation($val)); $response->data[$request->uri->__toString()] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
@ -294,7 +294,7 @@ final class ApiController extends Controller
public function apiFuelTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiFuelTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateFuelTypeL11nCreate($request))) { if (!empty($val = $this->validateFuelTypeL11nCreate($request))) {
$response->set('fuel_type_l11n_create', new FormValidation($val)); $response->data['fuel_type_l11n_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
@ -363,7 +363,7 @@ final class ApiController extends Controller
public function apiVehicleCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiVehicleCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateVehicleCreate($request))) { if (!empty($val = $this->validateVehicleCreate($request))) {
$response->set($request->uri->__toString(), new FormValidation($val)); $response->data[$request->uri->__toString()] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
@ -373,7 +373,7 @@ final class ApiController extends Controller
$vehicle = $this->createVehicleFromRequest($request); $vehicle = $this->createVehicleFromRequest($request);
$this->createModel($request->header->account, $vehicle, VehicleMapper::class, 'vehicle', $request->getOrigin()); $this->createModel($request->header->account, $vehicle, VehicleMapper::class, 'vehicle', $request->getOrigin());
if (!empty($request->getFiles()) if (!empty($request->files)
|| !empty($request->getDataJson('media')) || !empty($request->getDataJson('media'))
) { ) {
$this->createVehicleMedia($vehicle, $request); $this->createVehicleMedia($vehicle, $request);
@ -425,7 +425,7 @@ final class ApiController extends Controller
{ {
$path = $this->createVehicleDir($vehicle); $path = $this->createVehicleDir($vehicle);
if (!empty($uploadedFiles = $request->getFiles())) { if (!empty($uploadedFiles = $request->files)) {
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles( $uploaded = $this->app->moduleManager->get('Media')->uploadFiles(
names: [], names: [],
fileNames: [], fileNames: [],
@ -561,7 +561,7 @@ final class ApiController extends Controller
public function apiVehicleAttributeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiVehicleAttributeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateVehicleAttributeCreate($request))) { if (!empty($val = $this->validateVehicleAttributeCreate($request))) {
$response->set('attribute_create', new FormValidation($val)); $response->data['attribute_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
@ -640,7 +640,7 @@ final class ApiController extends Controller
public function apiVehicleAttributeUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiVehicleAttributeUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateVehicleAttributeUpdate($request))) { if (!empty($val = $this->validateVehicleAttributeUpdate($request))) {
$response->set('attribute_update', new FormValidation($val)); $response->data['attribute_update'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
@ -730,7 +730,7 @@ final class ApiController extends Controller
public function apiVehicleAttributeTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiVehicleAttributeTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateVehicleAttributeTypeL11nCreate($request))) { if (!empty($val = $this->validateVehicleAttributeTypeL11nCreate($request))) {
$response->set('attr_type_l11n_create', new FormValidation($val)); $response->data['attr_type_l11n_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
@ -799,7 +799,7 @@ final class ApiController extends Controller
public function apiVehicleAttributeTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiVehicleAttributeTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateVehicleAttributeTypeCreate($request))) { if (!empty($val = $this->validateVehicleAttributeTypeCreate($request))) {
$response->set('attr_type_create', new FormValidation($val)); $response->data['attr_type_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
@ -870,7 +870,7 @@ final class ApiController extends Controller
public function apiVehicleAttributeValueCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiVehicleAttributeValueCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateVehicleAttributeValueCreate($request))) { if (!empty($val = $this->validateVehicleAttributeValueCreate($request))) {
$response->set('attr_value_create', new FormValidation($val)); $response->data['attr_value_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
@ -955,7 +955,7 @@ final class ApiController extends Controller
public function apiVehicleAttributeValueL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiVehicleAttributeValueL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateVehicleAttributeValueL11nCreate($request))) { if (!empty($val = $this->validateVehicleAttributeValueL11nCreate($request))) {
$response->set('attr_value_l11n_create', new FormValidation($val)); $response->data['attr_value_l11n_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
@ -1024,7 +1024,7 @@ final class ApiController extends Controller
public function apiVehicleAttribute(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiVehicleAttribute(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateVehicleAttributeValueL11nCreate($request))) { if (!empty($val = $this->validateVehicleAttributeValueL11nCreate($request))) {
$response->set('attr_value_l11n_create', new FormValidation($val)); $response->data['attr_value_l11n_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
@ -1051,7 +1051,7 @@ final class ApiController extends Controller
public function apiMediaAddToVehicle(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiMediaAddToVehicle(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateMediaAddToVehicle($request))) { if (!empty($val = $this->validateMediaAddToVehicle($request))) {
$response->set($request->uri->__toString(), new FormValidation($val)); $response->data[$request->uri->__toString()] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
@ -1062,7 +1062,7 @@ final class ApiController extends Controller
$path = $this->createVehicleDir($vehicle); $path = $this->createVehicleDir($vehicle);
$uploaded = []; $uploaded = [];
if (!empty($uploadedFiles = $request->getFiles())) { if (!empty($uploadedFiles = $request->files)) {
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles( $uploaded = $this->app->moduleManager->get('Media')->uploadFiles(
names: [], names: [],
fileNames: [], fileNames: [],
@ -1171,7 +1171,7 @@ final class ApiController extends Controller
private function validateMediaAddToVehicle(RequestAbstract $request) : array private function validateMediaAddToVehicle(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['media'] = (!$request->hasData('media') && empty($request->getFiles()))) if (($val['media'] = (!$request->hasData('media') && empty($request->files)))
|| ($val['vehicle'] = !$request->hasData('vehicle')) || ($val['vehicle'] = !$request->hasData('vehicle'))
) { ) {
return $val; return $val;
@ -1196,7 +1196,7 @@ final class ApiController extends Controller
public function apiInspectionTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiInspectionTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateInspectionTypeCreate($request))) { if (!empty($val = $this->validateInspectionTypeCreate($request))) {
$response->set($request->uri->__toString(), new FormValidation($val)); $response->data[$request->uri->__toString()] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
@ -1271,7 +1271,7 @@ final class ApiController extends Controller
public function apiInspectionTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiInspectionTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateInspectionTypeL11nCreate($request))) { if (!empty($val = $this->validateInspectionTypeL11nCreate($request))) {
$response->set('inspection_type_l11n_create', new FormValidation($val)); $response->data['inspection_type_l11n_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;

2
Theme/Backend/vehicle-profile.tpl.php
View File

@ -25,7 +25,7 @@ $vehicleStatus = VehicleStatus::getConstants();
* @var \Modules\FleetManagement\Models\Vehicle $vehicle * @var \Modules\FleetManagement\Models\Vehicle $vehicle
*/ */
$vehicle = $this->getData('vehicle') ?? new NullVehicle(); $vehicle = $this->getData('vehicle') ?? new NullVehicle();
$files = $vehicle->getFiles(); $files = $vehicle->files;
$vehicleImage = $this->getData('vehicleImage') ?? new NullMedia(); $vehicleImage = $this->getData('vehicleImage') ?? new NullMedia();
$vehicleTypes = $this->getData('types') ?? []; $vehicleTypes = $this->getData('types') ?? [];