From 31e21ca0f3e52f742ced2c8bb8d403ee3287edcb Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sun, 28 Oct 2018 21:00:19 +0100
Subject: [PATCH] Improve task creation

---
 Controller/ApiController.php      | 12 +++++++++---
 Theme/Backend/task-single.tpl.php | 14 ++++++++++++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index cdecca4..64c35f8 100644
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -255,7 +255,12 @@ class ApiController extends Controller
         TaskElementMapper::create($element);
         TaskMapper::update($task);
 
-        $response->set($request->getUri()->__toString(), $element->jsonSerialize());
+        $response->set($request->getUri()->__toString(), [
+            'status' => NotificationLevel::OK,
+            'title' => 'Task element',
+            'message' => 'Task element successfully created.',
+            'response' => $element->jsonSerialize()
+        ]);
     }
 
     /**
@@ -273,10 +278,11 @@ class ApiController extends Controller
         $element->setForwarded((int) ($request->getData('forward') ?? $request->getHeader()->getAccount()));
         $element->setCreatedBy($request->getHeader()->getAccount());
         $element->setDue(new \DateTime((string) ($request->getData('due') ?? 'now')));
+        $element->setPriority((int) $request->getData('priority'));
         $element->setStatus((int) ($request->getData('status')));
         $element->setTask((int) ($request->getData('task')));
-        $element->setDescription(Markdown::parse((string) ($request->getData('description'))));
-        $element->setDescriptionRaw((string) ($request->getData('description')));
+        $element->setDescription(Markdown::parse((string) ($request->getData('plain') ?? '')));
+        $element->setDescriptionRaw((string) ($request->getData('plain') ?? ''));
 
         return $element;
     }
diff --git a/Theme/Backend/task-single.tpl.php b/Theme/Backend/task-single.tpl.php
index 00dbe03..cf57538 100644
--- a/Theme/Backend/task-single.tpl.php
+++ b/Theme/Backend/task-single.tpl.php
@@ -86,7 +86,7 @@ echo $this->getData('nav')->render(); ?>
         <?php $c = 0;
         foreach ($elements as $key => $element) : $c++;
             $color = $this->getStatus($element->getStatus()); ?>
-            <?php if ($c > 1 && $element->getForwarded() !== 0 && $forwarded !== $element->getCreatedBy()->getId()) : ?>
+            <?php if ($c > 1 && $element->getForwarded() !== 0 && $forwarded->getId() !== $element->getCreatedBy()->getId()) : ?>
                 <section class="box wf-100">
                     <div class="inner">
                         Forwarded <?= $this->printHtml($element->getForwarded()->getName1()); ?>
@@ -135,7 +135,17 @@ echo $this->getData('nav')->render(); ?>
                     <table class="layout wf-100" style="table-layout: fixed">
                         <tr><td><label for="iMessage"><?= $this->getHtml('Message') ?></label>
                         <tr><td><?= $this->getData('editor')->render('task-editor'); ?>
-                        <tr><td><?= $this->getData('editor')->getData('text')->render('task-editor', 'plain', 'fTask'); ?>
+                        <tr><td><?= $this->getData('editor')->getData('text')->render('task-editor', 'plain', 'taskElementCreate'); ?>
+                        <tr><td><label for="iPriority"><?= $this->getHtml('Priority') ?></label>
+                        <tr><td>
+                            <select id="iPriority" name="priority">
+                                <option value="<?= $this->printHtml(TaskPriority::NONE); ?>"<?= $task->getPriority() === TaskPriority::NONE ? 'selected' : ''?>><?= $this->getHtml('P0') ?>
+                                <option value="<?= $this->printHtml(TaskPriority::VLOW); ?>"<?= $task->getPriority() === TaskPriority::VLOW ? 'selected' : ''?>><?= $this->getHtml('P1') ?>
+                                <option value="<?= $this->printHtml(TaskPriority::LOW); ?>"<?= $task->getPriority() === TaskPriority::LOW ? 'selected' : ''?>><?= $this->getHtml('P2') ?>
+                                <option value="<?= $this->printHtml(TaskPriority::MEDIUM); ?>"<?= $task->getPriority() === TaskPriority::MEDIUM ? 'selected' : ''?>><?= $this->getHtml('P3') ?>
+                                <option value="<?= $this->printHtml(TaskPriority::HIGH); ?>"<?= $task->getPriority() === TaskPriority::HIGH ? 'selected' : ''?>><?= $this->getHtml('P4') ?>
+                                <option value="<?= $this->printHtml(TaskPriority::VHIGH); ?>"<?= $task->getPriority() === TaskPriority::VHIGH ? 'selected' : ''?>><?= $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(!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>