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

bug fixes
Some checks failed
Image optimization / general_image_workflow (push) Has been cancelled
Details
CI / general_module_workflow_php (push) Has been cancelled
Details
CI / general_module_workflow_js (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-10-11 19:17:40 +00:00
parent 90f4c68635
commit 693d25233b
6 changed files with 70 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Admin/Installer.php
View File

@ -103,7 +103,7 @@ final class Installer extends InstallerAbstract
$request->header->account = 1; $request->header->account = 1;
$request->setData('name', $type['name'] ?? ''); $request->setData('name', $type['name'] ?? '');
$request->setData('title', \reset($type['l11n'])); $request->setData('content', \reset($type['l11n']));
$request->setData('language', \array_keys($type['l11n'])[0] ?? 'en'); $request->setData('language', \array_keys($type['l11n'])[0] ?? 'en');
$module->apiEquipmentTypeCreate($request, $response); $module->apiEquipmentTypeCreate($request, $response);
@ -128,9 +128,9 @@ final class Installer extends InstallerAbstract
$request = new HttpRequest(); $request = new HttpRequest();
$request->header->account = 1; $request->header->account = 1;
$request->setData('title', $l11n); $request->setData('content', $l11n);
$request->setData('language', $language); $request->setData('language', $language);
$request->setData('type', $equipmentTypes[$type['name']]['id']); $request->setData('ref', $equipmentTypes[$type['name']]['id']);
$module->apiEquipmentTypeL11nCreate($request, $response); $module->apiEquipmentTypeL11nCreate($request, $response);
} }
@ -164,7 +164,7 @@ final class Installer extends InstallerAbstract
$request->header->account = 1; $request->header->account = 1;
$request->setData('name', $type['name'] ?? ''); $request->setData('name', $type['name'] ?? '');
$request->setData('title', \reset($type['l11n'])); $request->setData('content', \reset($type['l11n']));
$request->setData('language', \array_keys($type['l11n'])[0] ?? 'en'); $request->setData('language', \array_keys($type['l11n'])[0] ?? 'en');
$module->apiInspectionTypeCreate($request, $response); $module->apiInspectionTypeCreate($request, $response);
@ -189,9 +189,9 @@ final class Installer extends InstallerAbstract
$request = new HttpRequest(); $request = new HttpRequest();
$request->header->account = 1; $request->header->account = 1;
$request->setData('title', $l11n); $request->setData('content', $l11n);
$request->setData('language', $language); $request->setData('language', $language);
$request->setData('type', $inspectionTypes[$type['name']]['id']); $request->setData('ref', $inspectionTypes[$type['name']]['id']);
$module->apiInspectionTypeL11nCreate($request, $response); $module->apiInspectionTypeL11nCreate($request, $response);
} }
@ -225,7 +225,7 @@ final class Installer extends InstallerAbstract
$request->header->account = 1; $request->header->account = 1;
$request->setData('name', $attribute['name'] ?? ''); $request->setData('name', $attribute['name'] ?? '');
$request->setData('title', \reset($attribute['l11n'])); $request->setData('content', \reset($attribute['l11n']));
$request->setData('language', \array_keys($attribute['l11n'])[0] ?? 'en'); $request->setData('language', \array_keys($attribute['l11n'])[0] ?? 'en');
$request->setData('repeatable', $attribute['repeatable'] ?? false); $request->setData('repeatable', $attribute['repeatable'] ?? false);
$request->setData('internal', $attribute['internal'] ?? false); $request->setData('internal', $attribute['internal'] ?? false);
@ -256,9 +256,9 @@ final class Installer extends InstallerAbstract
$request = new HttpRequest(); $request = new HttpRequest();
$request->header->account = 1; $request->header->account = 1;
$request->setData('title', $l11n); $request->setData('content', $l11n);
$request->setData('language', $language); $request->setData('language', $language);
$request->setData('type', $itemAttrType[$attribute['name']]['id']); $request->setData('ref', $itemAttrType[$attribute['name']]['id']);
$module->apiEquipmentAttributeTypeL11nCreate($request, $response); $module->apiEquipmentAttributeTypeL11nCreate($request, $response);
} }
@ -305,7 +305,7 @@ final class Installer extends InstallerAbstract
$request->setData('type', $itemAttrType[$attribute['name']]['id']); $request->setData('type', $itemAttrType[$attribute['name']]['id']);
if (isset($value['l11n']) && !empty($value['l11n'])) { if (isset($value['l11n']) && !empty($value['l11n'])) {
$request->setData('title', \reset($value['l11n'])); $request->setData('content', \reset($value['l11n']));
$request->setData('language', \array_keys($value['l11n'])[0] ?? 'en'); $request->setData('language', \array_keys($value['l11n'])[0] ?? 'en');
} }
@ -333,9 +333,9 @@ final class Installer extends InstallerAbstract
$request = new HttpRequest(); $request = new HttpRequest();
$request->header->account = 1; $request->header->account = 1;
$request->setData('title', $l11n); $request->setData('content', $l11n);
$request->setData('language', $language); $request->setData('language', $language);
$request->setData('value', $attrValue['id']); $request->setData('ref', $attrValue['id']);
$module->apiEquipmentAttributeValueL11nCreate($request, $response); $module->apiEquipmentAttributeValueL11nCreate($request, $response);
} }

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

@ -32,6 +32,45 @@ return [
], ],
], ],
'^.*/equipment(\?.*|$)$' => [
[
'dest' => '\Modules\EquipmentManagement\Controller\ApiController:apiEquipmentCreate',
'verb' => RouteVerb::PUT,
'csrf' => true,
'active' => true,
'permission' => [
'module' => Controller::NAME,
'type' => PermissionType::CREATE,
'state' => PermissionCategory::EQUIPMENT,
],
],
[
'dest' => '\Modules\EquipmentManagement\Controller\ApiController:apiEquipmentUpdate',
'verb' => RouteVerb::SET,
'csrf' => true,
'active' => true,
'permission' => [
'module' => Controller::NAME,
'type' => PermissionType::MODIFY,
'state' => PermissionCategory::EQUIPMENT,
],
],
],
'^.*/equipment/file(\?.*|$)$' => [
[
'dest' => '\Modules\EquipmentManagement\Controller\ApiController:apiMediaAddToEquipment',
'verb' => RouteVerb::PUT,
'csrf' => true,
'active' => true,
'permission' => [
'module' => Controller::NAME,
'type' => PermissionType::CREATE,
'state' => PermissionCategory::EQUIPMENT,
],
],
],
'^.*/equipment/attribute(\?.*$|$)' => [ '^.*/equipment/attribute(\?.*$|$)' => [
[ [
'dest' => '\Modules\EquipmentManagement\Controller\ApiEquipmentAttributeController:apiEquipmentAttributeCreate', 'dest' => '\Modules\EquipmentManagement\Controller\ApiEquipmentAttributeController:apiEquipmentAttributeCreate',

6
Controller/ApiController.php
View File

@ -278,7 +278,7 @@ final class ApiController extends Controller
return; return;
} }
$request->setData('virtualpath', '/Modules/EquipmentManagement/Equipment/' . $request->getData('id'), true); $request->setData('virtualpath', '/Modules/EquipmentManagement/Equipment/' . $request->getData('ref'), true);
$this->app->moduleManager->get('Editor', 'Api')->apiEditorCreate($request, $response, $data); $this->app->moduleManager->get('Editor', 'Api')->apiEditorCreate($request, $response, $data);
if ($response->header->status !== RequestStatusCode::R_200) { if ($response->header->status !== RequestStatusCode::R_200) {
@ -291,7 +291,7 @@ final class ApiController extends Controller
} }
$model = $responseData['response']; $model = $responseData['response'];
$this->createModelRelation($request->header->account, (int) $request->getData('id'), $model->id, EquipmentMapper::class, 'notes', '', $request->getOrigin()); $this->createModelRelation($request->header->account, (int) $request->getData('ref'), $model->id, EquipmentMapper::class, 'notes', '', $request->getOrigin());
} }
/** /**
@ -306,7 +306,7 @@ final class ApiController extends Controller
private function validateNoteCreate(RequestAbstract $request) : array private function validateNoteCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['id'] = !$request->hasData('id')) if (($val['ref'] = !$request->hasData('ref'))
) { ) {
return $val; return $val;
} }

12
Controller/ApiEquipmentTypeController.php
View File

@ -74,7 +74,7 @@ final class ApiEquipmentTypeController extends Controller
{ {
$equipmentType = new BaseStringL11nType(); $equipmentType = new BaseStringL11nType();
$equipmentType->setL11n( $equipmentType->setL11n(
$request->getDataString('title') ?? '', $request->getDataString('content') ?? '',
ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? ISO639x1Enum::_EN ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? ISO639x1Enum::_EN
); );
$equipmentType->title = $request->getDataString('name') ?? ''; $equipmentType->title = $request->getDataString('name') ?? '';
@ -94,7 +94,7 @@ final class ApiEquipmentTypeController extends Controller
private function validateEquipmentTypeCreate(RequestAbstract $request) : array private function validateEquipmentTypeCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['title'] = !$request->hasData('title')) if (($val['content'] = !$request->hasData('content'))
) { ) {
return $val; return $val;
} }
@ -141,9 +141,9 @@ final class ApiEquipmentTypeController extends Controller
private function createEquipmentTypeL11nFromRequest(RequestAbstract $request) : BaseStringL11n private function createEquipmentTypeL11nFromRequest(RequestAbstract $request) : BaseStringL11n
{ {
$equipmentTypeL11n = new BaseStringL11n(); $equipmentTypeL11n = new BaseStringL11n();
$equipmentTypeL11n->ref = $request->getDataInt('type') ?? 0; $equipmentTypeL11n->ref = $request->getDataInt('ref') ?? 0;
$equipmentTypeL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language; $equipmentTypeL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language;
$equipmentTypeL11n->content = $request->getDataString('title') ?? ''; $equipmentTypeL11n->content = $request->getDataString('content') ?? '';
return $equipmentTypeL11n; return $equipmentTypeL11n;
} }
@ -160,8 +160,8 @@ final class ApiEquipmentTypeController extends Controller
private function validateEquipmentTypeL11nCreate(RequestAbstract $request) : array private function validateEquipmentTypeL11nCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['title'] = !$request->hasData('title')) if (($val['content'] = !$request->hasData('content'))
|| ($val['type'] = !$request->hasData('type')) || ($val['ref'] = !$request->hasData('ref'))
) { ) {
return $val; return $val;
} }

12
Controller/ApiInspectionTypeController.php
View File

@ -148,7 +148,7 @@ final class ApiInspectionTypeController extends Controller
{ {
$equipmentType = new BaseStringL11nType(); $equipmentType = new BaseStringL11nType();
$equipmentType->setL11n( $equipmentType->setL11n(
$request->getDataString('title') ?? '', $request->getDataString('content') ?? '',
ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? ISO639x1Enum::_EN ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? ISO639x1Enum::_EN
); );
$equipmentType->title = $request->getDataString('name') ?? ''; $equipmentType->title = $request->getDataString('name') ?? '';
@ -168,7 +168,7 @@ final class ApiInspectionTypeController extends Controller
private function validateInspectionTypeCreate(RequestAbstract $request) : array private function validateInspectionTypeCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['title'] = !$request->hasData('title')) if (($val['content'] = !$request->hasData('content'))
) { ) {
return $val; return $val;
} }
@ -215,9 +215,9 @@ final class ApiInspectionTypeController extends Controller
private function createInspectionTypeL11nFromRequest(RequestAbstract $request) : BaseStringL11n private function createInspectionTypeL11nFromRequest(RequestAbstract $request) : BaseStringL11n
{ {
$equipmentTypeL11n = new BaseStringL11n(); $equipmentTypeL11n = new BaseStringL11n();
$equipmentTypeL11n->ref = $request->getDataInt('type') ?? 0; $equipmentTypeL11n->ref = $request->getDataInt('ref') ?? 0;
$equipmentTypeL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language; $equipmentTypeL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language;
$equipmentTypeL11n->content = $request->getDataString('title') ?? ''; $equipmentTypeL11n->content = $request->getDataString('content') ?? '';
return $equipmentTypeL11n; return $equipmentTypeL11n;
} }
@ -234,8 +234,8 @@ final class ApiInspectionTypeController extends Controller
private function validateInspectionTypeL11nCreate(RequestAbstract $request) : array private function validateInspectionTypeL11nCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['title'] = !$request->hasData('title')) if (($val['content'] = !$request->hasData('content'))
|| ($val['type'] = !$request->hasData('type')) || ($val['ref'] = !$request->hasData('ref'))
) { ) {
return $val; return $val;
} }

8
Theme/Backend/equipment-view.tpl.php
View File

@ -154,7 +154,7 @@ echo $this->data['nav']->render();
$equipment->attributes, $equipment->attributes,
$this->data['attributeTypes'] ?? [], $this->data['attributeTypes'] ?? [],
$this->data['units'] ?? [], $this->data['units'] ?? [],
'{/api}fleet/equipment/attribute?csrf={$CSRF}', '{/api}equipment/attribute?csrf={$CSRF}',
$equipment->id $equipment->id
); );
?> ?>
@ -163,18 +163,18 @@ echo $this->data['nav']->render();
<input type="radio" id="c-tab-3" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-3' ? ' checked' : ''; ?>> <input type="radio" id="c-tab-3" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-3' ? ' checked' : ''; ?>>
<div class="tab col-simple"> <div class="tab col-simple">
<?= $this->data['media-upload']->render('equipment-file', 'files', '', $equipment->files); ?> <?= $this->data['media-upload']->render('equipment-file', 'files', '', $equipment->files, '{/api}equipment/file?csrf={$CSRF}', (string) $equipment->id); ?>
</div> </div>
<input type="radio" id="c-tab-4" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-4' ? ' checked' : ''; ?>> <input type="radio" id="c-tab-4" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-4' ? ' checked' : ''; ?>>
<div class="tab"> <div class="tab">
<?= $this->data['equipment-notes']->render('equipment-notes', '', $equipment->notes); ?> <?= $this->data['equipment-notes']->render('equipment-notes', '', $equipment->notes, '{/api}equipment/note?csrf={$CSRF}', (string) $equipment->id); ?>
</div> </div>
<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('{/base}/fleet/inspection/create?equipment=' . $equipment->id); ?>"><?= $this->getHtml('Create', '0', '0'); ?></a> <a class="button" href="<?= UriFactory::build('{/base}/equipment/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">