Jingga/oms-FleetManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-FleetManagement.git synced 2026-02-11 10:58:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

autofixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-08-30 12:08:09 +00:00
parent 733386df2d
commit d0a2677634
17 changed files with 94 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Controller/ApiDriverAttributeController.php
View File

@ -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?

18
Controller/ApiDriverController.php
View File

@ -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;
}

1
Controller/ApiVehicleAttributeController.php
View File

@ -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?

36
Controller/ApiVehicleController.php
View File

@ -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;
}

4
Controller/BackendController.php
View File

@ -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;
}

6
Models/Attribute/DriverAttributeMapper.php
View File

@ -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'],
];
/**

6
Models/Attribute/VehicleAttributeMapper.php
View File

@ -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'],
];
/**

2
Models/Driver/DriverInspectionMapper.php
View File

@ -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'],

6
Models/Driver/DriverMapper.php
View File

@ -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'],
];
/**

3
Models/InspectionMapper.php
View File

@ -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'],

3
Models/Milage.php
View File

@ -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 = '';
/**

16
Models/MilageMapper.php
View File

@ -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'],
];
/**

4
Models/VehicleMapper.php
View File

@ -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.

12
Theme/Backend/Lang/Navigation.en.lang.php
View File

@ -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',
]];

56
Theme/Backend/Lang/en.lang.php
View File

@ -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',
]];

8
Theme/Backend/driver-profile.tpl.php
View File

@ -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();
<input type="radio" id="c-tab-5" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-5' ? ' checked' : ''; ?>>
<div class="tab">
<div class="row">
<a class="button" href="<?= UriFactory::build('{/app}/fleet/inspection/create?driver=' . $driver->id) ?>"><?= $this->getHtml('Create', '0', '0'); ?></a>
<a class="button" href="<?= UriFactory::build('{/app}/fleet/inspection/create?driver=' . $driver->id); ?>"><?= $this->getHtml('Create', '0', '0'); ?></a>
</div>
<div class="row">
<div class="col-xs-12 col-md-6">
@ -277,7 +277,7 @@ echo $this->data['nav']->render();
</tr>
</template>
<?php $c = 0;
$milage = [];
$milage = [];
foreach ($milage as $key => $value) : ++$c; ?>
<tr data-id="<?= $value->id; ?>">
<td>

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

@ -166,7 +166,7 @@ echo $this->data['nav']->render();
<input type="radio" id="c-tab-5" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-5' ? ' checked' : ''; ?>>
<div class="tab">
<div class="row">
<a class="button" href="<?= UriFactory::build('{/app}/fleet/inspection/create?vehicle=' . $vehicle->id) ?>"><?= $this->getHtml('Create', '0', '0'); ?></a>
<a class="button" href="<?= UriFactory::build('{/app}/fleet/inspection/create?vehicle=' . $vehicle->id); ?>"><?= $this->getHtml('Create', '0', '0'); ?></a>
</div>
<div class="row">
<div class="col-xs-12 col-md-6">
@ -181,7 +181,7 @@ echo $this->data['nav']->render();
<tbody>
<?php foreach ($this->data['inspections'] as $inspection) : ?>
<tr>
<td><?= $inspection->next?->format('Y-m-d H:i') ?>
<td><?= $inspection->next?->format('Y-m-d H:i'); ?>
<td><?= $this->printHtml($inspection->type->getL11n()); ?>
<td>
<?php endforeach; ?>
@ -324,7 +324,7 @@ echo $this->data['nav']->render();
</tr>
</template>
<?php $c = 0;
$milage = [];
$milage = [];
foreach ($milage as $key => $value) : ++$c; ?>
<tr data-id="<?= $value->id; ?>">
<td>