From 48b371ee9e343e9cb6a8d85bca4f1483615007a5 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 10 Sep 2023 18:58:34 +0000 Subject: [PATCH] update --- Controller/ApiDriverAttributeController.php | 8 ++++---- Controller/ApiDriverController.php | 4 ++-- Controller/ApiVehicleAttributeController.php | 8 ++++---- Controller/ApiVehicleController.php | 2 +- Controller/BackendController.php | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Controller/ApiDriverAttributeController.php b/Controller/ApiDriverAttributeController.php index f256ae5..959bd56 100644 --- a/Controller/ApiDriverAttributeController.php +++ b/Controller/ApiDriverAttributeController.php @@ -327,7 +327,7 @@ final class ApiDriverAttributeController extends Controller return; } - /** @var \Modules\FleetManagement\Models\DriverAttributeTypeL11n $driverAttributeTypeL11n */ + /** @var BaseStringL11n $driverAttributeTypeL11n */ $driverAttributeTypeL11n = DriverAttributeTypeL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); $this->deleteModel($request->header->account, $driverAttributeTypeL11n, DriverAttributeTypeL11nMapper::class, 'driver_attribute_type_l11n', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $driverAttributeTypeL11n); @@ -387,7 +387,7 @@ final class ApiDriverAttributeController extends Controller return; } - /** @var \Modules\FleetManagement\Models\DriverAttributeType $driverAttributeType */ + /** @var AttributeType $driverAttributeType */ $driverAttributeType = DriverAttributeTypeMapper::get()->where('id', (int) $request->getData('id'))->execute(); $this->deleteModel($request->header->account, $driverAttributeType, DriverAttributeTypeMapper::class, 'driver_attribute_type', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $driverAttributeType); @@ -418,7 +418,7 @@ final class ApiDriverAttributeController extends Controller /** @var AttributeValue $old */ $old = DriverAttributeValueMapper::get()->where('id', (int) $request->getData('id'))->execute(); - /** @var \Modules\Attribute\Models\Attribute $type */ + /** @var \Modules\Attribute\Models\Attribute $attr */ $attr = DriverAttributeMapper::get() ->with('type') ->where('id', $request->getDataInt('attribute') ?? 0) @@ -514,7 +514,7 @@ final class ApiDriverAttributeController extends Controller return; } - /** @var \Modules\FleetManagement\Models\DriverAttributeValueL11n $driverAttributeValueL11n */ + /** @var BaseStringL11n $driverAttributeValueL11n */ $driverAttributeValueL11n = DriverAttributeValueL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); $this->deleteModel($request->header->account, $driverAttributeValueL11n, DriverAttributeValueL11nMapper::class, 'driver_attribute_value_l11n', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $driverAttributeValueL11n); diff --git a/Controller/ApiDriverController.php b/Controller/ApiDriverController.php index 06285ab..bb9249f 100644 --- a/Controller/ApiDriverController.php +++ b/Controller/ApiDriverController.php @@ -70,7 +70,7 @@ final class ApiDriverController extends Controller return; } - /** @var \Modules\FleetManagement\Models\DriverInspection $inspection */ + /** @var Inspection $inspection */ $inspection = $this->createInspectionFromRequest($request); $this->createModel($request->header->account, $inspection, DriverInspectionMapper::class, 'inspection', $request->getOrigin()); $this->createStandardCreateResponse($request, $response, $inspection); @@ -90,7 +90,7 @@ final class ApiDriverController extends Controller $inspection = new Inspection(); $inspection->reference = (int) $request->getData('ref'); $inspection->description = $request->getDataString('description') ?? ''; - $inspection->status = (int) $request->getDataInt('status') ?? InspectionStatus::TODO; + $inspection->status = $request->getDataInt('status') ?? InspectionStatus::TODO; $inspection->next = $request->getDataDateTime('next') ?? null; $inspection->date = $request->getDataDateTime('date') ?? null; $inspection->interval = $request->getDataInt('interval') ?? 0; diff --git a/Controller/ApiVehicleAttributeController.php b/Controller/ApiVehicleAttributeController.php index 773d641..d8871c7 100644 --- a/Controller/ApiVehicleAttributeController.php +++ b/Controller/ApiVehicleAttributeController.php @@ -327,7 +327,7 @@ final class ApiVehicleAttributeController extends Controller return; } - /** @var \Modules\FleetManagement\Models\VehicleAttributeTypeL11n $vehicleAttributeTypeL11n */ + /** @var BaseStringL11n $vehicleAttributeTypeL11n */ $vehicleAttributeTypeL11n = VehicleAttributeTypeL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); $this->deleteModel($request->header->account, $vehicleAttributeTypeL11n, VehicleAttributeTypeL11nMapper::class, 'vehicle_attribute_type_l11n', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $vehicleAttributeTypeL11n); @@ -387,7 +387,7 @@ final class ApiVehicleAttributeController extends Controller return; } - /** @var \Modules\FleetManagement\Models\VehicleAttributeType $vehicleAttributeType */ + /** @var AttributeType $vehicleAttributeType */ $vehicleAttributeType = VehicleAttributeTypeMapper::get()->where('id', (int) $request->getData('id'))->execute(); $this->deleteModel($request->header->account, $vehicleAttributeType, VehicleAttributeTypeMapper::class, 'vehicle_attribute_type', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $vehicleAttributeType); @@ -418,7 +418,7 @@ final class ApiVehicleAttributeController extends Controller /** @var AttributeValue $old */ $old = VehicleAttributeValueMapper::get()->where('id', (int) $request->getData('id'))->execute(); - /** @var \Modules\Attribute\Models\Attribute $type */ + /** @var \Modules\Attribute\Models\Attribute $attr */ $attr = VehicleAttributeMapper::get() ->with('type') ->where('id', $request->getDataInt('attribute') ?? 0) @@ -514,7 +514,7 @@ final class ApiVehicleAttributeController extends Controller return; } - /** @var \Modules\FleetManagement\Models\VehicleAttributeValueL11n $vehicleAttributeValueL11n */ + /** @var BaseStringL11n $vehicleAttributeValueL11n */ $vehicleAttributeValueL11n = VehicleAttributeValueL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); $this->deleteModel($request->header->account, $vehicleAttributeValueL11n, VehicleAttributeValueL11nMapper::class, 'vehicle_attribute_value_l11n', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $vehicleAttributeValueL11n); diff --git a/Controller/ApiVehicleController.php b/Controller/ApiVehicleController.php index 489c24e..5fc3fe4 100755 --- a/Controller/ApiVehicleController.php +++ b/Controller/ApiVehicleController.php @@ -170,7 +170,7 @@ final class ApiVehicleController extends Controller $inspection = new Inspection(); $inspection->reference = (int) $request->getData('ref'); $inspection->description = $request->getDataString('description') ?? ''; - $inspection->status = (int) $request->getDataInt('status') ?? InspectionStatus::TODO; + $inspection->status = $request->getDataInt('status') ?? InspectionStatus::TODO; $inspection->next = $request->getDataDateTime('next') ?? null; $inspection->date = $request->getDataDateTime('date') ?? null; $inspection->interval = $request->getDataInt('interval') ?? 0; diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 82adfb0..0ea4d5e 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -386,8 +386,8 @@ final class BackendController extends Controller $view->data['attributeView'] = new \Modules\Attribute\Theme\Backend\Components\AttributeView($this->app->l11nManager, $request, $response); $view->data['attributeView']->data['defaultlocalization'] = LocalizationMapper::get()->where('id', (int) $settings->id)->execute(); - $view->data['media-upload'] = new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response); - $view->data['driver-notes'] = new \Modules\Editor\Theme\Backend\Components\Compound\BaseView($this->app->l11nManager, $request, $response); + $view->data['media-upload'] = new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response); + $view->data['driver-notes'] = new \Modules\Editor\Theme\Backend\Components\Compound\BaseView($this->app->l11nManager, $request, $response); return $view; }