auto fixes + some impl.

Admin/Install/db.json

@@ -278,6 +278,11 @@
                 "type": "TINYINT(1)",
                 "null": false
             },
+            "equipmgmt_attr_type_internal": {
+                "name": "equipmgmt_attr_type_internal",
+                "type": "TINYINT(1)",
+                "null": false
+            },
             "equipmgmt_attr_type_required": {
                 "description": "Every equipment must have this attribute type if set to true.",
                 "name": "equipmgmt_attr_type_required",

Admin/Installer.php

@@ -20,7 +20,6 @@ use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Module\InstallerAbstract;
 use phpOMS\Module\ModuleInfo;
-use phpOMS\Uri\HttpUri;
 
 /**
  * Installer class.
@@ -100,7 +99,7 @@ final class Installer extends InstallerAbstract
         /** @var array $type */
         foreach ($types as $type) {
             $response = new HttpResponse();
-            $request  = new HttpRequest(new HttpUri(''));
+            $request  = new HttpRequest();
 
             $request->header->account = 1;
             $request->setData('name', $type['name'] ?? '');
@@ -126,7 +125,7 @@ final class Installer extends InstallerAbstract
                 }
 
                 $response = new HttpResponse();
-                $request  = new HttpRequest(new HttpUri(''));
+                $request  = new HttpRequest();
 
                 $request->header->account = 1;
                 $request->setData('title', $l11n);
@@ -161,7 +160,7 @@ final class Installer extends InstallerAbstract
         /** @var array $type */
         foreach ($types as $type) {
             $response = new HttpResponse();
-            $request  = new HttpRequest(new HttpUri(''));
+            $request  = new HttpRequest();
 
             $request->header->account = 1;
             $request->setData('name', $type['name'] ?? '');
@@ -187,7 +186,7 @@ final class Installer extends InstallerAbstract
                 }
 
                 $response = new HttpResponse();
-                $request  = new HttpRequest(new HttpUri(''));
+                $request  = new HttpRequest();
 
                 $request->header->account = 1;
                 $request->setData('title', $l11n);
@@ -222,12 +221,14 @@ final class Installer extends InstallerAbstract
         /** @var array $attribute */
         foreach ($attributes as $attribute) {
             $response = new HttpResponse();
-            $request  = new HttpRequest(new HttpUri(''));
+            $request  = new HttpRequest();
 
             $request->header->account = 1;
             $request->setData('name', $attribute['name'] ?? '');
             $request->setData('title', \reset($attribute['l11n']));
             $request->setData('language', \array_keys($attribute['l11n'])[0] ?? 'en');
+            $request->setData('repeatable', $attribute['repeatable'] ?? false);
+            $request->setData('internal', $attribute['internal'] ?? false);
             $request->setData('is_required', $attribute['is_required'] ?? false);
             $request->setData('custom', $attribute['is_custom_allowed'] ?? false);
             $request->setData('validation_pattern', $attribute['validation_pattern'] ?? '');
@@ -252,7 +253,7 @@ final class Installer extends InstallerAbstract
                 }
 
                 $response = new HttpResponse();
-                $request  = new HttpRequest(new HttpUri(''));
+                $request  = new HttpRequest();
 
                 $request->header->account = 1;
                 $request->setData('title', $l11n);
@@ -291,7 +292,7 @@ final class Installer extends InstallerAbstract
             /** @var array $value */
             foreach ($attribute['values'] as $value) {
                 $response = new HttpResponse();
-                $request  = new HttpRequest(new HttpUri(''));
+                $request  = new HttpRequest();
 
                 $request->header->account = 1;
                 $request->setData('value', $value['value'] ?? '');
@@ -325,7 +326,7 @@ final class Installer extends InstallerAbstract
                     }
 
                     $response = new HttpResponse();
-                    $request  = new HttpRequest(new HttpUri(''));
+                    $request  = new HttpRequest();
 
                     $request->header->account = 1;
                     $request->setData('title', $l11n);

Admin/Routes/Web/Api.php

@@ -18,7 +18,7 @@ use phpOMS\Account\PermissionType;
 use phpOMS\Router\RouteVerb;
 
 return [
-    '^.*/equipment/find.*$' => [
+    '^.*/equipment/find(\?.*$|$)' => [
         [
             'dest'       => '\Modules\EquipmentManagement\Controller\ApiEquipmentController:apiEquipmentFind',
             'verb'       => RouteVerb::GET,
@@ -30,7 +30,7 @@ return [
         ],
     ],
 
-    '^.*/equipment/attribute.*$' => [
+    '^.*/equipment/attribute(\?.*$|$)' => [
         [
             'dest'       => '\Modules\EquipmentManagement\Controller\ApiEquipmentAttributeController:apiEquipmentAttributeCreate',
             'verb'       => RouteVerb::PUT,
@@ -51,7 +51,7 @@ return [
         ],
     ],
 
-    '^.*/equipment/note.*$' => [
+    '^.*/equipment/note(\?.*$|$)' => [
         [
             'dest'       => '\Modules\EquipmentManagement\Controller\ApiEquipmentController:apiNoteCreate',
             'verb'       => RouteVerb::PUT,

Admin/Routes/Web/Backend.php

@@ -18,7 +18,7 @@ use phpOMS\Account\PermissionType;
 use phpOMS\Router\RouteVerb;
 
 return [
-    '^.*/equipment/attribute/type/list.*$' => [
+    '^.*/equipment/attribute/type/list(\?.*$|$)' => [
         [
             'dest'       => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementAttributeTypeList',
             'verb'       => RouteVerb::GET,
@@ -29,7 +29,7 @@ return [
             ],
         ],
     ],
-    '^.*/equipment/attribute/type\?.*$' => [
+    '^.*/equipment/attribute/type(\?.*$|$)' => [
         [
             'dest'       => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementAttributeType',
             'verb'       => RouteVerb::GET,
@@ -41,7 +41,7 @@ return [
         ],
     ],
 
-    '^.*/equipment/list.*$' => [
+    '^.*/equipment/list(\?.*$|$)' => [
         [
             'dest'       => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementEquipmentList',
             'verb'       => RouteVerb::GET,
@@ -52,7 +52,7 @@ return [
             ],
         ],
     ],
-    '^.*/equipment/create.*$' => [
+    '^.*/equipment/create(\?.*$|$)' => [
         [
             'dest'       => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementEquipmentCreate',
             'verb'       => RouteVerb::GET,
@@ -63,9 +63,9 @@ return [
             ],
         ],
     ],
-    '^.*/equipment/profile.*$' => [
+    '^.*/equipment/view(\?.*$|$)' => [
         [
-            'dest'       => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementEquipmentProfile',
+            'dest'       => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementEquipmentView',
             'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::NAME,
@@ -75,7 +75,7 @@ return [
         ],
     ],
 
-    '^.*/equipment/inspection/list.*$' => [
+    '^.*/equipment/inspection/list(\?.*$|$)' => [
         [
             'dest'       => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementEquipmentList',
             'verb'       => RouteVerb::GET,
@@ -86,7 +86,7 @@ return [
             ],
         ],
     ],
-    '^.*/equipment/inspection/create.*$' => [
+    '^.*/equipment/inspection/create(\?.*$|$)' => [
         [
             'dest'       => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementEquipmentCreate',
             'verb'       => RouteVerb::GET,
@@ -97,9 +97,9 @@ return [
             ],
         ],
     ],
-    '^.*/equipment/inspection/profile.*$' => [
+    '^.*/equipment/inspection/view(\?.*$|$)' => [
         [
-            'dest'       => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementEquipmentProfile',
+            'dest'       => '\Modules\EquipmentManagement\Controller\BackendController:viewEquipmentManagementEquipmentView',
             'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::NAME,

Controller/ApiEquipmentAttributeController.php

@@ -61,12 +61,15 @@ final class ApiEquipmentAttributeController extends Controller
             return;
         }
 
-        $type = EquipmentAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('type'))->execute();
+        $type = EquipmentAttributeTypeMapper::get()
+            ->with('defaults')
+            ->where('id', (int) $request->getData('type'))
+            ->execute();
 
         if (!$type->repeatable) {
             $attr = EquipmentAttributeMapper::count()
                 ->with('type')
-                ->where('type/id', (int) $request->getData('type'))
+                ->where('type/id', $type->id)
                 ->where('ref', (int) $request->getData('ref'))
                 ->execute();
 
@@ -164,13 +167,20 @@ final class ApiEquipmentAttributeController extends Controller
             ->where('id', $request->getDataInt('type') ?? 0)
             ->execute();
 
+        if ($type->isInternal) {
+            $response->header->status = RequestStatusCode::R_403;
+            $this->createInvalidCreateResponse($request, $response, $val);
+
+            return;
+        }
+
         $attrValue = $this->createAttributeValueFromRequest($request, $type);
         $this->createModel($request->header->account, $attrValue, EquipmentAttributeValueMapper::class, 'attr_value', $request->getOrigin());
 
         if ($attrValue->isDefault) {
             $this->createModelRelation(
                 $request->header->account,
-                (int) $request->getData('type'),
+                $type->id,
                 $attrValue->id,
                 EquipmentAttributeTypeMapper::class, 'defaults', '', $request->getOrigin()
             );

Controller/ApiEquipmentController.php

@@ -92,7 +92,7 @@ final class ApiEquipmentController extends Controller
         $equipment->name   = $request->getDataString('name') ?? '';
         $equipment->info   = $request->getDataString('info') ?? '';
         $equipment->type   = new NullBaseStringL11nType((int) ($request->getDataInt('type') ?? 0));
-        $equipment->status = $request->getDataInt('status') ?? EquipmentStatus::INACTIVE;
+        $equipment->status = EquipmentStatus::tryFromValue($request->getDataInt('status')) ?? EquipmentStatus::INACTIVE;
         $equipment->unit   = $request->getDataInt('unit') ?? $this->app->unitId;
 
         return $equipment;
@@ -500,7 +500,7 @@ final class ApiEquipmentController extends Controller
         $new->name   = $request->getDataString('name') ?? $new->name;
         $new->info   = $request->getDataString('info') ?? $new->info;
         $new->type   = $request->hasData('type') ? new NullBaseStringL11nType((int) ($request->getDataInt('type') ?? 0)) : $new->type;
-        $new->status = $request->getDataInt('status') ?? $new->status;
+        $new->status = EquipmentStatus::tryFromValue($request->getDataInt('status')) ?? $new->status;
         $new->unit   = $request->getDataInt('unit') ?? $this->app->unitId;
 
         return $new;

Controller/ApiEquipmentTypeController.php

@@ -73,7 +73,10 @@ final class ApiEquipmentTypeController extends Controller
     private function createEquipmentTypeFromRequest(RequestAbstract $request) : BaseStringL11nType
     {
         $equipmentType = new BaseStringL11nType();
-        $equipmentType->setL11n($request->getDataString('title') ?? '', $request->getDataString('language') ?? ISO639x1Enum::_EN);
+        $equipmentType->setL11n(
+            $request->getDataString('title') ?? '',
+            ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? ISO639x1Enum::_EN
+        );
         $equipmentType->title = $request->getDataString('name') ?? '';
 
         return $equipmentType;
@@ -139,9 +142,7 @@ final class ApiEquipmentTypeController extends Controller
     {
         $equipmentTypeL11n           = new BaseStringL11n();
         $equipmentTypeL11n->ref      = $request->getDataInt('type') ?? 0;
-        $equipmentTypeL11n->setLanguage(
-            $request->getDataString('language') ?? $request->header->l11n->language
-        );
+        $equipmentTypeL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language;
         $equipmentTypeL11n->content  = $request->getDataString('title') ?? '';
 
         return $equipmentTypeL11n;
@@ -327,9 +328,7 @@ final class ApiEquipmentTypeController extends Controller
      */
     public function updateEquipmentTypeL11nFromRequest(RequestAbstract $request, BaseStringL11n $new) : BaseStringL11n
     {
-        $new->setLanguage(
-            $request->getDataString('language') ?? $new->language
-        );
+        $new->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $new->language;
         $new->content  = $request->getDataString('title') ?? $new->content;
 
         return $new;

Controller/ApiInspectionTypeController.php

@@ -80,7 +80,7 @@ final class ApiInspectionTypeController extends Controller
         $inspection              = new Inspection();
         $inspection->reference   = (int) $request->getData('ref');
         $inspection->description = $request->getDataString('description') ?? '';
-        $inspection->status      = $request->getDataInt('status') ?? InspectionStatus::TODO;
+        $inspection->status      = InspectionStatus::tryFromValue($request->getDataInt('status')) ?? InspectionStatus::TODO;
         $inspection->next        = $request->getDataDateTime('next') ?? null;
         $inspection->date        = $request->getDataDateTime('date') ?? null;
         $inspection->interval    = $request->getDataInt('interval') ?? 0;
@@ -147,7 +147,10 @@ final class ApiInspectionTypeController extends Controller
     private function createInspectionTypeFromRequest(RequestAbstract $request) : BaseStringL11nType
     {
         $equipmentType = new BaseStringL11nType();
-        $equipmentType->setL11n($request->getDataString('title') ?? '', $request->getDataString('language') ?? ISO639x1Enum::_EN);
+        $equipmentType->setL11n(
+            $request->getDataString('title') ?? '',
+            ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? ISO639x1Enum::_EN
+        );
         $equipmentType->title = $request->getDataString('name') ?? '';
 
         return $equipmentType;
@@ -213,9 +216,7 @@ final class ApiInspectionTypeController extends Controller
     {
         $equipmentTypeL11n           = new BaseStringL11n();
         $equipmentTypeL11n->ref      = $request->getDataInt('type') ?? 0;
-        $equipmentTypeL11n->setLanguage(
-            $request->getDataString('language') ?? $request->header->l11n->language
-        );
+        $equipmentTypeL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language;
         $equipmentTypeL11n->content  = $request->getDataString('title') ?? '';
 
         return $equipmentTypeL11n;
@@ -401,9 +402,7 @@ final class ApiInspectionTypeController extends Controller
      */
     public function updateInspectionTypeL11nFromRequest(RequestAbstract $request, BaseStringL11n $new) : BaseStringL11n
     {
-        $new->setLanguage(
-            $request->getDataString('language') ?? $new->language
-        );
+        $new->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $new->language;
         $new->content  = $request->getDataString('title') ?? $new->content;
 
         return $new;

Controller/BackendController.php

@@ -14,8 +14,6 @@ declare(strict_types=1);
 
 namespace Modules\EquipmentManagement\Controller;
 
-use Modules\Admin\Models\LocalizationMapper;
-use Modules\Admin\Models\SettingsEnum;
 use Modules\EquipmentManagement\Models\Attribute\EquipmentAttributeTypeL11nMapper;
 use Modules\EquipmentManagement\Models\Attribute\EquipmentAttributeTypeMapper;
 use Modules\EquipmentManagement\Models\EquipmentMapper;
@@ -152,14 +150,11 @@ final class BackendController extends Controller
     {
         $view = new View($this->app->l11nManager, $request, $response);
 
-        $view->setTemplate('/Modules/EquipmentManagement/Theme/Backend/equipment-profile');
+        $view->setTemplate('/Modules/EquipmentManagement/Theme/Backend/equipment-view');
         $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1008402001, $request, $response);
 
-        /** @var \Model\Setting $settings */
-        $settings = $this->app->appSettings->get(null, SettingsEnum::DEFAULT_LOCALIZATION);
-
         $view->data['attributeView']                               = new \Modules\Attribute\Theme\Backend\Components\AttributeView($this->app->l11nManager, $request, $response);
-        $view->data['attributeView']->data['default_localization'] = LocalizationMapper::get()->where('id', (int) $settings->id)->execute();
+        $view->data['attributeView']->data['default_localization'] = $this->app->l11nServer;
 
         $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);
@@ -179,11 +174,11 @@ final class BackendController extends Controller
      * @since 1.0.0
      * @codeCoverageIgnore
      */
-    public function viewEquipmentManagementEquipmentProfile(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
+    public function viewEquipmentManagementEquipmentView(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
     {
         $view = new View($this->app->l11nManager, $request, $response);
 
-        $view->setTemplate('/Modules/EquipmentManagement/Theme/Backend/equipment-profile');
+        $view->setTemplate('/Modules/EquipmentManagement/Theme/Backend/equipment-view');
         $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1008402001, $request, $response);
 
         // @todo This langauge filtering doesn't work. But it was working with the old mappers. Maybe there is a bug in the where() definition. Need to inspect the actual query.
@@ -192,6 +187,7 @@ final class BackendController extends Controller
             ->with('attributes/type')
             ->with('attributes/value')
             ->with('attributes/type/l11n')
+            //->with('attributes/value/l11n')
             ->with('files')
             ->with('files/types')
             ->with('type')
@@ -202,6 +198,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)
             ->execute();
 
         $view->data['equipment'] = $equipment;
@@ -249,11 +246,8 @@ final class BackendController extends Controller
 
         $view->data['units'] = $units;
 
-        /** @var \Model\Setting $settings */
-        $settings = $this->app->appSettings->get(null, SettingsEnum::DEFAULT_LOCALIZATION);
-
         $view->data['attributeView']                               = new \Modules\Attribute\Theme\Backend\Components\AttributeView($this->app->l11nManager, $request, $response);
-        $view->data['attributeView']->data['default_localization'] = LocalizationMapper::get()->where('id', (int) $settings->id)->execute();
+        $view->data['attributeView']->data['default_localization'] = $this->app->l11nServer;
 
         $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);

Models/Attribute/EquipmentAttributeTypeMapper.php

@@ -43,6 +43,7 @@ final class EquipmentAttributeTypeMapper extends DataMapperFactory
         'equipmgmt_attr_type_fields'     => ['name' => 'equipmgmt_attr_type_fields',   'type' => 'int',    'internal' => 'fields'],
         'equipmgmt_attr_type_custom'     => ['name' => 'equipmgmt_attr_type_custom',   'type' => 'bool',   'internal' => 'custom'],
         'equipmgmt_attr_type_repeatable' => ['name' => 'equipmgmt_attr_type_repeatable',   'type' => 'bool',   'internal' => 'repeatable'],
+        'equipmgmt_attr_type_internal'   => ['name' => 'equipmgmt_attr_type_internal',   'type' => 'bool',   'internal' => 'isInternal'],
         'equipmgmt_attr_type_pattern'    => ['name' => 'equipmgmt_attr_type_pattern',  'type' => 'string', 'internal' => 'validationPattern'],
         'equipmgmt_attr_type_required'   => ['name' => 'equipmgmt_attr_type_required', 'type' => 'bool',   'internal' => 'isRequired'],
     ];

Models/EquipmentTypeL11nMapper.php

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

Models/InspectionMapper.php

@@ -17,7 +17,7 @@ namespace Modules\EquipmentManagement\Models;
 use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
- *  mapper class.
+ * Inspection mapper class.
  *
  * @package Modules\EquipmentManagement\Models
  * @license OMS License 2.0

Models/InspectionTypeL11nMapper.php

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

Theme/Backend/attribute-type.tpl.php

@@ -86,7 +86,7 @@ echo $this->data['nav']->render(); ?>
                     <tr>
                         <td><a href="#"><i class="g-icon">close</i></a>
                         <td><a href="#"><i class="g-icon">settings</i></a>
-                        <td><?= ISO639Enum::getByName('_' . \strtoupper($value->getLanguage())); ?>
+                        <td><?= ISO639Enum::getByName('_' . \strtoupper($value->language)); ?>
                         <td><?= $value->content; ?>
                     <?php endforeach; ?>
                     <?php if ($c === 0) : ?>

Theme/Backend/equipment-list.tpl.php

@@ -24,53 +24,53 @@ echo $this->data['nav']->render(); ?>
         <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Equipments'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
-            <table id="iSalesClientList" class="default sticky">
+            <table id="iEquipmentList" class="default sticky">
                 <thead>
                 <tr>
                     <td>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
-                        <label for="iSalesClientList-sort-1">
-                            <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-1">
+                        <label for="iEquipmentList-sort-1">
+                            <input type="radio" name="iEquipmentList-sort" id="iEquipmentList-sort-1">
                             <i class="sort-asc g-icon">expand_less</i>
                         </label>
-                        <label for="iSalesClientList-sort-2">
-                            <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-2">
+                        <label for="iEquipmentList-sort-2">
+                            <input type="radio" name="iEquipmentList-sort" id="iEquipmentList-sort-2">
                             <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
                             <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td><?= $this->getHtml('Status'); ?>
-                        <label for="iSalesClientList-sort-3">
-                            <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-3">
+                        <label for="iEquipmentList-sort-3">
+                            <input type="radio" name="iEquipmentList-sort" id="iEquipmentList-sort-3">
                             <i class="sort-asc g-icon">expand_less</i>
                         </label>
-                        <label for="iSalesClientList-sort-4">
-                            <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-4">
+                        <label for="iEquipmentList-sort-4">
+                            <input type="radio" name="iEquipmentList-sort" id="iEquipmentList-sort-4">
                             <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
                             <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td class="wf-100"><?= $this->getHtml('Name'); ?>
-                        <label for="iSalesClientList-sort-5">
-                            <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-5">
+                        <label for="iEquipmentList-sort-5">
+                            <input type="radio" name="iEquipmentList-sort" id="iEquipmentList-sort-5">
                             <i class="sort-asc g-icon">expand_less</i>
                         </label>
-                        <label for="iSalesClientList-sort-6">
-                            <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-6">
+                        <label for="iEquipmentList-sort-6">
+                            <input type="radio" name="iEquipmentList-sort" id="iEquipmentList-sort-6">
                             <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
                             <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td><?= $this->getHtml('Type'); ?>
-                        <label for="iSalesClientList-sort-7">
-                            <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-7">
+                        <label for="iEquipmentList-sort-7">
+                            <input type="radio" name="iEquipmentList-sort" id="iEquipmentList-sort-7">
                             <i class="sort-asc g-icon">expand_less</i>
                         </label>
-                        <label for="iSalesClientList-sort-8">
-                            <input type="radio" name="iSalesClientList-sort" id="iSalesClientList-sort-8">
+                        <label for="iEquipmentList-sort-8">
+                            <input type="radio" name="iEquipmentList-sort" id="iEquipmentList-sort-8">
                             <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
@@ -81,7 +81,7 @@ echo $this->data['nav']->render(); ?>
                     $count = 0;
                     foreach ($equipments as $key => $value) :
                         ++$count;
-                        $url = UriFactory::build('{/base}/equipment/equipment/profile?{?}&id=' . $value->id);
+                        $url = UriFactory::build('{/base}/equipment/equipment/view?{?}&id=' . $value->id);
                 ?>
                 <tr data-href="<?= $url; ?>">
                     <td>

Theme/Backend/equipment-view.tpl.php

@@ -25,10 +25,8 @@ $equipmentStatus = EquipmentStatus::getConstants();
  * @var \Modules\EquipmentManagement\Models\Equipment $equipment
  */
 $equipment      = $this->data['equipment'] ?? new NullEquipment();
-$files           = $equipment->files;
 $equipmentImage = $this->data['equipmentImage'] ?? new NullMedia();
 $equipmentTypes = $this->data['types'] ?? [];
-$attributeView   = $this->data['attributeView'];
 
 /**
  * @var \phpOMS\Views\View $this
@@ -142,7 +140,7 @@ echo $this->data['nav']->render();
         <input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-2' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
-                <?= $attributeView->render(
+                <?= $this->data['attributeView']->render(
                     $equipment->attributes,
                     $this->data['attributeTypes'] ?? [],
                     $this->data['units'] ?? [],

tests/Bootstrap.php

@@ -1,4 +1,15 @@
 <?php
+/**
+ * Jingga
+ *
+ * PHP Version 8.1
+ *
+ * @package   Modules\EquipmentManagement\tests
+ * @copyright Dennis Eichhorn
+ * @license   OMS License 2.0
+ * @version   1.0.0
+ * @link      https://jingga.app
+ */
 declare(strict_types=1);
 
 \ini_set('memory_limit', '2048M');

tests/Controller/Api/ApiControllerAttributeTrait.php

@@ -19,7 +19,6 @@ use phpOMS\Localization\ISO639x1Enum;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Message\Http\RequestStatusCode;
-use phpOMS\Uri\HttpUri;
 
 trait ApiControllerAttributeTrait
 {
@@ -30,7 +29,7 @@ trait ApiControllerAttributeTrait
     public function testApiEquipmentAttributeTypeCreate() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('name', 'test_attribute');
@@ -48,7 +47,7 @@ trait ApiControllerAttributeTrait
     public function testApiEquipmentAttributeTypeL11nCreate() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('title', 'DE:2');
@@ -66,7 +65,7 @@ trait ApiControllerAttributeTrait
     public function testApiEquipmentAttributeValueIntCreate() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('default', '1');
@@ -86,7 +85,7 @@ trait ApiControllerAttributeTrait
     public function testApiEquipmentAttributeValueStrCreate() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('type', '1');
@@ -105,7 +104,7 @@ trait ApiControllerAttributeTrait
     public function testApiEquipmentAttributeValueFloatCreate() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('type', '1');
@@ -124,7 +123,7 @@ trait ApiControllerAttributeTrait
     public function testApiEquipmentAttributeValueDatCreate() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('type', '1');
@@ -143,7 +142,7 @@ trait ApiControllerAttributeTrait
     public function testApiEquipmentAttributeCreate() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('ref', '1');
@@ -161,7 +160,7 @@ trait ApiControllerAttributeTrait
     public function testApiEquipmentAttributeValueCreateInvalidData() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('invalid', '1');
@@ -177,7 +176,7 @@ trait ApiControllerAttributeTrait
     public function testApiEquipmentAttributeTypeCreateInvalidData() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('invalid', '1');
@@ -193,7 +192,7 @@ trait ApiControllerAttributeTrait
     public function testApiEquipmentAttributeTypeL11nCreateInvalidData() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('invalid', '1');
@@ -209,7 +208,7 @@ trait ApiControllerAttributeTrait
     public function testApiEquipmentAttributeCreateInvalidData() : void
     {
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $request->header->account = 1;
         $request->setData('invalid', '1');

tests/Controller/Api/ApiControllerEquipmentTrait.php

@@ -17,7 +17,6 @@ namespace Modules\EquipmentManagement\tests\Controller\Api;
 use Modules\EquipmentManagement\Models\EquipmentTypeMapper;
 use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\HttpResponse;
-use phpOMS\Uri\HttpUri;
 use phpOMS\Utils\RnG\Text;
 
 trait ApiControllerEquipmentTrait
@@ -32,7 +31,7 @@ trait ApiControllerEquipmentTrait
         $equipmentTypeCount = \count($equipmentType);
 
         $response = new HttpResponse();
-        $request  = new HttpRequest(new HttpUri(''));
+        $request  = new HttpRequest();
 
         $LOREM       = \array_slice(Text::LOREM_IPSUM, 0, 25);
         $LOREM_COUNT = \count($LOREM) - 1;