diff --git a/Controller/BackendController.php b/Controller/BackendController.php index d230abf..899b447 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -142,7 +142,7 @@ final class BackendController extends Controller implements DashboardElementInte $head = $response->get('Content')->getData('head'); $head->addAsset(AssetType::CSS, '/Modules/Tasks/Theme/Backend/css/styles.css'); - $task = TaskMapper::get((int) $request->getData('id'), RelationType::ALL, 3); + $task = TaskMapper::get((int) $request->getData('id'), RelationType::ALL, 4); $accountId = $request->getHeader()->getAccount(); if (!($task->getCreatedBy()->getId() === $accountId diff --git a/Theme/Backend/css/styles.css b/Theme/Backend/css/styles.css index 0fc8787..ec12562 100755 --- a/Theme/Backend/css/styles.css +++ b/Theme/Backend/css/styles.css @@ -17,7 +17,7 @@ } .tag.task-status-3 { - background: #f1c40f; + background: #ffd321; } .tag.task-status-4 { diff --git a/Theme/Backend/task-single.tpl.php b/Theme/Backend/task-single.tpl.php index 43b7270..cce6caa 100755 --- a/Theme/Backend/task-single.tpl.php +++ b/Theme/Backend/task-single.tpl.php @@ -169,8 +169,22 @@ echo $this->getData('nav')->render(); ?> $element) : ++$c; - if ($element->getDescription() !== '') : ?> + foreach ($elements as $key => $element) : ++$c; ?> + getStatus() !== TaskStatus::OPEN) + || ($previous !== null && $element->getStatus() !== $previous->getStatus()) + ) : ?> +
+
+ Status change by printHtml($element->getCreatedBy()->getName1()); ?> + on printHtml($element->getCreatedAt()->format('Y-m-d H:i')); ?> + to + getHtml('S' . $element->getStatus()) ?> + +
+
+ + + getDescription() !== '') : ?>
getData('nav')->render(); ?>
- - + +