ui fixes

Admin/Install/attributes.json

@@ -8,7 +8,7 @@
         "value_type": "int",
         "is_custom_allowed": false,
         "validation_pattern": "",
-        "is_required": true,
+        "is_required": false,
         "default_value": "",
         "values": [
             {
@@ -19,5 +19,126 @@
                 }
             }
         ]
+    },
+    {
+        "name": "item",
+        "l11n": {
+            "en": "Item",
+            "de": "Artikel"
+        },
+        "value_type": "int",
+        "is_custom_allowed": true,
+        "validation_pattern": "",
+        "is_required": false,
+        "default_value": "",
+        "values": []
+    },
+    {
+        "name": "lot_external",
+        "l11n": {
+            "en": "Lot/SN External",
+            "de": "Charge/SN Extern"
+        },
+        "value_type": "int",
+        "is_custom_allowed": true,
+        "validation_pattern": "",
+        "is_required": false,
+        "default_value": "",
+        "values": []
+    },
+    {
+        "name": "lot_internal",
+        "l11n": {
+            "en": "Lot/SN",
+            "de": "Charge/SN"
+        },
+        "value_type": "int",
+        "is_custom_allowed": true,
+        "validation_pattern": "",
+        "is_required": false,
+        "default_value": "",
+        "values": []
+    },
+    {
+        "name": "justified",
+        "l11n": {
+            "en": "Justified",
+            "de": "Berechtigt"
+        },
+        "value_type": 1,
+        "is_custom_allowed": true,
+        "validation_pattern": "",
+        "is_required": false,
+        "default_value": "",
+        "values": [
+            {
+                "value": 0
+            },
+            {
+                "value": 1
+            }
+        ]
+    },
+    {
+        "name": "recall",
+        "l11n": {
+            "en": "Recall",
+            "de": "Rückruf"
+        },
+        "value_type": 1,
+        "is_custom_allowed": true,
+        "validation_pattern": "",
+        "is_required": false,
+        "default_value": "",
+        "values": [
+            {
+                "value": 0
+            },
+            {
+                "value": 1
+            }
+        ]
+    },
+    {
+        "name": "measure",
+        "l11n": {
+            "en": "measure",
+            "de": "Maßnahme"
+        },
+        "value_type": 1,
+        "is_custom_allowed": true,
+        "validation_pattern": "",
+        "is_required": false,
+        "default_value": "",
+        "values": [
+            {
+                "value": 1,
+                "l11n": {
+                    "en": "None",
+                    "de": "Keine"
+                }
+            },
+            {
+                "value": 2,
+                "l11n": {
+                    "en": "Other",
+                    "de": "Sonstige"
+                }
+            },
+            {
+                "value": 3,
+                "l11n": {
+                    "en": "Replace",
+                    "de": "Austausch"
+                }
+            },
+            {
+                "value": 4,
+                "l11n": {
+                    "en": "Discount",
+                    "de": "Nachlass"
+                }
+            }
+        ]
     }
 ]

Admin/Install/db.json

@@ -109,6 +109,14 @@
                 "name": "task_created_at",
                 "type": "DATETIME",
                 "null": false
+            },
+            "task_unit": {
+                "name": "task_unit",
+                "type": "INT",
+                "null": true,
+                "default": null,
+                "foreignTable": "unit",
+                "foreignKey": "unit_id"
             }
         }
     },

Admin/Routes/Web/Api.php

@@ -23,6 +23,7 @@ return [
             'dest'       => '\Modules\Tasks\Controller\ApiController:apiTaskCreate',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -33,6 +34,7 @@ return [
             'dest'       => '\Modules\Tasks\Controller\ApiController:apiTaskSet',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::MODIFY,
@@ -43,6 +45,7 @@ return [
             'dest'       => '\Modules\Tasks\Controller\ApiController:apiTaskGet',
             'verb'       => RouteVerb::GET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,
@@ -55,6 +58,7 @@ return [
             'dest'       => '\Modules\Tasks\Controller\ApiController:apiTaskReminderCreate',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -67,6 +71,7 @@ return [
             'dest'       => '\Modules\Tasks\Controller\ApiController:apiTaskElementCreate',
             'verb'       => RouteVerb::PUT,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -77,6 +82,7 @@ return [
             'dest'       => '\Modules\Tasks\Controller\ApiController:apiTaskElementSet',
             'verb'       => RouteVerb::SET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::MODIFY,
@@ -87,6 +93,7 @@ return [
             'dest'       => '\Modules\Tasks\Controller\ApiController:apiTaskElementGet',
             'verb'       => RouteVerb::GET,
             'csrf'       => true,
+            'active' => true,
             'permission' => [
                 'module' => ApiController::NAME,
                 'type'   => PermissionType::READ,

Admin/Routes/Web/Backend.php

@@ -22,6 +22,7 @@ return [
         [
             'dest'       => '\Modules\Tasks\Controller\BackendController:viewTaskDashboard',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -33,6 +34,7 @@ return [
         [
             'dest'       => '\Modules\Tasks\Controller\BackendController:viewTaskList',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -44,6 +46,7 @@ return [
         [
             'dest'       => '\Modules\Tasks\Controller\BackendController:viewTaskView',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,
@@ -55,6 +58,7 @@ return [
         [
             'dest'       => '\Modules\Tasks\Controller\BackendController:viewTaskCreate',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::CREATE,
@@ -66,6 +70,7 @@ return [
         [
             'dest'       => '\Modules\Tasks\Controller\BackendController:viewTaskAnalysis',
             'verb'       => RouteVerb::GET,
+            'active' => true,
             'permission' => [
                 'module' => BackendController::NAME,
                 'type'   => PermissionType::READ,

Controller/ApiController.php

@@ -463,6 +463,7 @@ final class ApiController extends Controller
         $task->status         = TaskStatus::OPEN;
         $task->type           = TaskType::tryFromValue($request->getDataInt('type')) ?? TaskType::SINGLE;
         $task->redirect       = $request->getDataString('redirect') ?? '';
+        $task->unit           = $request->getDataInt('unit');
 
         if ($request->hasData('due')) {
             $task->due = $request->getDataDateTime('due');

Controller/BackendController.php

@@ -18,6 +18,7 @@ use Modules\Dashboard\Models\DashboardElementInterface;
 use Modules\Media\Models\MediaMapper;
 use Modules\Profile\Models\SettingsEnum;
 use Modules\Tasks\Models\AccountRelationMapper;
+use Modules\Tasks\Models\Attribute\TaskAttributeTypeMapper;
 use Modules\Tasks\Models\PermissionCategory;
 use Modules\Tasks\Models\TaskElementMapper;
 use Modules\Tasks\Models\TaskMapper;
@@ -289,8 +290,15 @@ final class BackendController extends Controller implements DashboardElementInte
             ->with('taskElements/media')
             ->with('taskElements/accRelation')
             ->with('taskElements/accRelation/relation')
+            ->with('attributes')
+            ->with('attributes/type')
+            ->with('attributes/type/l11n')
+            ->with('attributes/value')
+            ->with('attributes/value/l11n')
             ->where('id', (int) $request->getData('id'))
             ->where('tags/title/language', $request->header->l11n->language)
+            ->where('attributes/type/l11n/language', $response->header->l11n->language)
+            ->where('attributes/value/l11n/language', [$response->header->l11n->language, null])
             ->execute();
 
         $accountId = $request->header->account;
@@ -306,6 +314,11 @@ final class BackendController extends Controller implements DashboardElementInte
             return $view;
         }
 
+        $view->data['attributeTypes'] = TaskAttributeTypeMapper::getAll()
+            ->with('l11n')
+            ->where('l11n/language', $response->header->l11n->language)
+            ->executeGetArray();
+
         $reminderStatus = [];
 
         // Set task as seen
@@ -350,11 +363,12 @@ final class BackendController extends Controller implements DashboardElementInte
         $view->data['task'] = $task;
         $view->data['nav']  = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response);
 
-        $accGrpSelector               = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response);
+        $view->data['accGrpSelector'] = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response);
-        $view->data['accGrpSelector'] = $accGrpSelector;
 
-        $editor               = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
+        $view->data['editor'] = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
-        $view->data['editor'] = $editor;
+
+        $view->data['attributeView']                               = new \Modules\Attribute\Theme\Backend\Components\AttributeView($this->app->l11nManager, $request, $response);
+        $view->data['attributeView']->data['default_localization'] = $this->app->l11nServer;
 
         return $view;
     }

Models/AccountRelationMapper.php

@@ -18,7 +18,7 @@ use Modules\Admin\Models\AccountMapper;
 use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
- * Mapper class.
+ * AccountRelation mapper class.
  *
  * @package Modules\Tasks\Models
  * @license OMS License 2.0

Models/GroupRelationMapper.php

@@ -18,7 +18,7 @@ use Modules\Admin\Models\GroupMapper;
 use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
- * Mapper class.
+ * GroupRelation mapper class.
  *
  * @package Modules\Tasks\Models
  * @license OMS License 2.0

Models/Task.php

@@ -208,6 +208,8 @@ class Task implements \JsonSerializable
      */
     public ?Account $for = null;
 
+    public ?int $unit = null;
+
     /**
      * Constructor.
      *

Models/TaskElementMapper.php

@@ -19,7 +19,7 @@ use Modules\Media\Models\MediaMapper;
 use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
- * Mapper class.
+ * TaskElement mapper class.
  *
  * @package Modules\Tasks\Models
  * @license OMS License 2.0

Models/TaskMapper.php

@@ -25,7 +25,7 @@ use phpOMS\DataStorage\Database\Query\Builder;
 use phpOMS\DataStorage\Database\Query\Where;
 
 /**
- * Mapper class.
+ * Task mapper class.
  *
  * @package Modules\Tasks\Models
  * @license OMS License 2.0
@@ -63,6 +63,7 @@ final class TaskMapper extends DataMapperFactory
         'task_created_by' => ['name' => 'task_created_by', 'type' => 'int',      'internal' => 'createdBy', 'readonly' => true],
         'task_for'        => ['name' => 'task_for', 'type' => 'int',      'internal' => 'for'],
         'task_created_at' => ['name' => 'task_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true],
+        'task_unit'        => ['name' => 'task_unit', 'type' => 'int',      'internal' => 'unit'],
     ];
 
     /**

Theme/Backend/task-view.tpl.php

@@ -27,8 +27,17 @@ $cElements = \count($elements);
 $color     = $this->getStatus($task->status);
 
 echo $this->data['nav']->render(); ?>
-
+<div class="tabview tab-2">
-<div class="row">
+    <div class="box">
+        <ul class="tab-links">
+            <li><label for="c-tab-1"><?= $this->getHtml('Task'); ?></label>
+            <li><label for="c-tab-2"><?= $this->getHtml('Attributes', 'Attribute', 'Backend'); ?></label>
+        </ul>
+    </div>
+    <div class="tab-content">
+        <input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-1' ? ' checked' : ''; ?>>
+        <div class="tab">
+            <div class="row">
                 <div class="col-md-6 col-xs-12">
                     <?php if (!empty($this->data['reminder'])) : ?>
                     <section class="portlet hl-4">
@@ -427,4 +436,22 @@ echo $this->data['nav']->render(); ?>
                         </form>
                     </div>
                 </div>
+            </div>
+        </div>
+
+        <input type="radio" id="c-tab-2" name="tabular-2" checked>
+        <div class="tab">
+            <div class="row">
+                <?= $this->data['attributeView']->render(
+                    $task->attributes,
+                    $this->data['attributeTypes'] ?? [],
+                    $this->data['units'] ?? [],
+                    '{/api}task/attribute?csrf={$CSRF}',
+                    $task->id
+                );
+                ?>
+            </div>
+        </div>
+
+    </div>
 </div>