update

Karaka-Management · Oct 9, 2023 · 7fc48d2 · 7fc48d2
1 parent cb31112
commit 7fc48d2
Show file tree

Hide file tree

Showing 30 changed files with 254 additions and 84 deletions.
diff --git a/Admin/Installer.php b/Admin/Installer.php
@@ -92,7 +92,7 @@ private static function createTaskAttributeTypes(ApplicationAbstract $app, array
 
             $module->apiTaskAttributeTypeCreate($request, $response);
 
-            $responseData = $response->get('');
+            $responseData = $response->getData('');
             if (!\is_array($responseData)) {
                 continue;
             }
@@ -164,7 +164,7 @@ private static function createTaskAttributeValues(ApplicationAbstract $app, arra
 
                 $module->apiTaskAttributeValueCreate($request, $response);
 
-                $responseData = $response->get('');
+                $responseData = $response->getData('');
                 if (!\is_array($responseData)) {
                     continue;
                 }

diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php
@@ -47,6 +47,17 @@
             ],
         ],
     ],
+    '^.*/task/reminder(\?.*|$)' => [
+        [
+            'dest'       => '\Modules\Tasks\Controller\ApiController:apiTaskReminderCreate',
+            'verb'       => RouteVerb::PUT,
+            'permission' => [
+                'module' => ApiController::NAME,
+                'type'   => PermissionType::CREATE,
+                'state'  => PermissionCategory::TASK,
+            ],
+        ],
+    ],
     '^.*/task/element.*$' => [
         [
             'dest'       => '\Modules\Tasks\Controller\ApiController:apiTaskElementCreate',

diff --git a/Controller/ApiController.php b/Controller/ApiController.php
@@ -37,6 +37,8 @@
 use Modules\Tasks\Models\TaskElement;
 use Modules\Tasks\Models\TaskElementMapper;
 use Modules\Tasks\Models\TaskMapper;
+use Modules\Tasks\Models\TaskSeen;
+use Modules\Tasks\Models\TaskSeenMapper;
 use Modules\Tasks\Models\TaskStatus;
 use Modules\Tasks\Models\TaskType;
 use phpOMS\Localization\BaseStringL11n;
@@ -57,6 +59,53 @@
  */
 final class ApiController extends Controller
 {
+    /**
+     * Api method to remind a task
+     *
+     * @param RequestAbstract  $request  Request
+     * @param ResponseAbstract $response Response
+     * @param array            $data     Generic data
+     *
+     * @return void
+     *
+     * @api
+     *
+     * @since 1.0.0
+     */
+    public function apiTaskReminderCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
+    {
+        if (!empty($val = $this->validateTaskReminderCreate($request))) {
+            $response->header->status = RequestStatusCode::R_400;
+            $this->createInvalidCreateResponse($request, $response, $val);
+
+            return;
+        }
+
+        /** @var TaskSeen[] $reminder */
+        $reminder = $this->createTaskReminderFromRequest($request);
+        $this->createModel($request->header->account, $reminder, TaskSeenMapper::class, 'reminder', $request->getOrigin());
+        $this->createStandardCreateResponse($request, $response, $reminder);
+    }
+
+    /**
+     * Validate reminder create request
+     *
+     * @param RequestAbstract $request Request
+     *
+     * @return array<string, bool> Returns the validation array of the request
+     *
+     * @since 1.0.0
+     */
+    private function validateTaskReminderCreate(RequestAbstract $request) : array
+    {
+        $val = [];
+        if (($val['id'] = !$request->hasData('id'))) {
+            return $val;
+        }
+
+        return [];
+    }
+
     /**
      * Validate task create request
      *
@@ -78,6 +127,34 @@ private function validateTaskCreate(RequestAbstract $request) : array
         return [];
     }
 
+    /**
+     * Method to create remeinder from request.
+     *
+     * @param RequestAbstract $request Request
+     *
+     * @return TaskSeen[] Returns the created reminders from the request
+     *
+     * @since 1.0.0
+     */
+    public function createTaskReminderFromRequest(RequestAbstract $request) : array
+    {
+        /** @var AccountRelation[] $responsible */
+        $responsible = TaskMapper::getResponsible((int) $request->getData('id'));
+
+        $reminder = [];
+        foreach ($responsible as $account) {
+            $unseen             = new TaskSeen();
+            $unseen->task       = (int) $request->getData('id');
+            $unseen->seenBy     = $account->relation->id;
+            $unseen->reminderBy = new NullAccount($request->header->account);
+            $unseen->reminderAt = new \DateTime('now');
+
+            $remidner[] = $unseen;
+        }
+
+        return $reminder;
+    }
+
     /**
      * Api method to create a task
      *
@@ -303,7 +380,7 @@ public function createTaskFromRequest(RequestAbstract $request) : Task
                     $internalResponse = new HttpResponse();
                     $this->app->moduleManager->get('Tag')->apiTagCreate($request, $internalResponse);
 
-                    if (!\is_array($data = $internalResponse->get($request->uri->__toString()))) {
+                    if (!\is_array($data = $internalResponse->getDataArray($request->uri->__toString()))) {
                         continue;
                     }
 
@@ -780,11 +857,11 @@ private function createTaskAttributeFromRequest(RequestAbstract $request) : Task
         $attribute->task = (int) $request->getData('task');
         $attribute->type = new NullTaskAttributeType((int) $request->getData('type'));
 
-        if ($request->hasData('value')) {
-            $attribute->value = new NullTaskAttributeValue((int) $request->getData('value'));
+        if ($request->hasData('value_id')) {
+            $attribute->value = new NullTaskAttributeValue((int) $request->getData('value_id'));
         } else {
             $newRequest = clone $request;
-            $newRequest->setData('value', $request->getData('custom'), true);
+            $newRequest->setData('value', $request->getData('value'), true);
 
             $value = $this->createTaskAttributeValueFromRequest($request);
 

diff --git a/Controller/BackendController.php b/Controller/BackendController.php
@@ -80,16 +80,24 @@ public function viewTaskDashboard(RequestAbstract $request, ResponseAbstract $re
 
         if ($request->getData('ptype') === 'p') {
             $view->data['tasks'] = $mapperQuery->with('createdBy')
-                    ->where('id', $request->getDataInt('id') ?? 0, '<')
-                    ->execute();
+                ->where('id', $request->getDataInt('id') ?? 0, '<')
+                ->execute();
         } elseif ($request->getData('ptype') === 'n') {
             $view->data['tasks'] = $mapperQuery->with('createdBy')
-                    ->where('id', $request->getDataInt('id') ?? 0, '>')
-                    ->execute();
+                ->where('id', $request->getDataInt('id') ?? 0, '>')
+                ->execute();
         } else {
             $view->data['tasks'] = $mapperQuery->with('createdBy')
-                    ->where('id', 0, '>')
-                    ->execute();
+                ->where('id', 0, '>')
+                ->execute();
+        }
+
+        $view->data['task_media'] = [];
+        foreach ($view->data['tasks'] as $task) {
+            $view->data['task_media'][$task->id] = TaskMapper::has()
+                ->with('media')
+                ->where('id', $task->id)
+                ->execute();
         }
 
         $openQuery = new Builder($this->app->dbPool->get(), true);
@@ -112,6 +120,13 @@ public function viewTaskDashboard(RequestAbstract $request, ResponseAbstract $re
 
         $view->data['open'] = $open;
 
+        foreach ($view->data['open'] as $task) {
+            $view->data['task_media'][$task->id] = TaskMapper::has()
+                ->with('media')
+                ->where('id', $task->id)
+                ->execute();
+        }
+
         // given
         // @todo: this should also include forwarded tasks
         /** @var \Modules\Tasks\Models\Task[] $given */
@@ -127,6 +142,13 @@ public function viewTaskDashboard(RequestAbstract $request, ResponseAbstract $re
 
         $view->data['given'] = $given;
 
+        foreach ($view->data['given'] as $task) {
+            $view->data['task_media'][$task->id] = TaskMapper::has()
+                ->with('media')
+                ->where('id', $task->id)
+                ->execute();
+        }
+
         /** @var \Modules\Tasks\Models\TaskSeen[] $unread */
         $unread = TaskSeenMapper::getAll()
             ->where('task', \array_keys($open), 'in')
@@ -144,6 +166,13 @@ public function viewTaskDashboard(RequestAbstract $request, ResponseAbstract $re
 
         $view->data['unread'] = $unseen;
 
+        foreach ($view->data['unread'] as $task) {
+            $view->data['task_media'][$task->id] = TaskMapper::has()
+                ->with('media')
+                ->where('id', $task->id)
+                ->execute();
+        }
+
         return $view;
     }
 
@@ -230,21 +259,45 @@ public function viewTaskView(RequestAbstract $request, ResponseAbstract $respons
             ->where('tags/title/language', $request->header->l11n->language)
             ->execute();
 
+        $accountId = $request->header->account;
+
+        if (!($task->createdBy->id === $accountId
+            || $task->isCCAccount($accountId)
+            || $task->isToAccount($accountId))
+            && !$this->app->accountManager->get($accountId)->hasPermission(
+                PermissionType::READ, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::TASK, $task->id)
+        ) {
+            $view->setTemplate('/Web/Backend/Error/403_inline');
+            $response->header->status = RequestStatusCode::R_403;
+            return $view;
+        }
+
+        $reminderStatus = [];
+
         // Set task as seen
-        if ($task !== 0) {
+        if ($task->id !== 0) {
             /** @var \Modules\Tasks\Models\TaskSeen[] $taskSeen */
             $taskSeen = TaskSeenMapper::getAll()
-                ->where('task', (int) $request->getData('id'))
+                ->with('reminderBy')
+                ->where('task', $task->id)
                 ->where('seenBy', $request->header->account)
                 ->execute();
 
             foreach ($taskSeen as $unseen) {
-                if ($unseen->isRemindered && ($unseen->reminderAt?->getTimestamp() ?? 0) < $request->header->getRequestTime()) {
-                    $old = clone $unseen;
-
-                    $unseen->isRemindered = false;
-
-                    $this->updateModel($request->header->account, $old, $unseen, TaskSeenMapper::class, 'task_seen', $request->getOrigin());
+                // Shows all reminders
+                if ($unseen->reminderBy !== null
+                    && ($unseen->reminderAt?->getTimestamp() ?? 0) < $request->header->getRequestTime()
+                    && ($unseen->reminderAt?->getTimestamp() ?? 0) > ($unseen->seenAt?->getTimestamp() ?? 0) - 300
+                ) {
+                    $reminderStatus[] = $unseen;
+
+                    if ($unseen->isRemindered) {
+                        $new               = clone $unseen;
+                        $new->seenAt       = new \DateTime('now');
+                        $new->isRemindered = false;
+
+                        $this->updateModel($request->header->account, $unseen, $new, TaskSeenMapper::class, 'reminder_seen', $request->getOrigin());
+                    }
                 }
             }
 
@@ -257,18 +310,7 @@ public function viewTaskView(RequestAbstract $request, ResponseAbstract $respons
             }
         }
 
-        $accountId = $request->header->account;
-
-        if (!($task->createdBy->id === $accountId
-            || $task->isCCAccount($accountId)
-            || $task->isToAccount($accountId))
-            && !$this->app->accountManager->get($accountId)->hasPermission(
-                PermissionType::READ, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::TASK, $task->id)
-        ) {
-            $view->setTemplate('/Web/Backend/Error/403_inline');
-            $response->header->status = RequestStatusCode::R_403;
-            return $view;
-        }
+        $view->data['reminder'] = $reminderStatus;
 
         $view->setTemplate('/Modules/Tasks/Theme/Backend/task-single');
         $view->data['task'] = $task;

diff --git a/Models/TaskMapper.php b/Models/TaskMapper.php
@@ -164,6 +164,28 @@ public static function getOpenCreatedBy(int $user) : array
         return self::getAll()->execute($query);
     }
 
+    /**
+     * Get responsible users for task
+     *
+     * @param int $task Task
+     *
+     * @return AccountRelation[]
+     *
+     * @since 1.0.0
+     */
+    public static function getResponsible(int $task) : array
+    {
+        $query = AccountRelationMapper::getQuery();
+        $query->innerJoin(TaskElementMapper::TABLE)
+                ->on(AccountRelationMapper::TABLE . '_d1.task_account_task_element', '=', TaskElementMapper::TABLE . '.task_element_task')
+            ->innerJoin(self::TABLE)
+                ->on(TaskElementMapper::TABLE . '_d1.task_element_task', '=', self::TABLE . '.task_id')
+            ->where(self::TABLE . '.task_id', '=', $task);
+
+        return AccountRelationMapper::getAll()
+            ->execute($query);
+    }
+
     /**
      * Get open tasks for user
      *

diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php
@@ -20,7 +20,7 @@
     'BCC'                => 'bcc',
     'By'                 => 'بواسطة',
     'CC'                 => 'نسخة',
-    'Completion'         => '#VALUE!',
+    'Completion'         => '',
     'Created'            => 'خلقت',
     'Creator'            => 'المنشئ',
     'Day'                => 'يوم',
@@ -65,7 +65,7 @@
     'Size'               => 'بحجم',
     'Statistics'         => 'إحصائيات',
     'Status'             => 'حالة',
-    'Tag'                => '#VALUE!',
+    'Tag'                => '',
     'Task'               => 'مهمة',
     'Tasks'              => 'مهام',
     'Template'           => 'نموذج',

diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php
@@ -20,7 +20,7 @@
     'BCC'                => 'Bcc.',
     'By'                 => 'Podle',
     'CC'                 => 'Cc.',
-    'Completion'         => '#VALUE!',
+    'Completion'         => '',
     'Created'            => 'Vytvořený',
     'Creator'            => 'Tvůrce',
     'Day'                => 'Den',
@@ -65,7 +65,7 @@
     'Size'               => 'Velikost',
     'Statistics'         => 'Statistika',
     'Status'             => 'Postavení',
-    'Tag'                => '#VALUE!',
+    'Tag'                => '',
     'Task'               => 'Úkol',
     'Tasks'              => 'Úkoly',
     'Template'           => 'Šablona',

diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php
@@ -20,7 +20,7 @@
     'BCC'                => 'BCC.',
     'By'                 => 'Ved',
     'CC'                 => 'Cc.',
-    'Completion'         => '#VALUE!',
+    'Completion'         => '',
     'Created'            => 'Oprettet',
     'Creator'            => 'Skaber.',
     'Day'                => 'Dag',
@@ -65,7 +65,7 @@
     'Size'               => 'Størrelse',
     'Statistics'         => 'Statistikker',
     'Status'             => 'Status.',
-    'Tag'                => '#VALUE!',
+    'Tag'                => '',
     'Task'               => 'Opgave',
     'Tasks'              => 'Opgaver.',
     'Template'           => 'Template.',