diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 27fcb36..799cdd6 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -20,6 +20,7 @@ use Modules\Tasks\Models\TaskMapper; use Modules\Tasks\Views\TaskView; use phpOMS\Account\PermissionType; +use phpOMS\Asset\AssetType; use phpOMS\Contract\RenderableInterface; use phpOMS\DataStorage\Database\RelationType; use phpOMS\Message\Http\RequestStatusCode; @@ -51,6 +52,10 @@ final class BackendController extends Controller { $view = new View($this->app, $request, $response); + /** @var \phpOMS\Model\Html\Head $head */ + $head = $response->get('Content')->getData('head'); + $head->addAsset(AssetType::CSS, '/Modules/Tasks/Theme/Backend/css/styles.css'); + $view->setTemplate('/Modules/Tasks/Theme/Backend/task-dashboard'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response)); @@ -101,6 +106,10 @@ final class BackendController extends Controller { $view = new TaskView($this->app, $request, $response); + /** @var \phpOMS\Model\Html\Head $head */ + $head = $response->get('Content')->getData('head'); + $head->addAsset(AssetType::CSS, '/Modules/Tasks/Theme/Backend/css/styles.css'); + $task = TaskMapper::get((int) $request->getData('id')); $accountId = $request->getHeader()->getAccount(); diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 09f04ea..4c8a335 100644 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -16,6 +16,7 @@ return ['Tasks' => [ 'AverageProcessTime' => 'Avg. Process Time', 'AverageAmount' => 'Average Amount', 'BCC' => 'BCC', + 'By' => 'By', 'CC' => 'CC', 'Created' => 'Created', 'Creator' => 'Creator', diff --git a/Theme/Backend/css/styles.css b/Theme/Backend/css/styles.css new file mode 100644 index 0000000..90d277a --- /dev/null +++ b/Theme/Backend/css/styles.css @@ -0,0 +1,27 @@ +.tag.task-status-1, +.tag.task-status-2, +.tag.task-status-3, +.tag.task-status-4, +.tag.task-status-5 { + color: #000; +} + +.tag.task-status-1 { + background: rgb(255, 104, 104); +} + +.tag.task-status-2 { + background: rgb(113, 197, 245); +} + +.tag.task-status-3 { + background: rgb(255, 241, 114); +} + +.tag.task-status-4 { + background: rgb(235, 151, 252); +} + +.tag.task-status-5 { + background: rgb(79, 236, 118); +} \ No newline at end of file diff --git a/Theme/Backend/task-create.tpl.php b/Theme/Backend/task-create.tpl.php index d7bd3bd..744eddb 100644 --- a/Theme/Backend/task-create.tpl.php +++ b/Theme/Backend/task-create.tpl.php @@ -35,12 +35,12 @@ echo $this->getData('nav')->render(); ?> diff --git a/Theme/Backend/task-dashboard.tpl.php b/Theme/Backend/task-dashboard.tpl.php index 101e312..99ece59 100644 --- a/Theme/Backend/task-dashboard.tpl.php +++ b/Theme/Backend/task-dashboard.tpl.php @@ -12,6 +12,7 @@ */ use Modules\Tasks\Models\TaskStatus; + use Modules\Tasks\Models\TaskPriority; /** * @var \phpOMS\Views\View $this @@ -33,29 +34,33 @@ echo $this->getData('nav')->render(); ?> getHtml('Created') ?> - $task) : $c++; - $url = \phpOMS\Uri\UriFactory::build('{/prefix}task/single?{?}&id=' . $task->getId()); - $color = 'darkred'; - if ($task->getStatus() === TaskStatus::DONE) { $color = 'green'; } - elseif ($task->getStatus() === TaskStatus::OPEN) { $color = 'darkblue'; } - elseif ($task->getStatus() === TaskStatus::WORKING) { $color = 'purple'; } - elseif ($task->getStatus() === TaskStatus::CANCELED) { $color = 'red'; } - elseif ($task->getStatus() === TaskStatus::SUSPENDED) { $color = 'yellow'; } ?> + $task) : $c++; + $url = \phpOMS\Uri\UriFactory::build('{/prefix}task/single?{?}&id=' . $task->getId()); + ?> - getHtml('S' . $task->getStatus()) ?> + + + + getHtml('S' . $task->getStatus()) ?> + + - getPriority() === \Modules\Tasks\Models\TaskPriority::NONE) : ?> + getPriority() === TaskPriority::NONE) : ?> printHtml($task->getDue()->format('Y-m-d H:i')); ?> getHtml('P' . $task->getPriority()); ?> - printHtml($task->getTitle()); ?> - printHtml($task->getCreatedBy()->getName1()); ?> - printHtml($task->getCreatedAt()->format('Y-m-d H:i')); ?> + + printHtml($task->getTitle()); ?> + + printHtml($task->getCreatedBy()->getName1()); ?> + + printHtml($task->getCreatedAt()->format('Y-m-d H:i')); ?> - getHtml('Empty', '0', '0'); ?> + getHtml('Empty', '0', '0'); ?> diff --git a/Theme/Backend/task-single.tpl.php b/Theme/Backend/task-single.tpl.php index e421a11..a0c06f7 100644 --- a/Theme/Backend/task-single.tpl.php +++ b/Theme/Backend/task-single.tpl.php @@ -36,26 +36,42 @@ echo $this->getData('nav')->render(); ?> data-tag="form" >
- - + + - getHtml('S' . $task->getStatus()) ?> + + getHtml('S' . $task->getStatus()) ?> +
getPriority() === TaskPriority::NONE) : ?> - Due: printHtml($task->getDue()->format('Y/m/d H:i')); ?> + getHtml('Due') ?>: printHtml($task->getDue()->format('Y/m/d H:i')); ?> - Priority: getHtml('P' . $task->getPriority()) ?> + getHtml('Priority') ?>: getHtml('P' . $task->getPriority()) ?>
-
Created printHtml($task->getCreatedAt()->format('Y/m/d H:i')); ?>
+
getHtml('Created') ?> - printHtml($task->getCreatedAt()->format('Y/m/d H:i')); ?>
-

printHtml($task->getTitle()); ?>

+
+

printHtml($task->getTitle()); ?>

+
getDescription(); ?>
@@ -63,33 +79,32 @@ echo $this->getData('nav')->render(); ?>
- getName(); ?> + getName(); ?>
-
- By printHtml($task->getCreatedBy()->getName1()); ?> +
+ getHtml('By') ?> printHtml($task->getCreatedBy()->getName1()); ?>
-
- - - +
+ + +
$element) : $c++; - $color = $this->getStatus($element->getStatus()); ?> + foreach ($elements as $key => $element) : $c++; ?> getTo(); if ($c > 1 && \count($tos) > 1) : ?>
- Forwarded - + getHtml('Forwarded') ?> + printHtml($to->getRelation()->getName1()); ?> @@ -101,8 +116,12 @@ echo $this->getData('nav')->render(); ?>
-
printHtml($element->getCreatedBy()->getName1()); ?> printHtml($element->getCreatedAt()->format('Y-m-d H:i')); ?>
- getHtml('S' . $element->getStatus()) ?> +
+ printHtml($element->getCreatedBy()->getName1()); ?> - printHtml($element->getCreatedAt()->format('Y-m-d H:i')); ?> +
+ + getHtml('S' . $element->getStatus()) ?> +
getDescription() !== '') : ?> @@ -114,21 +133,22 @@ echo $this->getData('nav')->render(); ?> getMedia(); if (!empty($elementMedia)) : ?>
- getName(); ?> + getName(); ?>
- getStatus() !== TaskStatus::CANCELED || - $element->getStatus() !== TaskStatus::DONE || - $element->getStatus() !== TaskStatus::SUSPENDED || $c != $cElements + getStatus() !== TaskStatus::CANCELED + || $element->getStatus() !== TaskStatus::DONE + || $element->getStatus() !== TaskStatus::SUSPENDED + || $c != $cElements ) : ?> -
+
getPriority() === TaskPriority::NONE) : ?> - Due: printHtml($element->getDue()->format('Y/m/d H:i')); ?> + getHtml('Due') ?>: printHtml($element->getDue()->format('Y/m/d H:i')); ?> - Priority: getHtml('P' . $element->getPriority()) ?> + getHtml('Priority') ?>: getHtml('P' . $element->getPriority()) ?>
@@ -147,22 +167,24 @@ echo $this->getData('nav')->render(); ?> - + getData('accGrpSelector')->render('iReceiver', 'forward', true); ?>