From 938d1d339b216139d4aeeb67aaac80a8fb750ea5 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 24 Mar 2018 14:00:51 +0100
Subject: [PATCH] Template fixes

---
 Controller.php                    |  3 ++-
 Theme/Backend/task-create.tpl.php | 35 +++++++++++++++++---------
 Theme/Backend/task-single.tpl.php | 39 ++++++++++++++---------------
 Views/TaskCreate.php              |  0
 Views/TaskView.php                | 41 +++++++++++++++++++++++++++++++
 5 files changed, 85 insertions(+), 33 deletions(-)
 delete mode 100644 Views/TaskCreate.php
 create mode 100644 Views/TaskView.php

diff --git a/Controller.php b/Controller.php
index 239a2a9..6758f91 100644
--- a/Controller.php
+++ b/Controller.php
@@ -24,6 +24,7 @@ use Modules\Tasks\Models\TaskStatus;
 use Modules\Tasks\Models\TaskType;
 use Modules\Tasks\Models\TaskPriority;
 use Modules\Tasks\Models\PermissionState;
+use Modules\Tasks\Views\TaskView;
 
 use phpOMS\Message\Http\RequestStatusCode;
 use phpOMS\Message\RequestAbstract;
@@ -166,7 +167,7 @@ class Controller extends ModuleAbstract implements WebInterface
      */
     public function viewTaskView(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
-        $view = new View($this->app, $request, $response);
+        $view = new TaskView($this->app, $request, $response);
 
         $task      = TaskMapper::get((int) $request->getData('id'));
         $accountId = $request->getHeader()->getAccount();
diff --git a/Theme/Backend/task-create.tpl.php b/Theme/Backend/task-create.tpl.php
index 42935bd..42e03a4 100644
--- a/Theme/Backend/task-create.tpl.php
+++ b/Theme/Backend/task-create.tpl.php
@@ -10,6 +10,10 @@
  * @version    1.0.0
  * @link       http://website.orange-management.de
  */
+
+use \Modules\Tasks\Models\TaskPriority;
+use \Modules\Tasks\Models\TaskType;
+
 /**
  * @var \phpOMS\Views\View $this
  */
@@ -29,13 +33,14 @@ echo $this->getData('nav')->render(); ?>
                         <tr><td><label for="iObserver"><?= $this->getHtml('CC') ?></label>
                         <tr><td><?= $this->getData('accGrpSelector')->render('iCC', false); ?>
                         <tr><td><label for="iPriority"><?= $this->getHtml('Priority') ?></label>
-                        <tr><td><select id="iPriority" name="priority">
-                                <option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskPriority::NONE); ?>" selected><?= $this->getHtml('P0') ?>
-                                <option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskPriority::VLOW); ?>"><?= $this->getHtml('P1') ?>
-                                <option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskPriority::LOW); ?>"><?= $this->getHtml('P2') ?>
-                                <option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskPriority::MEDIUM); ?>"><?= $this->getHtml('P3') ?>
-                                <option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskPriority::HIGH); ?>"><?= $this->getHtml('P4') ?>
-                                <option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskPriority::VHIGH); ?>"><?= $this->getHtml('P5') ?>
+                        <tr><td>
+                            <select id="iPriority" name="priority">
+                                <option value="<?= $this->printHtml(TaskPriority::NONE); ?>" selected><?= $this->getHtml('P0') ?>
+                                <option value="<?= $this->printHtml(TaskPriority::VLOW); ?>"><?= $this->getHtml('P1') ?>
+                                <option value="<?= $this->printHtml(TaskPriority::LOW); ?>"><?= $this->getHtml('P2') ?>
+                                <option value="<?= $this->printHtml(TaskPriority::MEDIUM); ?>"><?= $this->getHtml('P3') ?>
+                                <option value="<?= $this->printHtml(TaskPriority::HIGH); ?>"><?= $this->getHtml('P4') ?>
+                                <option value="<?= $this->printHtml(TaskPriority::VHIGH); ?>"><?= $this->getHtml('P5') ?>
                             </select>
                         <tr><td><label for="iDue"><?= $this->getHtml('Due') ?></label>
                         <tr><td><input type="datetime-local" id="iDue" name="due" value="<?= $this->printHtml((new \DateTime('NOW'))->format('Y-m-d\TH:i:s')); ?>">
@@ -46,7 +51,7 @@ echo $this->getData('nav')->render(); ?>
                         <tr><td><?= $this->getData('editor')->getData('text')->render('editor-text'); ?>
                         <tr><td>
                             <input type="submit" value="<?= $this->getHtml('Create', 0, 0); ?>">
-                            <input type="hidden" name="type" value="<?= $this->printHtml(\Modules\Tasks\Models\TaskType::SINGLE); ?>">
+                            <input type="hidden" name="type" value="<?= $this->printHtml(TaskType::SINGLE); ?>">
                     </table>
                 </form>
             </div>
@@ -61,10 +66,16 @@ echo $this->getData('nav')->render(); ?>
                 <form>
                     <table class="layout wf-100">
                         <tbody>
-                        <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media') ?></label>
-                        <tr><td><input type="text" id="iMedia" name="mediaFile" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select') ?></button>
-                        <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload') ?></label>
-                        <tr><td><input type="file" id="iUpload" name="upload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
+                        <tr><td><label for="iMedia"><?= $this->getHtml('Media') ?></label>
+                        <tr><td>
+                            <div class="ipt-wrap">
+                                <div class="ipt-first"><input type="text" id="iMedia" name="mediaFile" placeholder="&#xf15b; File"></div>
+                                <div class="ipt-second"><button><?= $this->getHtml('Select') ?></button></div>
+                            </div>
+                        <tr><td><label for="iUpload"><?= $this->getHtml('Upload') ?></label>
+                        <tr><td>
+                            <input type="file" id="iUpload" name="upload" form="fTask">
+                            <input form="fTask" type="hidden" name="type"><td>
                     </table>
                 </form>
             </div>
diff --git a/Theme/Backend/task-single.tpl.php b/Theme/Backend/task-single.tpl.php
index b34aa91..ea75dc2 100644
--- a/Theme/Backend/task-single.tpl.php
+++ b/Theme/Backend/task-single.tpl.php
@@ -10,6 +10,9 @@
  * @version    1.0.0
  * @link       http://website.orange-management.de
  */
+
+use \Modules\Tasks\Models\TaskStatus;
+
 /**
  * @var \phpOMS\Views\View         $this
  * @var \Modules\Tasks\Models\Task $task
@@ -19,11 +22,7 @@ $taskMedia = $task->getMedia();
 $elements  = $task->getTaskElements();
 $cElements = count($elements);
 $forwarded = $task->getCreatedBy()->getId();
-
-if ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; }
-elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; }
-elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; }
-elseif ($task->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; }
+$color     = $this->getStatus($task->getStatus());
 
 echo $this->getData('nav')->render(); ?>
 
@@ -57,11 +56,7 @@ echo $this->getData('nav')->render(); ?>
 
         <?php $c = 0;
         foreach ($elements as $key => $element) : $c++;
-            if ($element->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $color = 'green'; }
-            elseif ($element->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $color = 'darkblue'; }
-            elseif ($element->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $color = 'purple'; }
-            elseif ($element->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $color = 'red'; }
-            elseif ($element->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $color = 'yellow'; } ?>
+            $color = $this->getStatus($element->getStatus()); ?>
             <section class="box wf-100">
                 <div class="inner pAlignTable">
                     <div class="vCenterTable wf-100"><?= $this->printHtml($element->getCreatedBy()->getName1()); ?> <?= $this->printHtml($element->getCreatedAt()->format('Y-m-d H:i')); ?></div>
@@ -83,9 +78,9 @@ echo $this->getData('nav')->render(); ?>
                 <?php endif; ?>
 
                 <div class="inner pAlignTable" style="background: #efefef; border-top: 1px solid #dfdfdf;">
-                <?php if ($element->getStatus() !== \Modules\Tasks\Models\TaskStatus::CANCELED ||
-                    $element->getStatus() !== \Modules\Tasks\Models\TaskStatus::DONE ||
-                    $element->getStatus() !== \Modules\Tasks\Models\TaskStatus::SUSPENDED || $c != $cElements
+                <?php if ($element->getStatus() !== TaskStatus::CANCELED ||
+                    $element->getStatus() !== TaskStatus::DONE ||
+                    $element->getStatus() !== TaskStatus::SUSPENDED || $c != $cElements
                 ) : ?>
                     <div class="vCenterTable nobreak">Due <?= $this->printHtml($element->getDue()->format('Y-m-d H:i')); ?></div>
                 <?php endif; ?>
@@ -110,11 +105,11 @@ echo $this->getData('nav')->render(); ?>
                         <tr><td><input type="datetime-local" id="iDue" name="due" value="<?= $this->printHtml(!empty($elements) ? end($elements)->getDue()->format('Y-m-d\TH:i:s') : $task->getDue()->format('Y-m-d\TH:i:s')); ?>">
                         <tr><td><label for="iStatus"><?= $this->getHtml('Status') ?></label>
                         <tr><td><select id="iStatus" name="status">
-                                    <option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskStatus::OPEN); ?>" selected>Open
-                                    <option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskStatus::WORKING); ?>">Working
-                                    <option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskStatus::SUSPENDED); ?>">Suspended
-                                    <option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskStatus::CANCELED); ?>">Canceled
-                                    <option value="<?= $this->printHtml(\Modules\Tasks\Models\TaskStatus::DONE); ?>">Done
+                                    <option value="<?= $this->printHtml(TaskStatus::OPEN); ?>" selected>Open
+                                    <option value="<?= $this->printHtml(TaskStatus::WORKING); ?>">Working
+                                    <option value="<?= $this->printHtml(TaskStatus::SUSPENDED); ?>">Suspended
+                                    <option value="<?= $this->printHtml(TaskStatus::CANCELED); ?>">Canceled
+                                    <option value="<?= $this->printHtml(TaskStatus::DONE); ?>">Done
                                 </select>
                         <tr><td><label for="iReceiver"><?= $this->getHtml('To') ?></label>
                         <tr><td><input type="text" id="iReceiver" name="forward" value="<?= $this->printHtml($this->request->getHeader()->getAccount()); ?>" placeholder="&#xf007; Guest">
@@ -124,8 +119,12 @@ echo $this->getData('nav')->render(); ?>
                                 <div class="ipt-second"><button><?= $this->getHtml('Select') ?></button></div>
                             </div>
                         <tr><td><label for="iUpload"><?= $this->getHtml('Upload') ?></label>
-                        <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type">
-                        <tr><td><input type="submit" value="<?= $this->getHtml('Create', 0, 0); ?>"><input type="hidden" name="task" value="<?= $this->printHtml($this->request->getData('id')); ?>"><input type="hidden" name="type" value="1">
+                        <tr><td>
+                            <input type="file" id="iUpload" name="fileUpload" form="fTask">
+                            <input form="fTask" type="hidden" name="type">
+                        <tr><td>
+                            <input type="submit" id="iTaskElementCreateButton" name="taskElementCreateButton" value="<?= $this->getHtml('Create', 0, 0); ?>">
+                            <input type="hidden" name="task" value="<?= $this->printHtml($this->request->getData('id')); ?>"><input type="hidden" name="type" value="1">
                     </table>
                 </form>
             </div>
diff --git a/Views/TaskCreate.php b/Views/TaskCreate.php
deleted file mode 100644
index e69de29..0000000
diff --git a/Views/TaskView.php b/Views/TaskView.php
new file mode 100644
index 0000000..6faac4c
--- /dev/null
+++ b/Views/TaskView.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Orange Management
+ *
+ * PHP Version 7.1
+ *
+ * @package    TBD
+ * @copyright  Dennis Eichhorn
+ * @license    OMS License 1.0
+ * @version    1.0.0
+ * @link       http://website.orange-management.de
+ */
+declare(strict_types=1);
+
+namespace Modules\Tasks\Views;
+
+use phpOMS\Views\View;
+use phpOMS\ApplicationAbstract;
+use phpOMS\Message\RequestAbstract;
+use phpOMS\Message\ResponseAbstract;
+use Modules\Tasks\Models\TaskStatus;
+
+class TaskView extends View
+{
+    protected $media = [];
+
+    public function getStatus(int $status) : string
+    {
+        if ($status === TaskStatus::OPEN) {
+            return 'darkblue';
+        } elseif ($status === TaskStatus::WORKING) {
+            return 'purple'; 
+        } elseif ($status === TaskStatus::CANCELED) {
+            return 'red';
+        } elseif ($status === TaskStatus::SUSPENDED) {
+            return 'yellow'; 
+        }
+
+        return 'black';
+    }
+}