Jingga/oms-EquipmentManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-EquipmentManagement.git synced 2026-02-17 10:48:39 +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 ade1c110b3
commit 7b9dd37701
12 changed files with 60 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin/Installer.php
View File

@ -65,7 +65,7 @@ final class Installer extends InstallerAbstract
} }
/** @var array $types */ /** @var array $types */
$types = \json_decode($fileContent, true); $types = \json_decode($fileContent, true);
$equipmentTypes = self::createEquipmentTypes($app, $types); $equipmentTypes = self::createEquipmentTypes($app, $types);
/* Inspection types */ /* Inspection types */

1
Controller/ApiEquipmentAttributeController.php
View File

@ -446,7 +446,6 @@ final class ApiEquipmentAttributeController extends Controller
public function apiEquipmentAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiEquipmentAttributeValueDelete(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?

11
Controller/ApiEquipmentController.php
View File

@ -40,7 +40,6 @@ use phpOMS\Message\ResponseAbstract;
*/ */
final class ApiEquipmentController extends Controller final class ApiEquipmentController extends Controller
{ {
/** /**
* Api method to create a equipment * Api method to create a equipment
* *
@ -100,8 +99,8 @@ final class ApiEquipmentController extends Controller
/** /**
* Create media files for equipment * Create media files for equipment
* *
* @param Equipment $equipment Equipment * @param Equipment $equipment Equipment
* @param RequestAbstract $request Request incl. media do upload * @param RequestAbstract $request Request incl. media do upload
* *
* @return void * @return void
* *
@ -255,7 +254,7 @@ final class ApiEquipmentController extends Controller
/** @var \Modules\EquipmentManagement\Models\Equipment $equipment */ /** @var \Modules\EquipmentManagement\Models\Equipment $equipment */
$equipment = EquipmentMapper::get()->where('id', (int) $request->getData('equipment'))->execute(); $equipment = EquipmentMapper::get()->where('id', (int) $request->getData('equipment'))->execute();
$path = $this->createEquipmentDir($equipment); $path = $this->createEquipmentDir($equipment);
$uploaded = []; $uploaded = [];
if (!empty($uploadedFiles = $request->files)) { if (!empty($uploadedFiles = $request->files)) {
@ -468,8 +467,8 @@ final class ApiEquipmentController extends Controller
/** /**
* Method to update Equipment from request. * Method to update Equipment from request.
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param Equipment $new Model to modify * @param Equipment $new Model to modify
* *
* @return Equipment * @return Equipment
* *

8
Controller/ApiEquipmentTypeController.php
View File

@ -202,8 +202,8 @@ final class ApiEquipmentTypeController extends Controller
/** /**
* Method to update EquipmentType from request. * Method to update EquipmentType from request.
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param BaseStringL11nType $new Model to modify * @param BaseStringL11nType $new Model to modify
* *
* @return BaseStringL11nType * @return BaseStringL11nType
* *
@ -319,8 +319,8 @@ final class ApiEquipmentTypeController extends Controller
/** /**
* Method to update EquipmentTypeL11n from request. * Method to update EquipmentTypeL11n from request.
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param BaseStringL11n $new Model to modify * @param BaseStringL11n $new Model to modify
* *
* @return BaseStringL11n * @return BaseStringL11n
* *

8
Controller/ApiInspectionTypeController.php
View File

@ -202,8 +202,8 @@ final class ApiInspectionTypeController extends Controller
/** /**
* Method to update InspectionType from request. * Method to update InspectionType from request.
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param BaseStringL11nType $new Model to modify * @param BaseStringL11nType $new Model to modify
* *
* @return BaseStringL11nType * @return BaseStringL11nType
* *
@ -319,8 +319,8 @@ final class ApiInspectionTypeController extends Controller
/** /**
* Method to update InspectionTypeL11n from request. * Method to update InspectionTypeL11n from request.
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param BaseStringL11n $new Model to modify * @param BaseStringL11n $new Model to modify
* *
* @return BaseStringL11n * @return BaseStringL11n
* *

4
Controller/BackendController.php
View File

@ -162,7 +162,7 @@ final class BackendController extends Controller
$view->data['attributeView'] = new \Modules\Attribute\Theme\Backend\Components\AttributeView($this->app->l11nManager, $request, $response); $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['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['media-upload'] = new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response);
$view->data['equipment-notes'] = new \Modules\Editor\Theme\Backend\Components\Compound\BaseView($this->app->l11nManager, $request, $response); $view->data['equipment-notes'] = new \Modules\Editor\Theme\Backend\Components\Compound\BaseView($this->app->l11nManager, $request, $response);
return $view; return $view;
@ -249,7 +249,7 @@ final class BackendController extends Controller
$view->data['attributeView'] = new \Modules\Attribute\Theme\Backend\Components\AttributeView($this->app->l11nManager, $request, $response); $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['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['media-upload'] = new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response);
$view->data['equipment-notes'] = new \Modules\Editor\Theme\Backend\Components\Compound\BaseView($this->app->l11nManager, $request, $response); $view->data['equipment-notes'] = new \Modules\Editor\Theme\Backend\Components\Compound\BaseView($this->app->l11nManager, $request, $response);
return $view; return $view;

6
Models/Attribute/EquipmentAttributeMapper.php
View File

@ -37,10 +37,10 @@ final class EquipmentAttributeMapper extends DataMapperFactory
* @since 1.0.0 * @since 1.0.0
*/ */
public const COLUMNS = [ public const COLUMNS = [
'equipmgmt_equipment_attr_id' => ['name' => 'equipmgmt_equipment_attr_id', 'type' => 'int', 'internal' => 'id'], 'equipmgmt_equipment_attr_id' => ['name' => 'equipmgmt_equipment_attr_id', 'type' => 'int', 'internal' => 'id'],
'equipmgmt_equipment_attr_equipment' => ['name' => 'equipmgmt_equipment_attr_equipment', 'type' => 'int', 'internal' => 'ref'], 'equipmgmt_equipment_attr_equipment' => ['name' => 'equipmgmt_equipment_attr_equipment', 'type' => 'int', 'internal' => 'ref'],
'equipmgmt_equipment_attr_type' => ['name' => 'equipmgmt_equipment_attr_type', 'type' => 'int', 'internal' => 'type'], 'equipmgmt_equipment_attr_type' => ['name' => 'equipmgmt_equipment_attr_type', 'type' => 'int', 'internal' => 'type'],
'equipmgmt_equipment_attr_value' => ['name' => 'equipmgmt_equipment_attr_value', 'type' => 'int', 'internal' => 'value'], 'equipmgmt_equipment_attr_value' => ['name' => 'equipmgmt_equipment_attr_value', 'type' => 'int', 'internal' => 'value'],
]; ];
/** /**

4
Models/EquipmentMapper.php
View File

@ -14,10 +14,10 @@ declare(strict_types=1);
namespace Modules\EquipmentManagement\Models; namespace Modules\EquipmentManagement\Models;
use Modules\Media\Models\MediaMapper;
use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
use Modules\Editor\Models\EditorDocMapper; use Modules\Editor\Models\EditorDocMapper;
use Modules\EquipmentManagement\Models\Attribute\EquipmentAttributeMapper; use Modules\EquipmentManagement\Models\Attribute\EquipmentAttributeMapper;
use Modules\Media\Models\MediaMapper;
use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
/** /**
* Mapper class. * Mapper class.

2
Models/InspectionMapper.php
View File

@ -37,7 +37,7 @@ final class InspectionMapper extends DataMapperFactory
*/ */
public const COLUMNS = [ public const COLUMNS = [
'equipmgmt_equipment_inspection_id' => ['name' => 'equipmgmt_equipment_inspection_id', 'type' => 'int', 'internal' => 'id'], 'equipmgmt_equipment_inspection_id' => ['name' => 'equipmgmt_equipment_inspection_id', 'type' => 'int', 'internal' => 'id'],
'equipmgmt_equipment_inspection_vehicle' => ['name' => 'equipmgmt_equipment_inspection_vehicle', 'type' => 'int', 'internal' => 'reference'], 'equipmgmt_equipment_inspection_vehicle' => ['name' => 'equipmgmt_equipment_inspection_vehicle', 'type' => 'int', 'internal' => 'reference'],
'equipmgmt_equipment_inspection_description' => ['name' => 'equipmgmt_equipment_inspection_description', 'type' => 'string', 'internal' => 'description'], 'equipmgmt_equipment_inspection_description' => ['name' => 'equipmgmt_equipment_inspection_description', 'type' => 'string', 'internal' => 'description'],
'equipmgmt_equipment_inspection_status' => ['name' => 'equipmgmt_equipment_inspection_status', 'type' => 'int', 'internal' => 'status'], 'equipmgmt_equipment_inspection_status' => ['name' => 'equipmgmt_equipment_inspection_status', 'type' => 'int', 'internal' => 'status'],
'equipmgmt_equipment_inspection_interval' => ['name' => 'equipmgmt_equipment_inspection_interval', 'type' => 'int', 'internal' => 'interval'], 'equipmgmt_equipment_inspection_interval' => ['name' => 'equipmgmt_equipment_inspection_interval', 'type' => 'int', 'internal' => 'interval'],

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

@ -13,9 +13,9 @@
declare(strict_types=1); declare(strict_types=1);
return ['Navigation' => [ return ['Navigation' => [
'EquipmentManagement' => 'Equipment Management', 'EquipmentManagement' => 'Equipment Management',
'Equipments' => 'Equipments', 'Equipments' => 'Equipments',
'Inspections' => 'Inspections', 'Inspections' => 'Inspections',
'EquipmentInspectionTypes' => 'Equipment Inspection Types', 'EquipmentInspectionTypes' => 'Equipment Inspection Types',
'EquipmentAttributes' => 'Equipment Attributes', 'EquipmentAttributes' => 'Equipment Attributes',
]]; ]];

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

@ -13,33 +13,33 @@
declare(strict_types=1); declare(strict_types=1);
return ['EquipmentManagement' => [ return ['EquipmentManagement' => [
'Equipment' => 'Equipment', 'Equipment' => 'Equipment',
'Equipments' => 'Equipments', 'Equipments' => 'Equipments',
'Status' => 'Status', 'Status' => 'Status',
'Name' => 'Name', 'Name' => 'Name',
'Type' => 'Type', 'Type' => 'Type',
'Make' => 'Make', 'Make' => 'Make',
'Model' => 'Model', 'Model' => 'Model',
'Start' => 'Start', 'Start' => 'Start',
'End' => 'End', 'End' => 'End',
'Profile' => 'Profile', 'Profile' => 'Profile',
'Attributes' => 'Attributes', 'Attributes' => 'Attributes',
'Files' => 'Files', 'Files' => 'Files',
'Notes' => 'Notes', 'Notes' => 'Notes',
'Costs' => 'Costs', 'Costs' => 'Costs',
'Inspections' => 'Inspections', 'Inspections' => 'Inspections',
'Drivers' => 'Drivers', 'Drivers' => 'Drivers',
'Milage' => 'Milage', 'Milage' => 'Milage',
'Driver' => 'Driver', 'Driver' => 'Driver',
'Vin' => 'Vin', 'Vin' => 'Vin',
'History' => 'History', 'History' => 'History',
'Upcoming' => 'Upcoming', 'Upcoming' => 'Upcoming',
'Responsible' => 'Responsible', 'Responsible' => 'Responsible',
'Date' => 'Date', 'Date' => 'Date',
'PurchasePrice' => 'Purchase Price', 'PurchasePrice' => 'Purchase Price',
'LeasingFee' => 'Leasing Fee', 'LeasingFee' => 'Leasing Fee',
':status1' => 'Active', ':status1' => 'Active',
':status2' => 'Inactive', ':status2' => 'Inactive',
':status3' => 'Damaged', ':status3' => 'Damaged',
':status4' => 'Out of order', ':status4' => 'Out of order',
]]; ]];

12
Theme/Backend/equipment-profile.tpl.php
View File

@ -12,23 +12,23 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
use Modules\EquipmentManagement\Models\NullEquipment;
use Modules\EquipmentManagement\Models\EquipmentStatus; use Modules\EquipmentManagement\Models\EquipmentStatus;
use Modules\EquipmentManagement\Models\NullEquipment;
use Modules\Media\Models\NullMedia; use Modules\Media\Models\NullMedia;
use phpOMS\Uri\UriFactory; use phpOMS\Uri\UriFactory;
$countryCodes = \phpOMS\Localization\ISO3166TwoEnum::getConstants(); $countryCodes = \phpOMS\Localization\ISO3166TwoEnum::getConstants();
$countries = \phpOMS\Localization\ISO3166NameEnum::getConstants(); $countries = \phpOMS\Localization\ISO3166NameEnum::getConstants();
$equipmentStatus = EquipmentStatus::getConstants(); $equipmentStatus = EquipmentStatus::getConstants();
/** /**
* @var \Modules\EquipmentManagement\Models\Equipment $equipment * @var \Modules\EquipmentManagement\Models\Equipment $equipment
*/ */
$equipment = $this->data['equipment'] ?? new NullEquipment(); $equipment = $this->data['equipment'] ?? new NullEquipment();
$files = $equipment->files; $files = $equipment->files;
$equipmentImage = $this->data['equipmentImage'] ?? new NullMedia(); $equipmentImage = $this->data['equipmentImage'] ?? new NullMedia();
$equipmentTypes = $this->data['types'] ?? []; $equipmentTypes = $this->data['types'] ?? [];
$attributeView = $this->data['attributeView']; $attributeView = $this->data['attributeView'];
/** /**
* @var \phpOMS\Views\View $this * @var \phpOMS\Views\View $this
@ -165,7 +165,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?equipment=' . $equipment->id) ?>"><?= $this->getHtml('Create', '0', '0'); ?></a> <a class="button" href="<?= UriFactory::build('{/app}/fleet/inspection/create?equipment=' . $equipment->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">