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

ui fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-04-07 17:31:41 +00:00
parent 923353efae
commit 5c94342914
13 changed files with 70 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Admin/Install/db.json
View File

@ -110,6 +110,11 @@
"type": "VARCHAR(255)",
"null": false
},
"equipmgmt_equipment_code": {
"name": "equipmgmt_equipment_code",
"type": "VARCHAR(255)",
"null": false
},
"equipmgmt_equipment_status": {
"name": "equipmgmt_equipment_status",
"type": "TINYINT",

5
Admin/Routes/Web/Api.php
View File

@ -23,6 +23,7 @@ return [
'dest' => '\Modules\EquipmentManagement\Controller\ApiController:apiEquipmentFind',
'verb' => RouteVerb::GET,
'csrf' => true,
'active' => true,
'permission' => [
'module' => Controller::NAME,
'type' => PermissionType::READ,
@ -36,6 +37,7 @@ return [
'dest' => '\Modules\EquipmentManagement\Controller\ApiEquipmentAttributeController:apiEquipmentAttributeCreate',
'verb' => RouteVerb::PUT,
'csrf' => true,
'active' => true,
'permission' => [
'module' => Controller::NAME,
'type' => PermissionType::READ,
@ -46,6 +48,7 @@ return [
'dest' => '\Modules\EquipmentManagement\Controller\ApiEquipmentAttributeController:apiEquipmentAttributeUpdate',
'verb' => RouteVerb::SET,
'csrf' => true,
'active' => true,
'permission' => [
'module' => Controller::NAME,
'type' => PermissionType::READ,
@ -59,6 +62,7 @@ return [
'dest' => '\Modules\EquipmentManagement\Controller\ApiController:apiNoteCreate',
'verb' => RouteVerb::PUT,
'csrf' => true,
'active' => true,
'permission' => [
'module' => Controller::NAME,
'type' => PermissionType::READ,
@ -69,6 +73,7 @@ return [
'dest' => '\Modules\EquipmentManagement\Controller\ApiController:apiNoteUpdate',
'verb' => RouteVerb::SET,
'csrf' => true,
'active' => true,
'permission' => [
'module' => Controller::NAME,
'type' => PermissionType::READ,

12
Admin/Routes/Web/Backend.php
View File

@ -22,6 +22,7 @@ return [
[
'dest' => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementAttributeTypeList',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::READ,
@ -33,6 +34,7 @@ return [
[
'dest' => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementAttributeType',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::READ,
@ -44,6 +46,7 @@ return [
[
'dest' => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementAttributeTypeCreate',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::CREATE,
@ -55,6 +58,7 @@ return [
[
'dest' => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementAttributeValue',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::READ,
@ -66,6 +70,7 @@ return [
[
'dest' => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementAttributeValueCreate',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::CREATE,
@ -78,6 +83,7 @@ return [
[
'dest' => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementEquipmentList',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::READ,
@ -89,6 +95,7 @@ return [
[
'dest' => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementEquipmentCreate',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::CREATE,
@ -100,6 +107,7 @@ return [
[
'dest' => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementEquipmentView',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::READ,
@ -112,6 +120,7 @@ return [
[
'dest' => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementInspectionList',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::READ,
@ -123,6 +132,7 @@ return [
[
'dest' => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementInspectionTypeList',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::READ,
@ -134,6 +144,7 @@ return [
[
'dest' => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementEquipmentCreate',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::CREATE,
@ -145,6 +156,7 @@ return [
[
'dest' => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementEquipmentView',
'verb' => RouteVerb::GET,
'active' => true,
'permission' => [
'module' => BackendController::NAME,
'type' => PermissionType::READ,

2
Controller/ApiController.php
View File

@ -414,7 +414,7 @@ final class ApiController extends Controller
}
/**
* Validate item note create request
* Validate note create request
*
* @param RequestAbstract $request Request
*

2
Controller/ApiEquipmentAttributeController.php
View File

@ -40,7 +40,7 @@ final class ApiEquipmentAttributeController extends Controller
use \Modules\Attribute\Controller\ApiAttributeTraitController;
/**
* Api method to create item attribute
* Api method to create Attribute
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response

12
Controller/ApiEquipmentTypeController.php
View File

@ -35,7 +35,7 @@ use phpOMS\Message\ResponseAbstract;
final class ApiEquipmentTypeController extends Controller
{
/**
* Api method to create item attribute type
* Api method to create EquipmentType
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
@ -62,7 +62,7 @@ final class ApiEquipmentTypeController extends Controller
}
/**
* Method to create item attribute from request.
* Method to create EquipmentType from request.
*
* @param RequestAbstract $request Request
*
@ -83,7 +83,7 @@ final class ApiEquipmentTypeController extends Controller
}
/**
* Validate item attribute create request
* Validate EquipmentType create request
*
* @param RequestAbstract $request Request
*
@ -103,7 +103,7 @@ final class ApiEquipmentTypeController extends Controller
}
/**
* Api method to create item attribute l11n
* Api method to create EquipmentType l11n
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
@ -130,7 +130,7 @@ final class ApiEquipmentTypeController extends Controller
}
/**
* Method to create item attribute l11n from request.
* Method to create EquipmentType l11n from request.
*
* @param RequestAbstract $request Request
*
@ -149,7 +149,7 @@ final class ApiEquipmentTypeController extends Controller
}
/**
* Validate item attribute l11n create request
* Validate EquipmentType l11n create request
*
* @param RequestAbstract $request Request
*

12
Controller/ApiInspectionTypeController.php
View File

@ -109,7 +109,7 @@ final class ApiInspectionTypeController extends Controller
}
/**
* Api method to create item attribute type
* Api method to create InspectionType
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
@ -136,7 +136,7 @@ final class ApiInspectionTypeController extends Controller
}
/**
* Method to create item attribute from request.
* Method to create InspectionType from request.
*
* @param RequestAbstract $request Request
*
@ -157,7 +157,7 @@ final class ApiInspectionTypeController extends Controller
}
/**
* Validate item attribute create request
* Validate InspectionType create request
*
* @param RequestAbstract $request Request
*
@ -177,7 +177,7 @@ final class ApiInspectionTypeController extends Controller
}
/**
* Api method to create item attribute l11n
* Api method to create InspectionType l11n
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
@ -204,7 +204,7 @@ final class ApiInspectionTypeController extends Controller
}
/**
* Method to create item attribute l11n from request.
* Method to create InspectionType l11n from request.
*
* @param RequestAbstract $request Request
*
@ -223,7 +223,7 @@ final class ApiInspectionTypeController extends Controller
}
/**
* Validate item attribute l11n create request
* Validate InspectionType l11n create request
*
* @param RequestAbstract $request Request
*

14
Controller/BackendController.php
View File

@ -20,6 +20,7 @@ use Modules\EquipmentManagement\Models\Attribute\EquipmentAttributeValueL11nMapp
use Modules\EquipmentManagement\Models\Attribute\EquipmentAttributeValueMapper;
use Modules\EquipmentManagement\Models\EquipmentMapper;
use Modules\EquipmentManagement\Models\EquipmentTypeMapper;
use Modules\EquipmentManagement\Models\Inspection;
use Modules\EquipmentManagement\Models\InspectionMapper;
use Modules\EquipmentManagement\Models\InspectionTypeMapper;
use Modules\Media\Models\MediaMapper;
@ -220,7 +221,7 @@ final class BackendController extends Controller
->with('attributes/type')
->with('attributes/value')
->with('attributes/type/l11n')
//->with('attributes/value/l11n')
->with('attributes/value/l11n')
->with('files')
->with('files/types')
->with('type')
@ -231,7 +232,7 @@ final class BackendController extends Controller
->where('type/l11n/language', $response->header->l11n->language)
->where('fuelType/l11n/language', $response->header->l11n->language)
->where('attributes/type/l11n/language', $response->header->l11n->language)
//->where('attributes/value/l11n/language', $response->header->l11n->language)
->where('attributes/value/l11n/language', [$response->header->l11n->language, null])
->execute();
$view->data['equipment'] = $equipment;
@ -310,7 +311,16 @@ final class BackendController extends Controller
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1008404001, $request, $response);
$view->data['inspections'] = InspectionMapper::getAll()
->with('type')
->with('type/l11n')
->where('type/l11n/language', $request->header->l11n->language)
->sort('id', 'DESC')
->limit(100)
->executeGetArray();
$view->data['equipment'] = EquipmentMapper::getAll()
->with('account')
->where('id', \array_map(function (Inspection $inspection) { return $inspection->reference; }, $view->data['inspections']))
->executeGetArray();
return $view;

2
Models/Equipment.php
View File

@ -30,6 +30,8 @@ class Equipment implements \JsonSerializable
public string $name = '';
public string $code = '';
public int $status = EquipmentStatus::ACTIVE;
public BaseStringL11nType $type;

3
Models/EquipmentMapper.php
View File

@ -20,7 +20,7 @@ use Modules\Media\Models\MediaMapper;
use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
/**
* Mapper class.
* Equipment mapper class.
*
* @package Modules\EquipmentManagement\Models
* @license OMS License 2.0
@ -41,6 +41,7 @@ final class EquipmentMapper extends DataMapperFactory
public const COLUMNS = [
'equipmgmt_equipment_id' => ['name' => 'equipmgmt_equipment_id', 'type' => 'int', 'internal' => 'id'],
'equipmgmt_equipment_name' => ['name' => 'equipmgmt_equipment_name', 'type' => 'string', 'internal' => 'name'],
'equipmgmt_equipment_code' => ['name' => 'equipmgmt_equipment_code', 'type' => 'string', 'internal' => 'code'],
'equipmgmt_equipment_status' => ['name' => 'equipmgmt_equipment_status', 'type' => 'int', 'internal' => 'status'],
'equipmgmt_equipment_info' => ['name' => 'equipmgmt_equipment_info', 'type' => 'string', 'internal' => 'info'],
'equipmgmt_equipment_unit' => ['name' => 'equipmgmt_equipment_unit', 'type' => 'int', 'internal' => 'unit'],

2
Models/EquipmentTypeMapper.php
View File

@ -18,7 +18,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
use phpOMS\Localization\BaseStringL11nType;
/**
* Item mapper class.
* EquipmentType mapper class.
*
* @package Modules\EquipmentManagement\Models
* @license OMS License 2.0

2
Models/InspectionTypeMapper.php
View File

@ -18,7 +18,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
use phpOMS\Localization\BaseStringL11nType;
/**
* Item mapper class.
* InspectionType mapper class.
*
* @package Modules\EquipmentManagement\Models
* @license OMS License 2.0

28
Theme/Backend/inspection-list.tpl.php
View File

@ -12,6 +12,8 @@
*/
declare(strict_types=1);
use phpOMS\Uri\UriFactory;
echo $this->data['nav']->render();
?>
@ -23,8 +25,8 @@ echo $this->data['nav']->render();
<thead>
<tr>
<td><?= $this->getHtml('Date'); ?>
<td class="wf-100"><?= $this->getHtml('Type'); ?>
<td><?= $this->getHtml('Responsible'); ?>
<td><?= $this->getHtml('Type'); ?>
<td class="wf-100"><?= $this->getHtml('Equipment'); ?>
<tbody>
<?php
$count = 0;
@ -35,11 +37,12 @@ echo $this->data['nav']->render();
}
++$count;
$url = UriFactory::build('{/base}/equipment/inspection/view?id=' . $inspection->id);
?>
<tr>
<td><?= $inspection->next->format('Y-m-d H:i'); ?>
<td><?= $this->printHtml($inspection->type->getL11n()); ?>
<td>
<tr data-href="<?= $url ?>">
<td><a href="<?= $url; ?>"><?= $inspection->next?->format('Y-m-d H:i'); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($inspection->type->getL11n()); ?></a>
<td><a href="<?= $url; ?>"><?= $this->data['equipment'][$inspection->reference]->name; ?></a>
<?php endforeach; ?>
<?php if ($count === 0) : ?>
<tr><td colspan="3" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
@ -57,18 +60,19 @@ echo $this->data['nav']->render();
<thead>
<tr>
<td><?= $this->getHtml('Date'); ?>
<td class="wf-100"><?= $this->getHtml('Type'); ?>
<td><?= $this->getHtml('Responsible'); ?>
<td><?= $this->getHtml('Type'); ?>
<td class="wf-100"><?= $this->getHtml('Equipment'); ?>
<tbody>
<?php
$count = 0;
foreach (($this->data['inspections'] ?? []) as $inspection) :
++$count;
$url = UriFactory::build('{/base}/equipment/inspection/view?id=' . $inspection->id);
?>
<tr>
<td><?= $inspection->date->format('Y-m-d H:i'); ?>
<td><?= $this->printHtml($inspection->type->getL11n()); ?>
<td>
<tr data-href="<?= $url ?>">
<td><a href="<?= $url; ?>"><?= $inspection->date?->format('Y-m-d H:i'); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($inspection->type->getL11n()); ?></a>
<td><a href="<?= $url; ?>"><?= $this->data['equipment'][$inspection->reference]->name; ?></a>
<?php endforeach; ?>
<?php if ($count === 0) : ?>
<tr><td colspan="3" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>