diff --git a/Controller/BackendController.php b/Controller/BackendController.php index b74a383..d953ab7 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -105,14 +105,14 @@ final class BackendController extends Controller implements DashboardElementInte $view->setTemplate('/Modules/Tasks/Theme/Backend/dashboard-task'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response)); - $taskListView = new \Modules\Tasks\Theme\Backend\Components\Tasks\ListView($this->app->l11nManager, $request, $response); - $taskListView->setTemplate('/Modules/Tasks/Theme/Backend/Components/Tasks/list'); - $view->addData('tasklist', $taskListView); - $tasks = TaskMapper::getAnyRelatedToUser($request->header->account) - ->where('id', 0, '>') + ->with('tags') + ->with('tags/title') ->sort('taskElements/createdAt', OrderType::DESC) - ->limit(5)->execute(); + ->limit(5) + ->where('id', 0, '>') + ->where('tags/title/language', $response->getLanguage()) + ->execute(); $view->addData('tasks', $tasks); diff --git a/Theme/Backend/Components/Tasks/list.tpl.php b/Theme/Backend/Components/Tasks/list.tpl.php index 4b29739..144b708 100755 --- a/Theme/Backend/Components/Tasks/list.tpl.php +++ b/Theme/Backend/Components/Tasks/list.tpl.php @@ -15,37 +15,44 @@ declare(strict_types=1); use Modules\Tasks\Models\TaskPriority; use Modules\Tasks\Models\TaskStatus; use phpOMS\Uri\UriFactory; - ?> - - - - - tasks as $key => $task) : ++$c; - $url = UriFactory::build(!empty($task->redirect) ? $task->redirect : ('{/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'; } ?> - -
getHtml('Status', 'Tasks'); ?> - getHtml('Due/Priority', 'Tasks'); ?> - getHtml('Title', 'Tasks'); ?> -
getHtml('S' . $task->getStatus(), 'Tasks'); ?> - - getPriority() === TaskPriority::NONE) : ?> - printHtml($task->getDue()->format('Y-m-d H:i')); ?> - - getHtml('P' . $task->getPriority()); ?> - - - printHtml($task->getTitle()); ?> - -
getHtml('Empty', '0', '0'); ?> - -
\ No newline at end of file +
+
+
getHtml('News', 'News'); ?>
+ + + + + tasks as $key => $task) : ++$c; + $url = UriFactory::build(!empty($task->redirect) ? $task->redirect : ('{/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'; } ?> + +
getHtml('Status', 'Tasks'); ?> + getHtml('Due/Priority', 'Tasks'); ?> + getHtml('Title', 'Tasks'); ?> +
getHtml('S' . $task->getStatus(), 'Tasks'); ?> + + getPriority() === TaskPriority::NONE) : ?> + printHtml($task->due->format('Y-m-d H:i')); ?> + + getHtml('P' . $task->getPriority()); ?> + + + printHtml($task->title); ?> + + +
getHtml('Empty', '0', '0'); ?> + +
+
+
+
\ No newline at end of file diff --git a/Theme/Backend/dashboard-task.tpl.php b/Theme/Backend/dashboard-task.tpl.php index ea4f808..261880f 100755 --- a/Theme/Backend/dashboard-task.tpl.php +++ b/Theme/Backend/dashboard-task.tpl.php @@ -12,10 +12,51 @@ */ declare(strict_types=1); +use Modules\Tasks\Models\TaskPriority; +use Modules\Tasks\Models\TaskStatus; +use phpOMS\Uri\UriFactory; + +$tasksList = $this->getData('tasks') ?? []; ?> -
+ +
getHtml('Tasks', 'Tasks'); ?>
- getData('tasklist')->render($this->getData('tasks')); ?> + + + + + $task) : ++$c; + $url = UriFactory::build(!empty($task->redirect) ? $task->redirect : ('{/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'; } ?> + +
getHtml('Status', 'Tasks'); ?> + getHtml('Due/Priority', 'Tasks'); ?> + getHtml('Title', 'Tasks'); ?> +
getHtml('S' . $task->getStatus(), 'Tasks'); ?> + + getPriority() === TaskPriority::NONE) : ?> + printHtml($task->due->format('Y-m-d H:i')); ?> + + getHtml('P' . $task->getPriority()); ?> + + + printHtml($task->title); ?> + + +
getHtml('Empty', '0', '0'); ?> + +
+
\ No newline at end of file