From ec5e074fe60ad6ae42336b2fbb772371d2e30360 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nnes.com@googlemail.com>
Date: Wed, 17 Apr 2024 17:45:07 +0000
Subject: [PATCH] fix templates

---
 Controller/BackendController.php     | 55 +++++++---------------------
 Theme/Backend/support-ticket.tpl.php |  6 +--
 Theme/Backend/ticket-create.tpl.php  | 12 +-----
 3 files changed, 17 insertions(+), 56 deletions(-)

diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 9f8ea63..4fb9a43 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -83,7 +83,7 @@ final class BackendController extends Controller
         $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response);
 
         // @todo Use ticket implementation "getAnyRelatedToUser($request->header->account)
-        $mapperQuery = TicketMapper::getAnyRelatedToUser($request->header->account)
+        $view->data['tickets'] = TicketMapper::getAnyRelatedToUser($request->header->account)
             ->with('task')
             ->with('task/createdBy')
             ->with('task/for')
@@ -92,17 +92,13 @@ final class BackendController extends Controller
             ->with('task/taskElements/accRelation/relation')
             ->with('app')
             ->sort('task/createdAt', OrderType::DESC)
-            ->limit(25);
-
-        if ($request->getData('ptype') === 'p') {
-            $mapperQuery->where('id', $request->getDataInt('offset') ?? 0, '<');
-        } elseif ($request->getData('ptype') === 'n') {
-            $mapperQuery->where('id', $request->getDataInt('offset') ?? 0, '>');
-        } else {
-            $mapperQuery->where('id', 0, '>');
-        }
-
-        $view->data['tickets'] = $mapperQuery->execute();
+            ->limit(50)
+            ->paginate(
+                'id',
+                $request->getData('ptype'),
+                $request->getDataInt('offset')
+            )
+            ->executeGetArray();
 
         $openQuery = new Builder($this->app->dbPool->get(), true);
         $openQuery->innerJoin(TaskMapper::TABLE, TaskMapper::TABLE . '_d2_task')
@@ -113,8 +109,7 @@ final class BackendController extends Controller
                 ->on(TaskElementMapper::TABLE . '.' . TaskElementMapper::PRIMARYFIELD, '=', AccountRelationMapper::TABLE . '.task_account_task_element')
             ->andWhere(AccountRelationMapper::TABLE . '.task_account_account', '=', $request->header->account);
 
-        /** @var \Modules\Tasks\Models\Task[] $open */
-        $open = TicketMapper::getAll()
+        $view->data['open'] = TicketMapper::getAll()
             ->with('task')
             ->with('task/createdBy')
             ->where('task/type', TaskType::TEMPLATE, '!=')
@@ -123,8 +118,6 @@ final class BackendController extends Controller
             ->query($openQuery)
             ->executeGetArray();
 
-        $view->data['open'] = $open;
-
         $view->data['stats'] = TicketMapper::getStatOverview();
 
         return $view;
@@ -154,11 +147,10 @@ final class BackendController extends Controller
             ->with('task/createdBy')
             ->with('task/tags')
             ->with('task/tags/title')
-            ->with('ticketElements')
-            ->with('ticketElements/taskElement')
-            ->with('ticketElements/taskElement/createdBy')
-            ->with('ticketElements/taskElement/media')
-            ->with('attributes')
+            ->with('task/taskElements')
+            ->with('task/taskElements/createdBy')
+            ->with('task/taskElements/media')
+            ->with('task/attributes')
             ->with('task/for')
             ->with('app')
             ->where('task/tags/title/language', $request->header->l11n->language);
@@ -226,27 +218,6 @@ final class BackendController extends Controller
         return $view;
     }
 
-    /**
-     * Routing end-point for application behavior.
-     *
-     * @param RequestAbstract  $request  Request
-     * @param ResponseAbstract $response Response
-     * @param array            $data     Generic data
-     *
-     * @return RenderableInterface
-     *
-     * @since 1.0.0
-     * @codeCoverageIgnore
-     */
-    public function viewSupportAnalysis(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
-    {
-        $view = new View($this->app->l11nManager, $request, $response);
-        $view->setTemplate('/Modules/Support/Theme/Backend/support-analysis');
-        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response);
-
-        return $view;
-    }
-
     /**
      * Routing end-point for application behavior.
      *
diff --git a/Theme/Backend/support-ticket.tpl.php b/Theme/Backend/support-ticket.tpl.php
index 8cc7a86..8f20691 100755
--- a/Theme/Backend/support-ticket.tpl.php
+++ b/Theme/Backend/support-ticket.tpl.php
@@ -178,7 +178,7 @@ echo $this->data['nav']->render(); ?>
             <?php $c = 0; $previous = null;
             foreach ($elements as $key => $element) : ++$c; ?>
                 <?php if (($c === 1 && $element->status !== TaskStatus::OPEN)
-                    || ($previous !== null && $element->status !== $previous->taskElement->status)
+                    || ($previous !== null && $element->status !== $previous->status)
                 ) : ?>
                     <section class="portlet">
                         <div class="portlet-body">
@@ -194,7 +194,7 @@ echo $this->data['nav']->render(); ?>
                 <?php endif; ?>
 
                 <?php if (($c === 1 && $element->priority !== $task->priority)
-                    || ($previous !== null && $element->priority !== $previous->taskElement->priority)
+                    || ($previous !== null && $element->priority !== $previous->priority)
                 ) : ?>
                     <section class="portlet">
                         <div class="portlet-body">
@@ -266,7 +266,7 @@ echo $this->data['nav']->render(); ?>
                                         )
                                     ) : ?>
                                     <?= $this->getHtml('Due'); ?>: <?= $this->printHtml($element->due->format('Y/m/d H:i')); ?>
-                                <?php elseif ($previous !== null && $previous->taskElement->priority !== $element->priority) : ?>
+                                <?php elseif ($previous !== null && $previous->priority !== $element->priority) : ?>
                                     <?= $this->getHtml('Priority'); ?>: <?= $this->getHtml('P' . $element->priority, 'Tasks'); ?>
                                 <?php endif; ?>
                             </div>
diff --git a/Theme/Backend/ticket-create.tpl.php b/Theme/Backend/ticket-create.tpl.php
index a1be0c6..2960619 100755
--- a/Theme/Backend/ticket-create.tpl.php
+++ b/Theme/Backend/ticket-create.tpl.php
@@ -20,19 +20,9 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-6">
         <section class="portlet">
-            <form action="<?= \phpOMS\Uri\UriFactory::build('{/api}helper/template?csrf={$CSRF}'); ?>" method="post">
+            <form action="<?= \phpOMS\Uri\UriFactory::build('{/api}support/ticket?csrf={$CSRF}'); ?>" method="post">
                 <div class="portlet-head"><?= $this->getHtml('Ticket'); ?></div>
                 <div class="portlet-body">
-                    <div class="form-group">
-                        <label for="iDepartment"><?= $this->getHtml('Department'); ?></label>
-                        <select id="iDepartment" name="department"></select>
-                    </div>
-
-                    <div class="form-group">
-                        <label for="iTopic"><?= $this->getHtml('Topic'); ?></label>
-                        <select id="iTopic" name="topic"></select>
-                    </div>
-
                     <div class="form-group">
                         <label for="iTitle"><?= $this->getHtml('Title'); ?></label>
                         <input id="iTitle" name="name" type="text" required>