Jingga/oms-Tasks
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Tasks.git synced 2026-01-11 23:48:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve task creation

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-10-28 21:00:19 +01:00
parent ece1f87d95
commit 31e21ca0f3
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Controller/ApiController.php
View File

@ -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;
}

14
Theme/Backend/task-single.tpl.php
View File

@ -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>