From cdcba79e9eef96164b7ecce11bd9e93163b79fd3 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 6 Sep 2017 15:33:26 +0200 Subject: [PATCH] Improved list templates and added empty single templates --- Admin/Routes/Web/Backend.php | 48 +++++ Controller.php | 173 ++++++++++++++++++ Theme/Backend/category-single.tpl.php | 15 ++ ...-solution.tpl.php => cause-single.tpl.php} | 1 + Theme/Backend/department-single.tpl.php | 15 ++ Theme/Backend/process-single.tpl.php | 15 ++ Theme/Backend/project-single.tpl.php | 15 ++ Theme/Backend/risk-create.tpl.php | 10 +- ...ngle-cause.tpl.php => risk-single.tpl.php} | 1 + Theme/Backend/solution-single.tpl.php | 15 ++ Theme/Backend/unit-list.tpl.php | 27 +++ ...-dashboard.tpl.php => unit-single.tpl.php} | 1 + 12 files changed, 332 insertions(+), 4 deletions(-) create mode 100644 Theme/Backend/category-single.tpl.php rename Theme/Backend/{risk-single-solution.tpl.php => cause-single.tpl.php} (88%) create mode 100644 Theme/Backend/department-single.tpl.php create mode 100644 Theme/Backend/process-single.tpl.php create mode 100644 Theme/Backend/project-single.tpl.php rename Theme/Backend/{risk-single-cause.tpl.php => risk-single.tpl.php} (89%) create mode 100644 Theme/Backend/solution-single.tpl.php rename Theme/Backend/{risk-single-dashboard.tpl.php => unit-single.tpl.php} (89%) diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index cc2b3d9..85e8e8c 100644 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -21,48 +21,96 @@ return [ 'verb' => RouteVerb::GET, ], ], + '^.*/backend/controlling/riskmanagement/risk/single.*$' => [ + [ + 'dest' => '\Modules\RiskManagement\Controller:viewRiskSingle', + 'verb' => RouteVerb::GET, + ], + ], '^.*/backend/controlling/riskmanagement/cause/list.*$' => [ [ 'dest' => '\Modules\RiskManagement\Controller:viewRiskCauseList', 'verb' => RouteVerb::GET, ], ], + '^.*/backend/controlling/riskmanagement/cause/single.*$' => [ + [ + 'dest' => '\Modules\RiskManagement\Controller:viewRiskCauseSingle', + 'verb' => RouteVerb::GET, + ], + ], '^.*/backend/controlling/riskmanagement/solution/list.*$' => [ [ 'dest' => '\Modules\RiskManagement\Controller:viewRiskSolutionList', 'verb' => RouteVerb::GET, ], ], + '^.*/backend/controlling/riskmanagement/solution/single.*$' => [ + [ + 'dest' => '\Modules\RiskManagement\Controller:viewRiskSolutionSingle', + 'verb' => RouteVerb::GET, + ], + ], '^.*/backend/controlling/riskmanagement/unit/list.*$' => [ [ 'dest' => '\Modules\RiskManagement\Controller:viewRiskUnitList', 'verb' => RouteVerb::GET, ], ], + '^.*/backend/controlling/riskmanagement/unit/single.*$' => [ + [ + 'dest' => '\Modules\RiskManagement\Controller:viewRiskUnitSingle', + 'verb' => RouteVerb::GET, + ], + ], '^.*/backend/controlling/riskmanagement/department/list.*$' => [ [ 'dest' => '\Modules\RiskManagement\Controller:viewRiskDepartmentList', 'verb' => RouteVerb::GET, ], ], + '^.*/backend/controlling/riskmanagement/department/single.*$' => [ + [ + 'dest' => '\Modules\RiskManagement\Controller:viewRiskDepartmentSingle', + 'verb' => RouteVerb::GET, + ], + ], '^.*/backend/controlling/riskmanagement/category/list.*$' => [ [ 'dest' => '\Modules\RiskManagement\Controller:viewRiskCategoryList', 'verb' => RouteVerb::GET, ], ], + '^.*/backend/controlling/riskmanagement/category/single.*$' => [ + [ + 'dest' => '\Modules\RiskManagement\Controller:viewRiskCategorySingle', + 'verb' => RouteVerb::GET, + ], + ], '^.*/backend/controlling/riskmanagement/project/list.*$' => [ [ 'dest' => '\Modules\RiskManagement\Controller:viewRiskProjectList', 'verb' => RouteVerb::GET, ], ], + '^.*/backend/controlling/riskmanagement/project/single.*$' => [ + [ + 'dest' => '\Modules\RiskManagement\Controller:viewRiskProjectSingle', + 'verb' => RouteVerb::GET, + ], + ], '^.*/backend/controlling/riskmanagement/process/list.*$' => [ [ 'dest' => '\Modules\RiskManagement\Controller:viewRiskProcessList', 'verb' => RouteVerb::GET, ], ], + '^.*/backend/controlling/riskmanagement/process/single.*$' => [ + [ + 'dest' => '\Modules\RiskManagement\Controller:viewRiskProcessSingle', + 'verb' => RouteVerb::GET, + ], + ], '^.*/backend/controlling/riskmanagement/settings/dashboard.*$' => [ [ 'dest' => '\Modules\RiskManagement\Controller:viewRiskSettings', diff --git a/Controller.php b/Controller.php index 5891b8b..eed46d5 100644 --- a/Controller.php +++ b/Controller.php @@ -30,6 +30,8 @@ use Modules\RiskManagement\Models\DepartmentMapper; use Modules\RiskManagement\Models\CategoryMapper; use Modules\RiskManagement\Models\ProjectMapper; use Modules\RiskManagement\Models\ProcessMapper; +use Modules\Organization\Models\UnitMapper; +use Modules\Organization\Models\Unit; /** * Risk Management class. @@ -124,6 +126,27 @@ class Controller extends ModuleAbstract implements WebInterface return $view; } + /** + * @param RequestAbstract $request Request + * @param ResponseAbstract $response Response + * @param mixed $data Generic data + * + * @return RenderableInterface + * + * @since 1.0.0 + */ + public function viewRiskSingle(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + { + $view = new View($this->app, $request, $response); + $view->setTemplate('/Modules/RiskManagement/Theme/Backend/risk-single'); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + + $risk = RiskMapper::get((int) $request->getData('id')); + $view->addData('risk', $risk); + + return $view; + } + /** * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -163,6 +186,27 @@ class Controller extends ModuleAbstract implements WebInterface return $view; } + /** + * @param RequestAbstract $request Request + * @param ResponseAbstract $response Response + * @param mixed $data Generic data + * + * @return RenderableInterface + * + * @since 1.0.0 + */ + public function viewRiskCauseSingle(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + { + $view = new View($this->app, $request, $response); + $view->setTemplate('/Modules/RiskManagement/Theme/Backend/cause-single'); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + + $cause = CauseMapper::get((int) $request->getData('id')); + $view->addData('cause', $cause); + + return $view; + } + /** * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -184,6 +228,27 @@ class Controller extends ModuleAbstract implements WebInterface return $view; } + /** + * @param RequestAbstract $request Request + * @param ResponseAbstract $response Response + * @param mixed $data Generic data + * + * @return RenderableInterface + * + * @since 1.0.0 + */ + public function viewRiskSolutionSingle(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + { + $view = new View($this->app, $request, $response); + $view->setTemplate('/Modules/RiskManagement/Theme/Backend/solution-single'); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + + $solution = SolutionMapper::get((int) $request->getData('id')); + $view->addData('solution', $solution); + + return $view; + } + /** * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -199,6 +264,30 @@ class Controller extends ModuleAbstract implements WebInterface $view->setTemplate('/Modules/RiskManagement/Theme/Backend/unit-list'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + $units = UnitMapper::getAll(); + $view->addData('units', $units); + + return $view; + } + + /** + * @param RequestAbstract $request Request + * @param ResponseAbstract $response Response + * @param mixed $data Generic data + * + * @return RenderableInterface + * + * @since 1.0.0 + */ + public function viewRiskUnitSingle(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + { + $view = new View($this->app, $request, $response); + $view->setTemplate('/Modules/RiskManagement/Theme/Backend/unit-single'); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + + $unit = UnitMapper::get((int) $request->getData('id')); + $view->addData('unit', $unit); + return $view; } @@ -223,6 +312,27 @@ class Controller extends ModuleAbstract implements WebInterface return $view; } + /** + * @param RequestAbstract $request Request + * @param ResponseAbstract $response Response + * @param mixed $data Generic data + * + * @return RenderableInterface + * + * @since 1.0.0 + */ + public function viewRiskDepartmentSingle(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + { + $view = new View($this->app, $request, $response); + $view->setTemplate('/Modules/RiskManagement/Theme/Backend/department-single'); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + + $department = DepartmentMapper::get((int) $request->getData('id')); + $view->addData('department', $department); + + return $view; + } + /** * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -244,6 +354,27 @@ class Controller extends ModuleAbstract implements WebInterface return $view; } + /** + * @param RequestAbstract $request Request + * @param ResponseAbstract $response Response + * @param mixed $data Generic data + * + * @return RenderableInterface + * + * @since 1.0.0 + */ + public function viewRiskCategorySingle(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + { + $view = new View($this->app, $request, $response); + $view->setTemplate('/Modules/RiskManagement/Theme/Backend/category-single'); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + + $category = CategoryMapper::get((int) $request->getData('id')); + $view->addData('category', $category); + + return $view; + } + /** * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -265,6 +396,27 @@ class Controller extends ModuleAbstract implements WebInterface return $view; } + /** + * @param RequestAbstract $request Request + * @param ResponseAbstract $response Response + * @param mixed $data Generic data + * + * @return RenderableInterface + * + * @since 1.0.0 + */ + public function viewRiskProjectSingle(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + { + $view = new View($this->app, $request, $response); + $view->setTemplate('/Modules/RiskManagement/Theme/Backend/project-single'); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + + $project = ProjectMapper::get((int) $request->getData('id')); + $view->addData('project', $project); + + return $view; + } + /** * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -286,6 +438,27 @@ class Controller extends ModuleAbstract implements WebInterface return $view; } + /** + * @param RequestAbstract $request Request + * @param ResponseAbstract $response Response + * @param mixed $data Generic data + * + * @return RenderableInterface + * + * @since 1.0.0 + */ + public function viewRiskProcessSingle(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable + { + $view = new View($this->app, $request, $response); + $view->setTemplate('/Modules/RiskManagement/Theme/Backend/process-single'); + $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response)); + + $process = ProcessMapper::get((int) $request->getData('id')); + $view->addData('process', $process); + + return $view; + } + /** * @param RequestAbstract $request Request * @param ResponseAbstract $response Response diff --git a/Theme/Backend/category-single.tpl.php b/Theme/Backend/category-single.tpl.php new file mode 100644 index 0000000..66d5fa8 --- /dev/null +++ b/Theme/Backend/category-single.tpl.php @@ -0,0 +1,15 @@ +getData('category'); +echo $this->getData('nav')->render(); ?> diff --git a/Theme/Backend/risk-single-solution.tpl.php b/Theme/Backend/cause-single.tpl.php similarity index 88% rename from Theme/Backend/risk-single-solution.tpl.php rename to Theme/Backend/cause-single.tpl.php index 6d6f7fd..4c1e62f 100644 --- a/Theme/Backend/risk-single-solution.tpl.php +++ b/Theme/Backend/cause-single.tpl.php @@ -11,4 +11,5 @@ * @version 1.0.0 * @link http://orange-management.com */ +$cause = $this->getData('cause'); echo $this->getData('nav')->render(); ?> diff --git a/Theme/Backend/department-single.tpl.php b/Theme/Backend/department-single.tpl.php new file mode 100644 index 0000000..23f695f --- /dev/null +++ b/Theme/Backend/department-single.tpl.php @@ -0,0 +1,15 @@ +getData('department'); +echo $this->getData('nav')->render(); ?> diff --git a/Theme/Backend/process-single.tpl.php b/Theme/Backend/process-single.tpl.php new file mode 100644 index 0000000..194324f --- /dev/null +++ b/Theme/Backend/process-single.tpl.php @@ -0,0 +1,15 @@ +getData('process'); +echo $this->getData('nav')->render(); ?> diff --git a/Theme/Backend/project-single.tpl.php b/Theme/Backend/project-single.tpl.php new file mode 100644 index 0000000..25ed45f --- /dev/null +++ b/Theme/Backend/project-single.tpl.php @@ -0,0 +1,15 @@ +getData('project'); +echo $this->getData('nav')->render(); ?> diff --git a/Theme/Backend/risk-create.tpl.php b/Theme/Backend/risk-create.tpl.php index 68031c6..2d40210 100644 --- a/Theme/Backend/risk-create.tpl.php +++ b/Theme/Backend/risk-create.tpl.php @@ -39,14 +39,16 @@ echo $this->getData('nav')->render(); ?> + + - + - + - + - + diff --git a/Theme/Backend/risk-single-cause.tpl.php b/Theme/Backend/risk-single.tpl.php similarity index 89% rename from Theme/Backend/risk-single-cause.tpl.php rename to Theme/Backend/risk-single.tpl.php index 6d6f7fd..1d2b301 100644 --- a/Theme/Backend/risk-single-cause.tpl.php +++ b/Theme/Backend/risk-single.tpl.php @@ -11,4 +11,5 @@ * @version 1.0.0 * @link http://orange-management.com */ +$risk = $this->getData('risk'); echo $this->getData('nav')->render(); ?> diff --git a/Theme/Backend/solution-single.tpl.php b/Theme/Backend/solution-single.tpl.php new file mode 100644 index 0000000..236219e --- /dev/null +++ b/Theme/Backend/solution-single.tpl.php @@ -0,0 +1,15 @@ +getData('solution'); +echo $this->getData('nav')->render(); ?> diff --git a/Theme/Backend/unit-list.tpl.php b/Theme/Backend/unit-list.tpl.php index 6d6f7fd..5660511 100644 --- a/Theme/Backend/unit-list.tpl.php +++ b/Theme/Backend/unit-list.tpl.php @@ -11,4 +11,31 @@ * @version 1.0.0 * @link http://orange-management.com */ +$units = $this->getData('units'); echo $this->getData('nav')->render(); ?> + +
+
+
+ + + + + + + $value) : $c++; + $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/riskmanagement/unit/single?{?}&id=' . $value->getId()); ?> + +
getHtml('Units') ?>
getHtml('ID', 0, 0); ?> + getHtml('Name') ?> +
+
getId(), ENT_COMPAT, 'utf-8'); ?> + getName(), ENT_COMPAT, 'utf-8'); ?> + + +
getHtml('Empty', 0, 0); ?> + +
+
+
+
\ No newline at end of file diff --git a/Theme/Backend/risk-single-dashboard.tpl.php b/Theme/Backend/unit-single.tpl.php similarity index 89% rename from Theme/Backend/risk-single-dashboard.tpl.php rename to Theme/Backend/unit-single.tpl.php index 6d6f7fd..ac4d19c 100644 --- a/Theme/Backend/risk-single-dashboard.tpl.php +++ b/Theme/Backend/unit-single.tpl.php @@ -11,4 +11,5 @@ * @version 1.0.0 * @link http://orange-management.com */ +$unit = $this->getData('unit'); echo $this->getData('nav')->render(); ?>