Jingga/oms-Tasks
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Tasks.git synced 2026-02-18 15:48:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup and function pull out

Browse Source
This commit is contained in:
Dennis Eichhorn 2016-01-30 22:13:15 +01:00
parent 11ec29fcdd
commit 4ae3416d92
3 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Controller.php
View File

@ -118,7 +118,7 @@ class Controller extends ModuleAbstract implements WebInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Tasks/Theme/Backend/task-dashboard'); $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; return $view;
} }
@ -137,7 +137,7 @@ class Controller extends ModuleAbstract implements WebInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Tasks/Theme/Backend/task-single'); $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; return $view;
} }
@ -156,7 +156,7 @@ class Controller extends ModuleAbstract implements WebInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Tasks/Theme/Backend/task-create'); $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; return $view;
} }
@ -175,30 +175,9 @@ class Controller extends ModuleAbstract implements WebInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Tasks/Theme/Backend/task-analysis'); $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; 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;
}
} }

13
Models/Task.php
View File

@ -14,6 +14,7 @@
* @link http://orange-management.com * @link http://orange-management.com
*/ */
namespace Modules\Tasks\Models; namespace Modules\Tasks\Models;
use phpOMS\Datatypes\Exception\InvalidEnumValue;
/** /**
* Task class. * Task class.
@ -277,11 +278,17 @@ class Task
/** /**
* @param int $status * @param int $status
* *
* @throws
*
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
public function setStatus(int $status) public function setStatus(int $status)
{ {
if(!TaskStatus::isValidValue($status)) {
throw new InvalidEnumValue($status);
}
$this->status = $status; $this->status = $status;
} }
@ -374,11 +381,17 @@ class Task
* *
* @param int $type * @param int $type
* *
* @throws
*
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
public function setType(\int $type) public function setType(\int $type)
{ {
if(!TaskType::isValidValue($type)) {
throw new InvalidEnumValue($type);
}
$this->type = $type; $this->type = $type;
} }

7
Models/TaskElement.php
View File

@ -14,6 +14,7 @@
* @link http://orange-management.com * @link http://orange-management.com
*/ */
namespace Modules\Tasks\Models; namespace Modules\Tasks\Models;
use phpOMS\Datatypes\Exception\InvalidEnumValue;
/** /**
* Task class. * Task class.
@ -252,11 +253,17 @@ class TaskElement
* *
* @return void * @return void
* *
* @throws
*
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com> * @author Dennis Eichhorn <d.eichhorn@oms.com>
*/ */
public function setStatus(int $status) public function setStatus(int $status)
{ {
if(!TaskStatus::isValidValue($status)) {
throw new InvalidEnumValue($status);
}
$this->status = $status; $this->status = $status;
} }