Split task controller into smaller classes

5 files changed, 393 insertions, 357 deletions

diff --git a/app/Controller/Comment.php b/app/Controller/Comment.php
index ca701a88..7b9d4aee 100644
--- a/app/Controller/Comment.php
+++ b/app/Controller/Comment.php
@@ -93,7 +93,7 @@ class Comment extends Base
                 $this->response->redirect($this->helper->url->to('board', 'show', array('project_id' => $task['project_id'])));
             }
 
-            $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), 'comments');
+            $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), 'comments'));
         }
 
         $this->create($values, $errors);
diff --git a/app/Controller/Task.php b/app/Controller/Task.php
index 1b9f9417..0770fcd1 100644
--- a/app/Controller/Task.php
+++ b/app/Controller/Task.php
@@ -2,8 +2,6 @@
 
 namespace Controller;
 
-use Model\Project as ProjectModel;
-
 /**
  * Task controller
  *
@@ -107,231 +105,40 @@ class Task extends Base
     }
 
     /**
-     * Display a form to create a new task
-     *
-     * @access public
-     */
-    public function create(array $values = array(), array $errors = array())
-    {
-        $project = $this->getProject();
-        $method = $this->request->isAjax() ? 'render' : 'layout';
-        $swimlanes_list = $this->swimlane->getList($project['id'], false, true);
-
-        if (empty($values)) {
-
-            $values = array(
-                'swimlane_id' => $this->request->getIntegerParam('swimlane_id', key($swimlanes_list)),
-                'column_id' => $this->request->getIntegerParam('column_id'),
-                'color_id' => $this->request->getStringParam('color_id', $this->color->getDefaultColor()),
-                'owner_id' => $this->request->getIntegerParam('owner_id'),
-                'another_task' => $this->request->getIntegerParam('another_task'),
-            );
-        }
-
-        $this->response->html($this->template->$method('task/new', array(
-            'ajax' => $this->request->isAjax(),
-            'errors' => $errors,
-            'values' => $values + array('project_id' => $project['id']),
-            'projects_list' => $this->project->getListByStatus(ProjectModel::ACTIVE),
-            'columns_list' => $this->board->getColumnsList($project['id']),
-            'users_list' => $this->projectPermission->getMemberList($project['id'], true, false, true),
-            'colors_list' => $this->color->getList(),
-            'categories_list' => $this->category->getList($project['id']),
-            'swimlanes_list' => $swimlanes_list,
-            'date_format' => $this->config->get('application_date_format'),
-            'date_formats' => $this->dateParser->getAvailableFormats(),
-            'title' => $project['name'].' > '.t('New task')
-        )));
-    }
-
-    /**
-     * Validate and save a new task
-     *
-     * @access public
-     */
-    public function save()
-    {
-        $project = $this->getProject();
-        $values = $this->request->getValues();
-
-        list($valid, $errors) = $this->taskValidator->validateCreation($values);
-
-        if ($valid) {
-
-            if ($this->taskCreation->create($values)) {
-                $this->session->flash(t('Task created successfully.'));
-
-                if (isset($values['another_task']) && $values['another_task'] == 1) {
-                    unset($values['title']);
-                    unset($values['description']);
-                    $this->response->redirect($this->helper->url->to('task', 'create', $values));
-                }
-                else {
-                    $this->response->redirect($this->helper->url->to('board', 'show', array('project_id' => $project['id'])));
-                }
-            }
-            else {
-                $this->session->flashError(t('Unable to create your task.'));
-            }
-        }
-
-        $this->create($values, $errors);
-    }
-
-    /**
-     * Display a form to edit a task
-     *
-     * @access public
-     */
-    public function edit(array $values = array(), array $errors = array())
-    {
-        $task = $this->getTask();
-        $ajax = $this->request->isAjax();
-
-        if (empty($values)) {
-            $values = $task;
-        }
-
-        $this->dateParser->format($values, array('date_due'));
-
-        $params = array(
-            'values' => $values,
-            'errors' => $errors,
-            'task' => $task,
-            'users_list' => $this->projectPermission->getMemberList($task['project_id']),
-            'colors_list' => $this->color->getList(),
-            'categories_list' => $this->category->getList($task['project_id']),
-            'date_format' => $this->config->get('application_date_format'),
-            'date_formats' => $this->dateParser->getAvailableFormats(),
-            'ajax' => $ajax,
-        );
-
-        if ($ajax) {
-            $this->response->html($this->template->render('task/edit', $params));
-        }
-        else {
-            $this->response->html($this->taskLayout('task/edit', $params));
-        }
-    }
-
-    /**
-     * Validate and update a task
-     *
-     * @access public
-     */
-    public function update()
-    {
-        $task = $this->getTask();
-        $values = $this->request->getValues();
-
-        list($valid, $errors) = $this->taskValidator->validateModification($values);
-
-        if ($valid) {
-
-            if ($this->taskModification->update($values)) {
-                $this->session->flash(t('Task updated successfully.'));
-
-                if ($this->request->getIntegerParam('ajax')) {
-                    $this->response->redirect($this->helper->url->to('board', 'show', array('project_id' => $task['project_id'])));
-                }
-                else {
-                    $this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])));
-                }
-            }
-            else {
-                $this->session->flashError(t('Unable to update your task.'));
-            }
-        }
-
-        $this->edit($values, $errors);
-    }
-
-    /**
-     * Update time tracking information
-     *
-     * @access public
-     */
-    public function time()
-    {
-        $task = $this->getTask();
-        $values = $this->request->getValues();
-
-        list($valid,) = $this->taskValidator->validateTimeModification($values);
-
-        if ($valid && $this->taskModification->update($values)) {
-            $this->session->flash(t('Task updated successfully.'));
-        }
-        else {
-            $this->session->flashError(t('Unable to update your task.'));
-        }
-
-        $this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])));
-    }
-
-    /**
-     * Hide a task
+     * Display the time tracking details
      *
      * @access public
      */
-    public function close()
+    public function timetracking()
     {
         $task = $this->getTask();
-        $redirect = $this->request->getStringParam('redirect');
-
-        if ($this->request->getStringParam('confirmation') === 'yes') {
-
-            $this->checkCSRFParam();
-
-            if ($this->taskStatus->close($task['id'])) {
-                $this->session->flash(t('Task closed successfully.'));
-            } else {
-                $this->session->flashError(t('Unable to close this task.'));
-            }
-
-            if ($redirect === 'board') {
-                $this->response->redirect($this->helper->url->to('board', 'show', array('project_id' => $task['project_id'])));
-            }
 
-            $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])));
-        }
-
-        if ($this->request->isAjax()) {
-            $this->response->html($this->template->render('task/close', array(
-                'task' => $task,
-                'redirect' => $redirect,
-            )));
-        }
+        $subtask_paginator = $this->paginator
+            ->setUrl('task', 'timesheet', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'pagination' => 'subtasks'))
+            ->setMax(15)
+            ->setOrder('start')
+            ->setDirection('DESC')
+            ->setQuery($this->subtaskTimeTracking->getTaskQuery($task['id']))
+            ->calculateOnlyIf($this->request->getStringParam('pagination') === 'subtasks');
 
-        $this->response->html($this->taskLayout('task/close', array(
+        $this->response->html($this->taskLayout('task/time_tracking_details', array(
             'task' => $task,
-            'redirect' => $redirect,
+            'subtask_paginator' => $subtask_paginator,
         )));
     }
 
     /**
-     * Open a task
+     * Display the task transitions
      *
      * @access public
      */
-    public function open()
+    public function transitions()
     {
         $task = $this->getTask();
 
-        if ($this->request->getStringParam('confirmation') === 'yes') {
-
-            $this->checkCSRFParam();
-
-            if ($this->taskStatus->open($task['id'])) {
-                $this->session->flash(t('Task opened successfully.'));
-            } else {
-                $this->session->flashError(t('Unable to open this task.'));
-            }
-
-            $this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])));
-        }
-
-        $this->response->html($this->taskLayout('task/open', array(
+        $this->response->html($this->taskLayout('task/transitions', array(
             'task' => $task,
+            'transitions' => $this->transition->getAllByTask($task['id']),
         )));
     }
 
@@ -365,152 +172,4 @@ class Task extends Base
             'task' => $task,
         )));
     }
-
-    /**
-     * Edit description form
-     *
-     * @access public
-     */
-    public function description()
-    {
-        $task = $this->getTask();
-        $ajax = $this->request->isAjax() || $this->request->getIntegerParam('ajax');
-
-        if ($this->request->isPost()) {
-
-            $values = $this->request->getValues();
-
-            list($valid, $errors) = $this->taskValidator->validateDescriptionCreation($values);
-
-            if ($valid) {
-
-                if ($this->taskModification->update($values)) {
-                    $this->session->flash(t('Task updated successfully.'));
-                }
-                else {
-                    $this->session->flashError(t('Unable to update your task.'));
-                }
-
-                if ($ajax) {
-                    $this->response->redirect($this->helper->url->to('board', 'show', array('project_id' => $task['project_id'])));
-                }
-                else {
-                    $this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])));
-                }
-            }
-        }
-        else {
-            $values = $task;
-            $errors = array();
-        }
-
-        $params = array(
-            'values' => $values,
-            'errors' => $errors,
-            'task' => $task,
-            'ajax' => $ajax,
-        );
-
-        if ($ajax) {
-            $this->response->html($this->template->render('task/edit_description', $params));
-        }
-        else {
-            $this->response->html($this->taskLayout('task/edit_description', $params));
-        }
-    }
-
-    /**
-     * Edit recurrence form
-     *
-     * @access public
-     */
-    public function recurrence()
-    {
-        $task = $this->getTask();
-
-        if ($this->request->isPost()) {
-
-            $values = $this->request->getValues();
-
-            list($valid, $errors) = $this->taskValidator->validateEditRecurrence($values);
-
-            if ($valid) {
-
-                if ($this->taskModification->update($values)) {
-                    $this->session->flash(t('Task updated successfully.'));
-                }
-                else {
-                    $this->session->flashError(t('Unable to update your task.'));
-                }
-
-                $this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])));
-            }
-        }
-        else {
-            $values = $task;
-            $errors = array();
-        }
-
-        $params = array(
-            'values' => $values,
-            'errors' => $errors,
-            'task' => $task,
-            'recurrence_status_list' => $this->task->getRecurrenceStatusList(),
-            'recurrence_trigger_list' => $this->task->getRecurrenceTriggerList(),
-            'recurrence_timeframe_list' => $this->task->getRecurrenceTimeframeList(),
-            'recurrence_basedate_list' => $this->task->getRecurrenceBasedateList(),
-        );
-
-        $this->response->html($this->taskLayout('task/edit_recurrence', $params));
-    }
-
-    /**
-     * Display the time tracking details
-     *
-     * @access public
-     */
-    public function timesheet()
-    {
-        $task = $this->getTask();
-
-        $subtask_paginator = $this->paginator
-            ->setUrl('task', 'timesheet', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'pagination' => 'subtasks'))
-            ->setMax(15)
-            ->setOrder('start')
-            ->setDirection('DESC')
-            ->setQuery($this->subtaskTimeTracking->getTaskQuery($task['id']))
-            ->calculateOnlyIf($this->request->getStringParam('pagination') === 'subtasks');
-
-        $this->response->html($this->taskLayout('task/time_tracking', array(
-            'task' => $task,
-            'subtask_paginator' => $subtask_paginator,
-        )));
-    }
-
-    /**
-     * Display the task transitions
-     *
-     * @access public
-     */
-    public function transitions()
-    {
-        $task = $this->getTask();
-
-        $this->response->html($this->taskLayout('task/transitions', array(
-            'task' => $task,
-            'transitions' => $this->transition->getAllByTask($task['id']),
-        )));
-    }
-
-    /**
-     * Set automatically the start date
-     *
-     * @access public
-     */
-    public function start()
-    {
-        $task = $this->getTask();
-        $this->taskModification->update(array('id' => $task['id'], 'date_started' => time()));
-        $this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])));
-    }
 }
diff --git a/app/Controller/Taskcreation.php b/app/Controller/Taskcreation.php
new file mode 100644
index 00000000..7c841e10
--- /dev/null
+++ b/app/Controller/Taskcreation.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Controller;
+
+use Model\Project as ProjectModel;
+
+/**
+ * Task Creation controller
+ *
+ * @package  controller
+ * @author   Frederic Guillot
+ */
+class Taskcreation extends Base
+{
+    /**
+     * Display a form to create a new task
+     *
+     * @access public
+     */
+    public function create(array $values = array(), array $errors = array())
+    {
+        $project = $this->getProject();
+        $method = $this->request->isAjax() ? 'render' : 'layout';
+        $swimlanes_list = $this->swimlane->getList($project['id'], false, true);
+
+        if (empty($values)) {
+
+            $values = array(
+                'swimlane_id' => $this->request->getIntegerParam('swimlane_id', key($swimlanes_list)),
+                'column_id' => $this->request->getIntegerParam('column_id'),
+                'color_id' => $this->request->getStringParam('color_id', $this->color->getDefaultColor()),
+                'owner_id' => $this->request->getIntegerParam('owner_id'),
+                'another_task' => $this->request->getIntegerParam('another_task'),
+            );
+        }
+
+        $this->response->html($this->template->$method('task_creation/form', array(
+            'ajax' => $this->request->isAjax(),
+            'errors' => $errors,
+            'values' => $values + array('project_id' => $project['id']),
+            'projects_list' => $this->project->getListByStatus(ProjectModel::ACTIVE),
+            'columns_list' => $this->board->getColumnsList($project['id']),
+            'users_list' => $this->projectPermission->getMemberList($project['id'], true, false, true),
+            'colors_list' => $this->color->getList(),
+            'categories_list' => $this->category->getList($project['id']),
+            'swimlanes_list' => $swimlanes_list,
+            'date_format' => $this->config->get('application_date_format'),
+            'date_formats' => $this->dateParser->getAvailableFormats(),
+            'title' => $project['name'].' &gt; '.t('New task')
+        )));
+    }
+
+    /**
+     * Validate and save a new task
+     *
+     * @access public
+     */
+    public function save()
+    {
+        $project = $this->getProject();
+        $values = $this->request->getValues();
+
+        list($valid, $errors) = $this->taskValidator->validateCreation($values);
+
+        if ($valid) {
+
+            if ($this->taskCreation->create($values)) {
+                $this->session->flash(t('Task created successfully.'));
+
+                if (isset($values['another_task']) && $values['another_task'] == 1) {
+                    unset($values['title']);
+                    unset($values['description']);
+                    $this->response->redirect($this->helper->url->to('taskcreation', 'create', $values));
+                }
+                else {
+                    $this->response->redirect($this->helper->url->to('board', 'show', array('project_id' => $project['id'])));
+                }
+            }
+            else {
+                $this->session->flashError(t('Unable to create your task.'));
+            }
+        }
+
+        $this->create($values, $errors);
+    }
+}
diff --git a/app/Controller/Taskmodification.php b/app/Controller/Taskmodification.php
new file mode 100644
index 00000000..56d2b9f9
--- /dev/null
+++ b/app/Controller/Taskmodification.php
@@ -0,0 +1,212 @@
+<?php
+
+namespace Controller;
+
+/**
+ * Task Modification controller
+ *
+ * @package  controller
+ * @author   Frederic Guillot
+ */
+class Taskmodification extends Base
+{
+    /**
+     * Set automatically the start date
+     *
+     * @access public
+     */
+    public function start()
+    {
+        $task = $this->getTask();
+        $this->taskModification->update(array('id' => $task['id'], 'date_started' => time()));
+        $this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])));
+    }
+
+    /**
+     * Update time tracking information
+     *
+     * @access public
+     */
+    public function time()
+    {
+        $task = $this->getTask();
+        $values = $this->request->getValues();
+
+        list($valid,) = $this->taskValidator->validateTimeModification($values);
+
+        if ($valid && $this->taskModification->update($values)) {
+            $this->session->flash(t('Task updated successfully.'));
+        }
+        else {
+            $this->session->flashError(t('Unable to update your task.'));
+        }
+
+        $this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])));
+    }
+
+    /**
+     * Edit description form
+     *
+     * @access public
+     */
+    public function description()
+    {
+        $task = $this->getTask();
+        $ajax = $this->request->isAjax() || $this->request->getIntegerParam('ajax');
+
+        if ($this->request->isPost()) {
+
+            $values = $this->request->getValues();
+
+            list($valid, $errors) = $this->taskValidator->validateDescriptionCreation($values);
+
+            if ($valid) {
+
+                if ($this->taskModification->update($values)) {
+                    $this->session->flash(t('Task updated successfully.'));
+                }
+                else {
+                    $this->session->flashError(t('Unable to update your task.'));
+                }
+
+                if ($ajax) {
+                    $this->response->redirect($this->helper->url->to('board', 'show', array('project_id' => $task['project_id'])));
+                }
+                else {
+                    $this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])));
+                }
+            }
+        }
+        else {
+            $values = $task;
+            $errors = array();
+        }
+
+        $params = array(
+            'values' => $values,
+            'errors' => $errors,
+            'task' => $task,
+            'ajax' => $ajax,
+        );
+
+        if ($ajax) {
+            $this->response->html($this->template->render('task_modification/edit_description', $params));
+        }
+        else {
+            $this->response->html($this->taskLayout('task_modification/edit_description', $params));
+        }
+    }
+
+    /**
+     * Display a form to edit a task
+     *
+     * @access public
+     */
+    public function edit(array $values = array(), array $errors = array())
+    {
+        $task = $this->getTask();
+        $ajax = $this->request->isAjax();
+
+        if (empty($values)) {
+            $values = $task;
+        }
+
+        $this->dateParser->format($values, array('date_due'));
+
+        $params = array(
+            'values' => $values,
+            'errors' => $errors,
+            'task' => $task,
+            'users_list' => $this->projectPermission->getMemberList($task['project_id']),
+            'colors_list' => $this->color->getList(),
+            'categories_list' => $this->category->getList($task['project_id']),
+            'date_format' => $this->config->get('application_date_format'),
+            'date_formats' => $this->dateParser->getAvailableFormats(),
+            'ajax' => $ajax,
+        );
+
+        if ($ajax) {
+            $this->response->html($this->template->render('task_modification/edit_task', $params));
+        }
+        else {
+            $this->response->html($this->taskLayout('task_modification/edit_task', $params));
+        }
+    }
+
+    /**
+     * Validate and update a task
+     *
+     * @access public
+     */
+    public function update()
+    {
+        $task = $this->getTask();
+        $values = $this->request->getValues();
+
+        list($valid, $errors) = $this->taskValidator->validateModification($values);
+
+        if ($valid) {
+
+            if ($this->taskModification->update($values)) {
+                $this->session->flash(t('Task updated successfully.'));
+
+                if ($this->request->getIntegerParam('ajax')) {
+                    $this->response->redirect($this->helper->url->to('board', 'show', array('project_id' => $task['project_id'])));
+                }
+                else {
+                    $this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])));
+                }
+            }
+            else {
+                $this->session->flashError(t('Unable to update your task.'));
+            }
+        }
+
+        $this->edit($values, $errors);
+    }
+
+    /**
+     * Edit recurrence form
+     *
+     * @access public
+     */
+    public function recurrence()
+    {
+        $task = $this->getTask();
+
+        if ($this->request->isPost()) {
+
+            $values = $this->request->getValues();
+
+            list($valid, $errors) = $this->taskValidator->validateEditRecurrence($values);
+
+            if ($valid) {
+
+                if ($this->taskModification->update($values)) {
+                    $this->session->flash(t('Task updated successfully.'));
+                }
+                else {
+                    $this->session->flashError(t('Unable to update your task.'));
+                }
+
+                $this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])));
+            }
+        }
+        else {
+            $values = $task;
+            $errors = array();
+        }
+
+        $params = array(
+            'values' => $values,
+            'errors' => $errors,
+            'task' => $task,
+            'recurrence_status_list' => $this->task->getRecurrenceStatusList(),
+            'recurrence_trigger_list' => $this->task->getRecurrenceTriggerList(),
+            'recurrence_timeframe_list' => $this->task->getRecurrenceTimeframeList(),
+            'recurrence_basedate_list' => $this->task->getRecurrenceBasedateList(),
+        );
+
+        $this->response->html($this->taskLayout('task_modification/edit_recurrence', $params));
+    }
+}
diff --git a/app/Controller/Taskstatus.php b/app/Controller/Taskstatus.php
new file mode 100644
index 00000000..a47d9da3
--- /dev/null
+++ b/app/Controller/Taskstatus.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Controller;
+
+/**
+ * Task Status controller
+ *
+ * @package  controller
+ * @author   Frederic Guillot
+ */
+class Taskstatus extends Base
+{
+    /**
+     * Close a task
+     *
+     * @access public
+     */
+    public function close()
+    {
+        $task = $this->getTask();
+        $redirect = $this->request->getStringParam('redirect');
+
+        if ($this->request->getStringParam('confirmation') === 'yes') {
+
+            $this->checkCSRFParam();
+
+            if ($this->taskStatus->close($task['id'])) {
+                $this->session->flash(t('Task closed successfully.'));
+            } else {
+                $this->session->flashError(t('Unable to close this task.'));
+            }
+
+            if ($redirect === 'board') {
+                $this->response->redirect($this->helper->url->to('board', 'show', array('project_id' => $task['project_id'])));
+            }
+
+            $this->response->redirect($this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])));
+        }
+
+        if ($this->request->isAjax()) {
+            $this->response->html($this->template->render('task_status/close', array(
+                'task' => $task,
+                'redirect' => $redirect,
+            )));
+        }
+
+        $this->response->html($this->taskLayout('task_status/close', array(
+            'task' => $task,
+            'redirect' => $redirect,
+        )));
+    }
+
+    /**
+     * Open a task
+     *
+     * @access public
+     */
+    public function open()
+    {
+        $task = $this->getTask();
+
+        if ($this->request->getStringParam('confirmation') === 'yes') {
+
+            $this->checkCSRFParam();
+
+            if ($this->taskStatus->open($task['id'])) {
+                $this->session->flash(t('Task opened successfully.'));
+            } else {
+                $this->session->flashError(t('Unable to open this task.'));
+            }
+
+            $this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])));
+        }
+
+        $this->response->html($this->taskLayout('task_status/open', array(
+            'task' => $task,
+        )));
+    }
+}