From 4ae3416d92709db5ac4303620711af3bc956c860 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 30 Jan 2016 22:13:15 +0100
Subject: [PATCH] Cleanup and function pull out

---
 Controller.php         | 29 ++++-------------------------
 Models/Task.php        | 13 +++++++++++++
 Models/TaskElement.php |  7 +++++++
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/Controller.php b/Controller.php
index 771aa0a..bb1041c 100644
--- a/Controller.php
+++ b/Controller.php
@@ -118,7 +118,7 @@ class Controller extends ModuleAbstract implements WebInterface
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Tasks/Theme/Backend/task-dashboard');
-        $view->addData('nav', $this->createNavigation(1001101001, $request, $response));
+        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response));
 
         return $view;
     }
@@ -137,7 +137,7 @@ class Controller extends ModuleAbstract implements WebInterface
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Tasks/Theme/Backend/task-single');
-        $view->addData('nav', $this->createNavigation(1001101001, $request, $response));
+        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response));
 
         return $view;
     }
@@ -156,7 +156,7 @@ class Controller extends ModuleAbstract implements WebInterface
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Tasks/Theme/Backend/task-create');
-        $view->addData('nav', $this->createNavigation(1001101001, $request, $response));
+        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response));
 
         return $view;
     }
@@ -175,30 +175,9 @@ class Controller extends ModuleAbstract implements WebInterface
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Tasks/Theme/Backend/task-analysis');
-        $view->addData('nav', $this->createNavigation(1001101001, $request, $response));
+        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response));
 
         return $view;
     }
 
-    /**
-     * @param int              $pageId   Page/parent Id for navigation
-     * @param RequestAbstract  $request  Request
-     * @param ResponseAbstract $response Response
-     *
-     * @return RenderableInterface
-     *
-     * @since  1.0.0
-     * @author Dennis Eichhorn <d.eichhorn@oms.com>
-     */
-    private function createNavigation(int $pageId, RequestAbstract $request, ResponseAbstract $response)
-    {
-        $nav     = Navigation::getInstance($request, $this->app->dbPool);
-        $navView = new NavigationView($this->app, $request, $response);
-        $navView->setTemplate('/Modules/Navigation/Theme/Backend/mid');
-        $navView->setNav($nav->getNav());
-        $navView->setLanguage($request->getL11n()->getLanguage());
-        $navView->setParent($pageId);
-
-        return $navView;
-    }
 }
diff --git a/Models/Task.php b/Models/Task.php
index a005914..dc53ef1 100644
--- a/Models/Task.php
+++ b/Models/Task.php
@@ -14,6 +14,7 @@
  * @link       http://orange-management.com
  */
 namespace Modules\Tasks\Models;
+use phpOMS\Datatypes\Exception\InvalidEnumValue;
 
 /**
  * Task class.
@@ -277,11 +278,17 @@ class Task
     /**
      * @param int $status
      *
+     * @throws
+     *
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
     public function setStatus(int $status)
     {
+        if(!TaskStatus::isValidValue($status)) {
+            throw new InvalidEnumValue($status);
+        }
+
         $this->status = $status;
     }
 
@@ -374,11 +381,17 @@ class Task
      *
      * @param int $type
      *
+     * @throws
+     *
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
     public function setType(\int $type)
     {
+        if(!TaskType::isValidValue($type)) {
+            throw new InvalidEnumValue($type);
+        }
+
         $this->type = $type;
     }
 
diff --git a/Models/TaskElement.php b/Models/TaskElement.php
index f94ab1a..721cd29 100644
--- a/Models/TaskElement.php
+++ b/Models/TaskElement.php
@@ -14,6 +14,7 @@
  * @link       http://orange-management.com
  */
 namespace Modules\Tasks\Models;
+use phpOMS\Datatypes\Exception\InvalidEnumValue;
 
 /**
  * Task class.
@@ -252,11 +253,17 @@ class TaskElement
      *
      * @return void
      *
+     * @throws
+     *
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
     public function setStatus(int $status)
     {
+        if(!TaskStatus::isValidValue($status)) {
+            throw new InvalidEnumValue($status);
+        }
+
         $this->status = $status;
     }