From d0a2677634acf03b8eb0202a4d9f0e6635661b14 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 30 Aug 2023 12:08:09 +0000 Subject: [PATCH] autofixes --- Controller/ApiDriverAttributeController.php | 1 - Controller/ApiDriverController.php | 18 +++---- Controller/ApiVehicleAttributeController.php | 1 - Controller/ApiVehicleController.php | 36 ++++++------- Controller/BackendController.php | 4 +- Models/Attribute/DriverAttributeMapper.php | 6 +-- Models/Attribute/VehicleAttributeMapper.php | 6 +-- Models/Driver/DriverInspectionMapper.php | 2 +- Models/Driver/DriverMapper.php | 6 +-- Models/InspectionMapper.php | 3 +- Models/Milage.php | 3 ++ Models/MilageMapper.php | 16 +++--- Models/VehicleMapper.php | 4 +- Theme/Backend/Lang/Navigation.en.lang.php | 12 ++--- Theme/Backend/Lang/en.lang.php | 56 ++++++++++---------- Theme/Backend/driver-profile.tpl.php | 8 +-- Theme/Backend/vehicle-profile.tpl.php | 6 +-- 17 files changed, 94 insertions(+), 94 deletions(-) diff --git a/Controller/ApiDriverAttributeController.php b/Controller/ApiDriverAttributeController.php index e4d479e..f256ae5 100644 --- a/Controller/ApiDriverAttributeController.php +++ b/Controller/ApiDriverAttributeController.php @@ -446,7 +446,6 @@ final class ApiDriverAttributeController extends Controller public function apiDriverAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { return; - // @todo: I don't think values can be deleted? Only Attributes // However, It should be possible to remove UNUSED default values // either here or other function? diff --git a/Controller/ApiDriverController.php b/Controller/ApiDriverController.php index 12d97fa..06285ab 100644 --- a/Controller/ApiDriverController.php +++ b/Controller/ApiDriverController.php @@ -15,10 +15,10 @@ declare(strict_types=1); namespace Modules\FleetManagement\Controller; use Modules\Admin\Models\NullAccount; -use Modules\FleetManagement\Models\Driver\DriverInspectionTypeL11nMapper; -use Modules\FleetManagement\Models\Driver\DriverInspectionTypeMapper; use Modules\FleetManagement\Models\Driver\Driver; use Modules\FleetManagement\Models\Driver\DriverInspectionMapper; +use Modules\FleetManagement\Models\Driver\DriverInspectionTypeL11nMapper; +use Modules\FleetManagement\Models\Driver\DriverInspectionTypeMapper; use Modules\FleetManagement\Models\Driver\DriverMapper; use Modules\FleetManagement\Models\Driver\DriverStatus; use Modules\FleetManagement\Models\Inspection; @@ -87,14 +87,14 @@ final class ApiDriverController extends Controller */ public function createInspectionFromRequest(RequestAbstract $request) : Inspection { - $inspection = new Inspection(); - $inspection->reference = (int) $request->getData('ref'); + $inspection = new Inspection(); + $inspection->reference = (int) $request->getData('ref'); $inspection->description = $request->getDataString('description') ?? ''; - $inspection->status = (int) $request->getDataInt('status') ?? InspectionStatus::TODO; - $inspection->next = $request->getDataDateTime('next') ?? null; - $inspection->date = $request->getDataDateTime('date') ?? null; - $inspection->interval = $request->getDataInt('interval') ?? 0; - $inspection->type = new NullBaseStringL11nType((int) $request->getData('type')); + $inspection->status = (int) $request->getDataInt('status') ?? InspectionStatus::TODO; + $inspection->next = $request->getDataDateTime('next') ?? null; + $inspection->date = $request->getDataDateTime('date') ?? null; + $inspection->interval = $request->getDataInt('interval') ?? 0; + $inspection->type = new NullBaseStringL11nType((int) $request->getData('type')); return $inspection; } diff --git a/Controller/ApiVehicleAttributeController.php b/Controller/ApiVehicleAttributeController.php index c40475d..773d641 100644 --- a/Controller/ApiVehicleAttributeController.php +++ b/Controller/ApiVehicleAttributeController.php @@ -446,7 +446,6 @@ final class ApiVehicleAttributeController extends Controller public function apiVehicleAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { return; - // @todo: I don't think values can be deleted? Only Attributes // However, It should be possible to remove UNUSED default values // either here or other function? diff --git a/Controller/ApiVehicleController.php b/Controller/ApiVehicleController.php index 54fc498..489c24e 100755 --- a/Controller/ApiVehicleController.php +++ b/Controller/ApiVehicleController.php @@ -16,11 +16,11 @@ namespace Modules\FleetManagement\Controller; use Modules\Admin\Models\NullAccount; use Modules\FleetManagement\Models\Driver\NullDriver; -use Modules\FleetManagement\Models\InspectionStatus; use Modules\FleetManagement\Models\FuelTypeL11nMapper; use Modules\FleetManagement\Models\FuelTypeMapper; use Modules\FleetManagement\Models\Inspection; use Modules\FleetManagement\Models\InspectionMapper; +use Modules\FleetManagement\Models\InspectionStatus; use Modules\FleetManagement\Models\InspectionTypeL11nMapper; use Modules\FleetManagement\Models\InspectionTypeMapper; use Modules\FleetManagement\Models\Milage; @@ -94,17 +94,17 @@ final class ApiVehicleController extends Controller */ public function createMilageFromRequest(RequestAbstract $request) : Milage { - $milage = new Milage(); - $milage->vehicle = (int) $request->getData('vehicle'); - $milage->driver = $request->hasData('driver') ? new NullDriver((int) $request->getData('driver')) : null; - $milage->milage = $request->getDataInt('milage') ?? 0; - $milage->status = $request->getDataInt('status') ?? 0; - $milage->fuelUsage = $request->getDataInt('fuel') ?? 0; + $milage = new Milage(); + $milage->vehicle = (int) $request->getData('vehicle'); + $milage->driver = $request->hasData('driver') ? new NullDriver((int) $request->getData('driver')) : null; + $milage->milage = $request->getDataInt('milage') ?? 0; + $milage->status = $request->getDataInt('status') ?? 0; + $milage->fuelUsage = $request->getDataInt('fuel') ?? 0; $milage->description = $request->getDataString('description') ?? ''; - $milage->from = $request->getDataString('from') ?? ''; - $milage->to = $request->getDataString('to') ?? ''; - $milage->start = $request->getDataDateTime('start'); - $milage->end = $request->getDataDateTime('end'); + $milage->from = $request->getDataString('from') ?? ''; + $milage->to = $request->getDataString('to') ?? ''; + $milage->start = $request->getDataDateTime('start'); + $milage->end = $request->getDataDateTime('end'); return $milage; } @@ -167,14 +167,14 @@ final class ApiVehicleController extends Controller */ public function createInspectionFromRequest(RequestAbstract $request) : Inspection { - $inspection = new Inspection(); - $inspection->reference = (int) $request->getData('ref'); + $inspection = new Inspection(); + $inspection->reference = (int) $request->getData('ref'); $inspection->description = $request->getDataString('description') ?? ''; - $inspection->status = (int) $request->getDataInt('status') ?? InspectionStatus::TODO; - $inspection->next = $request->getDataDateTime('next') ?? null; - $inspection->date = $request->getDataDateTime('date') ?? null; - $inspection->interval = $request->getDataInt('interval') ?? 0; - $inspection->type = new NullBaseStringL11nType((int) $request->getData('type')); + $inspection->status = (int) $request->getDataInt('status') ?? InspectionStatus::TODO; + $inspection->next = $request->getDataDateTime('next') ?? null; + $inspection->date = $request->getDataDateTime('date') ?? null; + $inspection->interval = $request->getDataInt('interval') ?? 0; + $inspection->type = new NullBaseStringL11nType((int) $request->getData('type')); return $inspection; } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index ab03c04..82adfb0 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -16,10 +16,10 @@ namespace Modules\FleetManagement\Controller; use Modules\Admin\Models\LocalizationMapper; use Modules\Admin\Models\SettingsEnum; -use Modules\FleetManagement\Models\InspectionMapper; use Modules\FleetManagement\Models\Attribute\VehicleAttributeTypeL11nMapper; use Modules\FleetManagement\Models\Attribute\VehicleAttributeTypeMapper; use Modules\FleetManagement\Models\Driver\DriverMapper; +use Modules\FleetManagement\Models\InspectionMapper; use Modules\FleetManagement\Models\VehicleMapper; use Modules\FleetManagement\Models\VehicleTypeMapper; use Modules\Media\Models\MediaMapper; @@ -387,7 +387,7 @@ final class BackendController extends Controller $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['driver-notes'] = new \Modules\Editor\Theme\Backend\Components\Compound\BaseView($this->app->l11nManager, $request, $response); return $view; } diff --git a/Models/Attribute/DriverAttributeMapper.php b/Models/Attribute/DriverAttributeMapper.php index 222fd09..3443ea3 100644 --- a/Models/Attribute/DriverAttributeMapper.php +++ b/Models/Attribute/DriverAttributeMapper.php @@ -37,10 +37,10 @@ final class DriverAttributeMapper extends DataMapperFactory * @since 1.0.0 */ public const COLUMNS = [ - 'fleetmgmt_driver_attr_id' => ['name' => 'fleetmgmt_driver_attr_id', 'type' => 'int', 'internal' => 'id'], + 'fleetmgmt_driver_attr_id' => ['name' => 'fleetmgmt_driver_attr_id', 'type' => 'int', 'internal' => 'id'], 'fleetmgmt_driver_attr_driver' => ['name' => 'fleetmgmt_driver_attr_driver', 'type' => 'int', 'internal' => 'ref'], - 'fleetmgmt_driver_attr_type' => ['name' => 'fleetmgmt_driver_attr_type', 'type' => 'int', 'internal' => 'type'], - 'fleetmgmt_driver_attr_value' => ['name' => 'fleetmgmt_driver_attr_value', 'type' => 'int', 'internal' => 'value'], + 'fleetmgmt_driver_attr_type' => ['name' => 'fleetmgmt_driver_attr_type', 'type' => 'int', 'internal' => 'type'], + 'fleetmgmt_driver_attr_value' => ['name' => 'fleetmgmt_driver_attr_value', 'type' => 'int', 'internal' => 'value'], ]; /** diff --git a/Models/Attribute/VehicleAttributeMapper.php b/Models/Attribute/VehicleAttributeMapper.php index c3c39f3..ea68063 100644 --- a/Models/Attribute/VehicleAttributeMapper.php +++ b/Models/Attribute/VehicleAttributeMapper.php @@ -37,10 +37,10 @@ final class VehicleAttributeMapper extends DataMapperFactory * @since 1.0.0 */ public const COLUMNS = [ - 'fleetmgmt_vehicle_attr_id' => ['name' => 'fleetmgmt_vehicle_attr_id', 'type' => 'int', 'internal' => 'id'], + 'fleetmgmt_vehicle_attr_id' => ['name' => 'fleetmgmt_vehicle_attr_id', 'type' => 'int', 'internal' => 'id'], 'fleetmgmt_vehicle_attr_vehicle' => ['name' => 'fleetmgmt_vehicle_attr_vehicle', 'type' => 'int', 'internal' => 'ref'], - 'fleetmgmt_vehicle_attr_type' => ['name' => 'fleetmgmt_vehicle_attr_type', 'type' => 'int', 'internal' => 'type'], - 'fleetmgmt_vehicle_attr_value' => ['name' => 'fleetmgmt_vehicle_attr_value', 'type' => 'int', 'internal' => 'value'], + 'fleetmgmt_vehicle_attr_type' => ['name' => 'fleetmgmt_vehicle_attr_type', 'type' => 'int', 'internal' => 'type'], + 'fleetmgmt_vehicle_attr_value' => ['name' => 'fleetmgmt_vehicle_attr_value', 'type' => 'int', 'internal' => 'value'], ]; /** diff --git a/Models/Driver/DriverInspectionMapper.php b/Models/Driver/DriverInspectionMapper.php index 5b7ef65..f7be7bd 100644 --- a/Models/Driver/DriverInspectionMapper.php +++ b/Models/Driver/DriverInspectionMapper.php @@ -38,7 +38,7 @@ final class DriverInspectionMapper extends DataMapperFactory */ public const COLUMNS = [ 'fleetmgmt_driver_inspection_id' => ['name' => 'fleetmgmt_driver_inspection_id', 'type' => 'int', 'internal' => 'id'], - 'fleetmgmt_driver_inspection_driver' => ['name' => 'fleetmgmt_driver_inspection_driver', 'type' => 'int', 'internal' => 'reference'], + 'fleetmgmt_driver_inspection_driver' => ['name' => 'fleetmgmt_driver_inspection_driver', 'type' => 'int', 'internal' => 'reference'], 'fleetmgmt_driver_inspection_description' => ['name' => 'fleetmgmt_driver_inspection_description', 'type' => 'string', 'internal' => 'description'], 'fleetmgmt_driver_inspection_status' => ['name' => 'fleetmgmt_driver_inspection_status', 'type' => 'int', 'internal' => 'status'], 'fleetmgmt_driver_inspection_interval' => ['name' => 'fleetmgmt_driver_inspection_interval', 'type' => 'int', 'internal' => 'interval'], diff --git a/Models/Driver/DriverMapper.php b/Models/Driver/DriverMapper.php index dc6d888..9994024 100644 --- a/Models/Driver/DriverMapper.php +++ b/Models/Driver/DriverMapper.php @@ -15,10 +15,10 @@ declare(strict_types=1); namespace Modules\FleetManagement\Models\Driver; use Modules\Admin\Models\AccountMapper; -use Modules\Media\Models\MediaMapper; -use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; use Modules\Editor\Models\EditorDocMapper; use Modules\FleetManagement\Models\Attribute\DriverAttributeMapper; +use Modules\Media\Models\MediaMapper; +use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; /** * Mapper class. @@ -42,7 +42,7 @@ final class DriverMapper extends DataMapperFactory public const COLUMNS = [ 'fleetmgmt_driver_id' => ['name' => 'fleetmgmt_driver_id', 'type' => 'int', 'internal' => 'id'], 'fleetmgmt_driver_status' => ['name' => 'fleetmgmt_driver_status', 'type' => 'int', 'internal' => 'status'], - 'fleetmgmt_driver_account' => ['name' => 'fleetmgmt_driver_account', 'type' => 'int', 'internal' => 'account'], + 'fleetmgmt_driver_account' => ['name' => 'fleetmgmt_driver_account', 'type' => 'int', 'internal' => 'account'], ]; /** diff --git a/Models/InspectionMapper.php b/Models/InspectionMapper.php index a087540..d6af791 100644 --- a/Models/InspectionMapper.php +++ b/Models/InspectionMapper.php @@ -15,7 +15,6 @@ declare(strict_types=1); namespace Modules\FleetManagement\Models; use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; -use phpOMS\Localization\BaseStringL11n; /** * mapper class. @@ -38,7 +37,7 @@ final class InspectionMapper extends DataMapperFactory */ public const COLUMNS = [ 'fleetmgmt_vehicle_inspection_id' => ['name' => 'fleetmgmt_vehicle_inspection_id', 'type' => 'int', 'internal' => 'id'], - 'fleetmgmt_vehicle_inspection_vehicle' => ['name' => 'fleetmgmt_vehicle_inspection_vehicle', 'type' => 'int', 'internal' => 'reference'], + 'fleetmgmt_vehicle_inspection_vehicle' => ['name' => 'fleetmgmt_vehicle_inspection_vehicle', 'type' => 'int', 'internal' => 'reference'], 'fleetmgmt_vehicle_inspection_description' => ['name' => 'fleetmgmt_vehicle_inspection_description', 'type' => 'string', 'internal' => 'description'], 'fleetmgmt_vehicle_inspection_status' => ['name' => 'fleetmgmt_vehicle_inspection_status', 'type' => 'int', 'internal' => 'status'], 'fleetmgmt_vehicle_inspection_interval' => ['name' => 'fleetmgmt_vehicle_inspection_interval', 'type' => 'int', 'internal' => 'interval'], diff --git a/Models/Milage.php b/Models/Milage.php index 889aa71..4874b71 100644 --- a/Models/Milage.php +++ b/Models/Milage.php @@ -29,12 +29,15 @@ class Milage implements \JsonSerializable public int $id = 0; public int $vehicle = 0; + public ?Driver $driver = null; public ?\DateTime $start = null; + public ?\DateTime $end = null; public string $from = ''; + public string $to = ''; /** diff --git a/Models/MilageMapper.php b/Models/MilageMapper.php index 361b740..69d8163 100644 --- a/Models/MilageMapper.php +++ b/Models/MilageMapper.php @@ -37,15 +37,15 @@ final class MilageMapper extends DataMapperFactory * @since 1.0.0 */ public const COLUMNS = [ - 'fleetmgmt_milage_id' => ['name' => 'fleetmgmt_milage_id', 'type' => 'int', 'internal' => 'id'], - 'fleetmgmt_milage_description' => ['name' => 'fleetmgmt_milage_description', 'type' => 'string', 'internal' => 'description'], - 'fleetmgmt_milage_status' => ['name' => 'fleetmgmt_milage_status', 'type' => 'int', 'internal' => 'status'], - 'fleetmgmt_milage_driver' => ['name' => 'fleetmgmt_milage_driver', 'type' => 'int', 'internal' => 'driver'], - 'fleetmgmt_milage_vehicle' => ['name' => 'fleetmgmt_milage_vehicle', 'type' => 'int', 'internal' => 'vehicle'], - 'fleetmgmt_milage_start' => ['name' => 'fleetmgmt_milage_start', 'type' => 'DateTime', 'internal' => 'start'], - 'fleetmgmt_milage_end' => ['name' => 'fleetmgmt_milage_end', 'type' => 'DateTime', 'internal' => 'end'], + 'fleetmgmt_milage_id' => ['name' => 'fleetmgmt_milage_id', 'type' => 'int', 'internal' => 'id'], + 'fleetmgmt_milage_description' => ['name' => 'fleetmgmt_milage_description', 'type' => 'string', 'internal' => 'description'], + 'fleetmgmt_milage_status' => ['name' => 'fleetmgmt_milage_status', 'type' => 'int', 'internal' => 'status'], + 'fleetmgmt_milage_driver' => ['name' => 'fleetmgmt_milage_driver', 'type' => 'int', 'internal' => 'driver'], + 'fleetmgmt_milage_vehicle' => ['name' => 'fleetmgmt_milage_vehicle', 'type' => 'int', 'internal' => 'vehicle'], + 'fleetmgmt_milage_start' => ['name' => 'fleetmgmt_milage_start', 'type' => 'DateTime', 'internal' => 'start'], + 'fleetmgmt_milage_end' => ['name' => 'fleetmgmt_milage_end', 'type' => 'DateTime', 'internal' => 'end'], 'fleetmgmt_milage_milage' => ['name' => 'fleetmgmt_milage_milage', 'type' => 'int', 'internal' => 'milage'], - 'fleetmgmt_milage_fuel' => ['name' => 'fleetmgmt_milage_fuel', 'type' => 'int', 'internal' => 'fuelUsage'], + 'fleetmgmt_milage_fuel' => ['name' => 'fleetmgmt_milage_fuel', 'type' => 'int', 'internal' => 'fuelUsage'], ]; /** diff --git a/Models/VehicleMapper.php b/Models/VehicleMapper.php index cb099e9..d0c9b36 100644 --- a/Models/VehicleMapper.php +++ b/Models/VehicleMapper.php @@ -14,10 +14,10 @@ declare(strict_types=1); namespace Modules\FleetManagement\Models; -use Modules\Media\Models\MediaMapper; -use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; use Modules\Editor\Models\EditorDocMapper; use Modules\FleetManagement\Models\Attribute\VehicleAttributeMapper; +use Modules\Media\Models\MediaMapper; +use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; /** * Mapper class. diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index 138fd60..adab256 100755 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -13,12 +13,12 @@ declare(strict_types=1); return ['Navigation' => [ - 'FleetManagement' => 'Fleet Management', - 'Vehicles' => 'Vehicles', - 'Drivers' => 'Drivers', - 'Inspections' => 'Inspections', + 'FleetManagement' => 'Fleet Management', + 'Vehicles' => 'Vehicles', + 'Drivers' => 'Drivers', + 'Inspections' => 'Inspections', 'VehicleInspectionTypes' => 'Vehicle Inspection Types', 'DriverInspectionTypes' => 'Driver Inspection Types', - 'VehicleAttributes' => 'Vehicle Attributes', - 'DriverAttributes' => 'Driver Attributes', + 'VehicleAttributes' => 'Vehicle Attributes', + 'DriverAttributes' => 'Driver Attributes', ]]; diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index d644579..889cdf7 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -13,33 +13,33 @@ declare(strict_types=1); return ['FleetManagement' => [ - 'Vehicle' => 'Vehicle', - 'Vehicles' => 'Vehicles', - 'Status' => 'Status', - 'Name' => 'Name', - 'Type' => 'Type', - 'Make' => 'Make', - 'Model' => 'Model', - 'Start' => 'Start', - 'End' => 'End', - 'Profile' => 'Profile', - 'Attributes' => 'Attributes', - 'Files' => 'Files', - 'Notes' => 'Notes', - 'Costs' => 'Costs', - 'Inspections' => 'Inspections', - 'Drivers' => 'Drivers', - 'Milage' => 'Milage', - 'Driver' => 'Driver', - 'Vin' => 'Vin', - 'History' => 'History', - 'Upcoming' => 'Upcoming', + 'Vehicle' => 'Vehicle', + 'Vehicles' => 'Vehicles', + 'Status' => 'Status', + 'Name' => 'Name', + 'Type' => 'Type', + 'Make' => 'Make', + 'Model' => 'Model', + 'Start' => 'Start', + 'End' => 'End', + 'Profile' => 'Profile', + 'Attributes' => 'Attributes', + 'Files' => 'Files', + 'Notes' => 'Notes', + 'Costs' => 'Costs', + 'Inspections' => 'Inspections', + 'Drivers' => 'Drivers', + 'Milage' => 'Milage', + 'Driver' => 'Driver', + 'Vin' => 'Vin', + 'History' => 'History', + 'Upcoming' => 'Upcoming', 'Responsible' => 'Responsible', - 'Date' => 'Date', - 'PurchasePrice' => 'Purchase Price', - 'LeasingFee' => 'Leasing Fee', - ':status1' => 'Active', - ':status2' => 'Inactive', - ':status3' => 'Damaged', - ':status4' => 'Out of order', + 'Date' => 'Date', + 'PurchasePrice' => 'Purchase Price', + 'LeasingFee' => 'Leasing Fee', + ':status1' => 'Active', + ':status2' => 'Inactive', + ':status3' => 'Damaged', + ':status4' => 'Out of order', ]]; diff --git a/Theme/Backend/driver-profile.tpl.php b/Theme/Backend/driver-profile.tpl.php index 62569c0..ac5c914 100644 --- a/Theme/Backend/driver-profile.tpl.php +++ b/Theme/Backend/driver-profile.tpl.php @@ -12,14 +12,14 @@ */ declare(strict_types=1); -use Modules\FleetManagement\Models\NullDriver; use Modules\FleetManagement\Models\DriverStatus; +use Modules\FleetManagement\Models\NullDriver; use Modules\Media\Models\NullMedia; use phpOMS\Uri\UriFactory; $countryCodes = \phpOMS\Localization\ISO3166TwoEnum::getConstants(); $countries = \phpOMS\Localization\ISO3166NameEnum::getConstants(); -$driverStatus = DriverStatus::getConstants(); +$driverStatus = DriverStatus::getConstants(); /** * @var \Modules\FleetManagement\Models\Driver $driver @@ -121,7 +121,7 @@ echo $this->data['nav']->render(); request->uri->fragment === 'c-tab-5' ? ' checked' : ''; ?>>
- getHtml('Create', '0', '0'); ?> + getHtml('Create', '0', '0'); ?>
@@ -277,7 +277,7 @@ echo $this->data['nav']->render(); $value) : ++$c; ?> diff --git a/Theme/Backend/vehicle-profile.tpl.php b/Theme/Backend/vehicle-profile.tpl.php index 015d005..58c288c 100755 --- a/Theme/Backend/vehicle-profile.tpl.php +++ b/Theme/Backend/vehicle-profile.tpl.php @@ -166,7 +166,7 @@ echo $this->data['nav']->render(); request->uri->fragment === 'c-tab-5' ? ' checked' : ''; ?>>
- getHtml('Create', '0', '0'); ?> + getHtml('Create', '0', '0'); ?>
@@ -181,7 +181,7 @@ echo $this->data['nav']->render(); data['inspections'] as $inspection) : ?> - next?->format('Y-m-d H:i') ?> + next?->format('Y-m-d H:i'); ?> printHtml($inspection->type->getL11n()); ?> @@ -324,7 +324,7 @@ echo $this->data['nav']->render(); $value) : ++$c; ?>