mirror of
https://github.com/Karaka-Management/oms-FleetManagement.git
synced 2026-02-18 06:18:40 +00:00
autofixes
This commit is contained in:
parent
733386df2d
commit
d0a2677634
|
|
@ -446,7 +446,6 @@ final class ApiDriverAttributeController extends Controller
|
||||||
public function apiDriverAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
|
public function apiDriverAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// @todo: I don't think values can be deleted? Only Attributes
|
// @todo: I don't think values can be deleted? Only Attributes
|
||||||
// However, It should be possible to remove UNUSED default values
|
// However, It should be possible to remove UNUSED default values
|
||||||
// either here or other function?
|
// either here or other function?
|
||||||
|
|
|
||||||
|
|
@ -15,10 +15,10 @@ declare(strict_types=1);
|
||||||
namespace Modules\FleetManagement\Controller;
|
namespace Modules\FleetManagement\Controller;
|
||||||
|
|
||||||
use Modules\Admin\Models\NullAccount;
|
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\Driver;
|
||||||
use Modules\FleetManagement\Models\Driver\DriverInspectionMapper;
|
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\DriverMapper;
|
||||||
use Modules\FleetManagement\Models\Driver\DriverStatus;
|
use Modules\FleetManagement\Models\Driver\DriverStatus;
|
||||||
use Modules\FleetManagement\Models\Inspection;
|
use Modules\FleetManagement\Models\Inspection;
|
||||||
|
|
|
||||||
|
|
@ -446,7 +446,6 @@ final class ApiVehicleAttributeController extends Controller
|
||||||
public function apiVehicleAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
|
public function apiVehicleAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// @todo: I don't think values can be deleted? Only Attributes
|
// @todo: I don't think values can be deleted? Only Attributes
|
||||||
// However, It should be possible to remove UNUSED default values
|
// However, It should be possible to remove UNUSED default values
|
||||||
// either here or other function?
|
// either here or other function?
|
||||||
|
|
|
||||||
|
|
@ -16,11 +16,11 @@ namespace Modules\FleetManagement\Controller;
|
||||||
|
|
||||||
use Modules\Admin\Models\NullAccount;
|
use Modules\Admin\Models\NullAccount;
|
||||||
use Modules\FleetManagement\Models\Driver\NullDriver;
|
use Modules\FleetManagement\Models\Driver\NullDriver;
|
||||||
use Modules\FleetManagement\Models\InspectionStatus;
|
|
||||||
use Modules\FleetManagement\Models\FuelTypeL11nMapper;
|
use Modules\FleetManagement\Models\FuelTypeL11nMapper;
|
||||||
use Modules\FleetManagement\Models\FuelTypeMapper;
|
use Modules\FleetManagement\Models\FuelTypeMapper;
|
||||||
use Modules\FleetManagement\Models\Inspection;
|
use Modules\FleetManagement\Models\Inspection;
|
||||||
use Modules\FleetManagement\Models\InspectionMapper;
|
use Modules\FleetManagement\Models\InspectionMapper;
|
||||||
|
use Modules\FleetManagement\Models\InspectionStatus;
|
||||||
use Modules\FleetManagement\Models\InspectionTypeL11nMapper;
|
use Modules\FleetManagement\Models\InspectionTypeL11nMapper;
|
||||||
use Modules\FleetManagement\Models\InspectionTypeMapper;
|
use Modules\FleetManagement\Models\InspectionTypeMapper;
|
||||||
use Modules\FleetManagement\Models\Milage;
|
use Modules\FleetManagement\Models\Milage;
|
||||||
|
|
|
||||||
|
|
@ -16,10 +16,10 @@ namespace Modules\FleetManagement\Controller;
|
||||||
|
|
||||||
use Modules\Admin\Models\LocalizationMapper;
|
use Modules\Admin\Models\LocalizationMapper;
|
||||||
use Modules\Admin\Models\SettingsEnum;
|
use Modules\Admin\Models\SettingsEnum;
|
||||||
use Modules\FleetManagement\Models\InspectionMapper;
|
|
||||||
use Modules\FleetManagement\Models\Attribute\VehicleAttributeTypeL11nMapper;
|
use Modules\FleetManagement\Models\Attribute\VehicleAttributeTypeL11nMapper;
|
||||||
use Modules\FleetManagement\Models\Attribute\VehicleAttributeTypeMapper;
|
use Modules\FleetManagement\Models\Attribute\VehicleAttributeTypeMapper;
|
||||||
use Modules\FleetManagement\Models\Driver\DriverMapper;
|
use Modules\FleetManagement\Models\Driver\DriverMapper;
|
||||||
|
use Modules\FleetManagement\Models\InspectionMapper;
|
||||||
use Modules\FleetManagement\Models\VehicleMapper;
|
use Modules\FleetManagement\Models\VehicleMapper;
|
||||||
use Modules\FleetManagement\Models\VehicleTypeMapper;
|
use Modules\FleetManagement\Models\VehicleTypeMapper;
|
||||||
use Modules\Media\Models\MediaMapper;
|
use Modules\Media\Models\MediaMapper;
|
||||||
|
|
|
||||||
|
|
@ -15,10 +15,10 @@ declare(strict_types=1);
|
||||||
namespace Modules\FleetManagement\Models\Driver;
|
namespace Modules\FleetManagement\Models\Driver;
|
||||||
|
|
||||||
use Modules\Admin\Models\AccountMapper;
|
use Modules\Admin\Models\AccountMapper;
|
||||||
use Modules\Media\Models\MediaMapper;
|
|
||||||
use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
|
|
||||||
use Modules\Editor\Models\EditorDocMapper;
|
use Modules\Editor\Models\EditorDocMapper;
|
||||||
use Modules\FleetManagement\Models\Attribute\DriverAttributeMapper;
|
use Modules\FleetManagement\Models\Attribute\DriverAttributeMapper;
|
||||||
|
use Modules\Media\Models\MediaMapper;
|
||||||
|
use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mapper class.
|
* Mapper class.
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,6 @@ declare(strict_types=1);
|
||||||
namespace Modules\FleetManagement\Models;
|
namespace Modules\FleetManagement\Models;
|
||||||
|
|
||||||
use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
|
use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
|
||||||
use phpOMS\Localization\BaseStringL11n;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* mapper class.
|
* mapper class.
|
||||||
|
|
|
||||||
|
|
@ -29,12 +29,15 @@ class Milage implements \JsonSerializable
|
||||||
public int $id = 0;
|
public int $id = 0;
|
||||||
|
|
||||||
public int $vehicle = 0;
|
public int $vehicle = 0;
|
||||||
|
|
||||||
public ?Driver $driver = null;
|
public ?Driver $driver = null;
|
||||||
|
|
||||||
public ?\DateTime $start = null;
|
public ?\DateTime $start = null;
|
||||||
|
|
||||||
public ?\DateTime $end = null;
|
public ?\DateTime $end = null;
|
||||||
|
|
||||||
public string $from = '';
|
public string $from = '';
|
||||||
|
|
||||||
public string $to = '';
|
public string $to = '';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -14,10 +14,10 @@ declare(strict_types=1);
|
||||||
|
|
||||||
namespace Modules\FleetManagement\Models;
|
namespace Modules\FleetManagement\Models;
|
||||||
|
|
||||||
use Modules\Media\Models\MediaMapper;
|
|
||||||
use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
|
|
||||||
use Modules\Editor\Models\EditorDocMapper;
|
use Modules\Editor\Models\EditorDocMapper;
|
||||||
use Modules\FleetManagement\Models\Attribute\VehicleAttributeMapper;
|
use Modules\FleetManagement\Models\Attribute\VehicleAttributeMapper;
|
||||||
|
use Modules\Media\Models\MediaMapper;
|
||||||
|
use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mapper class.
|
* Mapper class.
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,8 @@
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
use Modules\FleetManagement\Models\NullDriver;
|
|
||||||
use Modules\FleetManagement\Models\DriverStatus;
|
use Modules\FleetManagement\Models\DriverStatus;
|
||||||
|
use Modules\FleetManagement\Models\NullDriver;
|
||||||
use Modules\Media\Models\NullMedia;
|
use Modules\Media\Models\NullMedia;
|
||||||
use phpOMS\Uri\UriFactory;
|
use phpOMS\Uri\UriFactory;
|
||||||
|
|
||||||
|
|
@ -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' : ''; ?>>
|
<input type="radio" id="c-tab-5" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-5' ? ' checked' : ''; ?>>
|
||||||
<div class="tab">
|
<div class="tab">
|
||||||
<div class="row">
|
<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>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-xs-12 col-md-6">
|
<div class="col-xs-12 col-md-6">
|
||||||
|
|
|
||||||
|
|
@ -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' : ''; ?>>
|
<input type="radio" id="c-tab-5" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-5' ? ' checked' : ''; ?>>
|
||||||
<div class="tab">
|
<div class="tab">
|
||||||
<div class="row">
|
<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>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-xs-12 col-md-6">
|
<div class="col-xs-12 col-md-6">
|
||||||
|
|
@ -181,7 +181,7 @@ echo $this->data['nav']->render();
|
||||||
<tbody>
|
<tbody>
|
||||||
<?php foreach ($this->data['inspections'] as $inspection) : ?>
|
<?php foreach ($this->data['inspections'] as $inspection) : ?>
|
||||||
<tr>
|
<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><?= $this->printHtml($inspection->type->getL11n()); ?>
|
||||||
<td>
|
<td>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user