From 5afabf7a3e3ba5920bf07c59303cfbb7946c08ad Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 12 Feb 2017 16:02:17 +0100 Subject: [PATCH] Implement & bug fixes --- Controller.php | 8 ++ Theme/backend/Lang/en.lang.php | 2 +- Theme/backend/projectmanagement-list.tpl.php | 9 ++- .../backend/projectmanagement-profile.tpl.php | 78 +++++++++++++++++++ 4 files changed, 94 insertions(+), 3 deletions(-) diff --git a/Controller.php b/Controller.php index aaf0e4d..eb0b4c6 100644 --- a/Controller.php +++ b/Controller.php @@ -24,6 +24,8 @@ use phpOMS\Module\ModuleAbstract; use phpOMS\Module\WebInterface; use phpOMS\Views\View; use phpOMS\Views\ViewLayout; +use Modules\ProjectManagement\Models\ProjectMapper; +use Modules\ProjectManagement\Models\Project; /** * Event Management controller class. @@ -96,6 +98,9 @@ class Controller extends ModuleAbstract implements WebInterface $view->setTemplate('/Modules/ProjectManagement/Theme/Backend/projectmanagement-list'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001701001, $request, $response)); + $projects = ProjectMapper::getNewest(25); + $view->addData('projects', $projects); + return $view; } @@ -134,6 +139,9 @@ class Controller extends ModuleAbstract implements WebInterface $view->setTemplate('/Modules/ProjectManagement/Theme/Backend/projectmanagement-profile'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001701001, $request, $response)); + $project = ProjectMapper::get((int) $request->getData('id')); + $view->addData('project', $project); + return $view; } diff --git a/Theme/backend/Lang/en.lang.php b/Theme/backend/Lang/en.lang.php index b8555df..ba592b0 100644 --- a/Theme/backend/Lang/en.lang.php +++ b/Theme/backend/Lang/en.lang.php @@ -20,7 +20,7 @@ return ['ProjectManagement' => [ 'Created' => 'Created', 'Creator' => 'Creator', 'Description' => 'Description', - 'Due' => 'Due', + 'End' => 'End', 'Files' => 'Files', 'Finished' => 'Finished', 'Hold' => 'Hold', diff --git a/Theme/backend/projectmanagement-list.tpl.php b/Theme/backend/projectmanagement-list.tpl.php index 8975500..2f4bdd9 100644 --- a/Theme/backend/projectmanagement-list.tpl.php +++ b/Theme/backend/projectmanagement-list.tpl.php @@ -19,6 +19,8 @@ $footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig'); $footerView->setPages(20); $footerView->setPage(1); +$list = $this->getData('projects'); + echo $this->getData('nav')->render(); ?>
@@ -28,7 +30,6 @@ echo $this->getData('nav')->render(); ?> getText('Projects') ?> - getText('Status'); ?> getText('Title'); ?> getText('Start'); ?> getText('Due'); ?> @@ -36,7 +37,11 @@ echo $this->getData('nav')->render(); ?> render(); ?> - $value) : $count++; ?> + $value) : $count++; + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/projectmanagement/profile?{?}&id=' . $value->getId());?> + getName(); ?> + getStart()->format('Y-m-d'); ?> + getEnd()->format('Y-m-d'); ?> getText('Empty', 0, 0); ?> diff --git a/Theme/backend/projectmanagement-profile.tpl.php b/Theme/backend/projectmanagement-profile.tpl.php index 01c1a1e..55e2a4b 100644 --- a/Theme/backend/projectmanagement-profile.tpl.php +++ b/Theme/backend/projectmanagement-profile.tpl.php @@ -13,4 +13,82 @@ * @version 1.0.0 * @link http://orange-management.com */ +$project = $this->getData('project'); +$tasks = $project->getTasks(); + echo $this->getData('nav')->render(); ?> + +
+
+
+

getName(); ?>

+
+
+ + +
+
+
+ +
+ +
+
+
+
+
+
+
+
+ +
+
+ + + + + + $task) : $c++; + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/task/single?{?}&id=' . $task->getId()); + $color = 'darkred'; + 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'; } ;?> + +
getText('Tasks', 'Tasks'); ?>
getText('Status'); ?> + getText('Due', 'Tasks'); ?> + getText('Title'); ?> +
getText('S' . $task->getStatus(), 'Tasks'); ?> + getDue()->format('Y-m-d H:i'); ?> + getTitle(); ?> + +
getText('Empty', 0, 0); ?> + +
+
+
+
+ +
+
+
+

Calendar

+
+
+ +
+
+

Media

+
+
+
+ +
+
+
+

Finances

+
+
+
\ No newline at end of file