From f87451185c50e4f36accda1506460f10362f8fc8 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Mon, 1 May 2017 13:56:04 +0200 Subject: [PATCH] Prepare for better editor integration --- Controller.php | 2 +- Models/TaskStatus.php | 2 - Theme/Backend/task-single.tpl.php | 124 ++++++++++++++++++++---------- 3 files changed, 85 insertions(+), 43 deletions(-) diff --git a/Controller.php b/Controller.php index 23b985b..0dbf0b7 100644 --- a/Controller.php +++ b/Controller.php @@ -127,7 +127,7 @@ class Controller extends ModuleAbstract implements WebInterface $view->setTemplate('/Modules/Tasks/Theme/Backend/dashboard-task'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response)); - $tasks = TaskMapper::getNewest(25); + $tasks = TaskMapper::getNewest(5); $view->addData('tasks', $tasks); return $view; diff --git a/Models/TaskStatus.php b/Models/TaskStatus.php index 4c53c06..e11dadd 100644 --- a/Models/TaskStatus.php +++ b/Models/TaskStatus.php @@ -40,6 +40,4 @@ abstract class TaskStatus extends Enum /* public */ const CANCELED = 4; /* public */ const DONE = 5; - - /* public */ const CLOSED = 6; } diff --git a/Theme/Backend/task-single.tpl.php b/Theme/Backend/task-single.tpl.php index d421a09..ea05868 100644 --- a/Theme/Backend/task-single.tpl.php +++ b/Theme/Backend/task-single.tpl.php @@ -21,87 +21,129 @@ $task = $this->getData('task'); $elements = $task->getTaskElements(); $cElements = count($elements); -if($task->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $color = 'green'; } -elseif($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'; } +$statusColor = ''; +if($task->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $statusColor = 'green'; } +elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $statusColor = 'darkblue'; } +elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $statusColor = 'purple'; } +elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $statusColor = 'red'; } +elseif($task->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $statusColor = 'yellow'; } + +$priorityColor = ''; +if($task->getPriority() === \Modules\Tasks\Models\TaskPriority::VLOW) { $priorityColor = 'green'; } +elseif($task->getPriority() === \Modules\Tasks\Models\TaskPriority::LOW) { $priorityColor = 'blue'; } +elseif($task->getPriority() === \Modules\Tasks\Models\TaskPriority::MEDIUM) { $priorityColor = 'darkblue'; } +elseif($task->getPriority() === \Modules\Tasks\Models\TaskPriority::HIGH) { $priorityColor = 'yellow'; } +elseif($task->getPriority() === \Modules\Tasks\Models\TaskPriority::VHIGH) { $priorityColor = 'red'; } echo $this->getData('nav')->render(); ?>
-
-

getTitle(); ?>

+
+

getTitle(); ?>

-
Due getDue()->format('Y-m-d H:i'); ?>
+
+ Due getDue()->format('Y-m-d H:i'); ?> + getText('P' . $task->getPriority()); ?> +
Created getCreatedAt()->format('Y-m-d H:i'); ?>
-
- getDescription(); ?> -
+
getDescription(); ?>
-
+
Created getCreatedBy(); ?>
- getText('S' . $task->getStatus()); ?> + getText('S' . $task->getStatus()); ?>
$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'; } ?> -
+ if($element->getStatus() === \Modules\Tasks\Models\TaskStatus::DONE) { $statusColor = 'green'; } + elseif($element->getStatus() === \Modules\Tasks\Models\TaskStatus::OPEN) { $statusColor = 'darkblue'; } + elseif($element->getStatus() === \Modules\Tasks\Models\TaskStatus::WORKING) { $statusColor = 'purple'; } + elseif($element->getStatus() === \Modules\Tasks\Models\TaskStatus::CANCELED) { $statusColor = 'red'; } + elseif($element->getStatus() === \Modules\Tasks\Models\TaskStatus::SUSPENDED) { $statusColor = 'yellow'; } ?> +
getCreatedBy(); ?> - getCreatedAt()->format('Y-m-d H:i'); ?>
- getText('S' . $element->getStatus()); ?> + getText('S' . $element->getStatus()); ?>
getDescription() !== '') : ?>
-
- getDescription(); ?> -
+
getDescription(); ?>
-
getForwarded() !== 0) : ?>
Forwarded getForwarded(); ?>
- getStatus() !== \Modules\Tasks\Models\TaskStatus::CANCELED || - $element->getStatus() !== \Modules\Tasks\Models\TaskStatus::DONE || - $element->getStatus() !== \Modules\Tasks\Models\TaskStatus::SUSPENDED || $c != $cElements - ) : ?> -
Due getDue()->format('Y-m-d H:i'); ?>
-
- +
+
-
-
-
-
+
+
+
@@ -113,3 +155,5 @@ echo $this->getData('nav')->render(); ?> + + \ No newline at end of file