Split Gantt controller

4 files changed, 190 insertions, 165 deletions

diff --git a/app/Controller/Gantt.php b/app/Controller/Gantt.php
deleted file mode 100644
index d062b2fe..00000000
--- a/app/Controller/Gantt.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-
-namespace Kanboard\Controller;
-
-use Kanboard\Filter\ProjectIdsFilter;
-use Kanboard\Filter\ProjectStatusFilter;
-use Kanboard\Filter\ProjectTypeFilter;
-use Kanboard\Filter\TaskProjectFilter;
-use Kanboard\Formatter\ProjectGanttFormatter;
-use Kanboard\Formatter\TaskGanttFormatter;
-use Kanboard\Model\Task as TaskModel;
-use Kanboard\Model\Project as ProjectModel;
-
-/**
- * Gantt controller
- *
- * @package  controller
- * @author   Frederic Guillot
- */
-class Gantt extends BaseController
-{
-    /**
-     * Show Gantt chart for all projects
-     */
-    public function projects()
-    {
-        $project_ids = $this->projectPermission->getActiveProjectIds($this->userSession->getId());
-        $filter = $this->projectQuery
-            ->withFilter(new ProjectTypeFilter(ProjectModel::TYPE_TEAM))
-            ->withFilter(new ProjectStatusFilter(ProjectModel::ACTIVE))
-            ->withFilter(new ProjectIdsFilter($project_ids));
-
-        $filter->getQuery()->asc(ProjectModel::TABLE.'.start_date');
-
-        $this->response->html($this->helper->layout->app('gantt/projects', array(
-            'projects' => $filter->format(new ProjectGanttFormatter($this->container)),
-            'title' => t('Gantt chart for all projects'),
-        )));
-    }
-
-    /**
-     * Save new project start date and end date
-     */
-    public function saveProjectDate()
-    {
-        $values = $this->request->getJson();
-
-        $result = $this->project->update(array(
-            'id' => $values['id'],
-            'start_date' => $this->dateParser->getIsoDate(strtotime($values['start'])),
-            'end_date' => $this->dateParser->getIsoDate(strtotime($values['end'])),
-        ));
-
-        if (! $result) {
-            $this->response->json(array('message' => 'Unable to save project'), 400);
-        } else {
-            $this->response->json(array('message' => 'OK'), 201);
-        }
-    }
-
-    /**
-     * Show Gantt chart for one project
-     */
-    public function project()
-    {
-        $project = $this->getProject();
-        $search = $this->helper->projectHeader->getSearchQuery($project);
-        $sorting = $this->request->getStringParam('sorting', 'board');
-        $filter = $this->taskLexer->build($search)->withFilter(new TaskProjectFilter($project['id']));
-
-        if ($sorting === 'date') {
-            $filter->getQuery()->asc(TaskModel::TABLE.'.date_started')->asc(TaskModel::TABLE.'.date_creation');
-        } else {
-            $filter->getQuery()->asc('column_position')->asc(TaskModel::TABLE.'.position');
-        }
-
-        $this->response->html($this->helper->layout->app('gantt/project', array(
-            'project' => $project,
-            'title' => $project['name'],
-            'description' => $this->helper->projectHeader->getDescription($project),
-            'sorting' => $sorting,
-            'tasks' => $filter->format(new TaskGanttFormatter($this->container)),
-        )));
-    }
-
-    /**
-     * Save new task start date and due date
-     */
-    public function saveTaskDate()
-    {
-        $this->getProject();
-        $values = $this->request->getJson();
-
-        $result = $this->taskModification->update(array(
-            'id' => $values['id'],
-            'date_started' => strtotime($values['start']),
-            'date_due' => strtotime($values['end']),
-        ));
-
-        if (! $result) {
-            $this->response->json(array('message' => 'Unable to save task'), 400);
-        } else {
-            $this->response->json(array('message' => 'OK'), 201);
-        }
-    }
-
-    /**
-     * Simplified form to create a new task
-     *
-     * @access public
-     * @param array $values
-     * @param array $errors
-     * @throws \Kanboard\Core\Controller\PageNotFoundException
-     */
-    public function task(array $values = array(), array $errors = array())
-    {
-        $project = $this->getProject();
-
-        $values = $values + array(
-            'project_id' => $project['id'],
-            'column_id' => $this->column->getFirstColumnId($project['id']),
-            'position' => 1
-        );
-
-        $values = $this->hook->merge('controller:task:form:default', $values, array('default_values' => $values));
-        $values = $this->hook->merge('controller:gantt:task:form:default', $values, array('default_values' => $values));
-
-        $this->response->html($this->template->render('gantt/task_creation', array(
-            'project' => $project,
-            'errors' => $errors,
-            'values' => $values,
-            'users_list' => $this->projectUserRole->getAssignableUsersList($project['id'], true, false, true),
-            'colors_list' => $this->color->getList(),
-            'categories_list' => $this->category->getList($project['id']),
-            'swimlanes_list' => $this->swimlane->getList($project['id'], false, true),
-            'title' => $project['name'].' &gt; '.t('New task')
-        )));
-    }
-
-    /**
-     * Validate and save a new task
-     *
-     * @access public
-     */
-    public function saveTask()
-    {
-        $project = $this->getProject();
-        $values = $this->request->getValues();
-
-        list($valid, $errors) = $this->taskValidator->validateCreation($values);
-
-        if ($valid) {
-            $task_id = $this->taskCreation->create($values);
-
-            if ($task_id !== false) {
-                $this->flash->success(t('Task created successfully.'));
-                return $this->response->redirect($this->helper->url->to('gantt', 'project', array('project_id' => $project['id'])));
-            } else {
-                $this->flash->failure(t('Unable to create your task.'));
-            }
-        }
-
-        return $this->task($values, $errors);
-    }
-}
diff --git a/app/Controller/ProjectGanttController.php b/app/Controller/ProjectGanttController.php
new file mode 100644
index 00000000..1c6ace58
--- /dev/null
+++ b/app/Controller/ProjectGanttController.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Kanboard\Controller;
+
+use Kanboard\Filter\ProjectIdsFilter;
+use Kanboard\Filter\ProjectStatusFilter;
+use Kanboard\Filter\ProjectTypeFilter;
+use Kanboard\Formatter\ProjectGanttFormatter;
+use Kanboard\Model\Project;
+
+/**
+ * Projects Gantt Controller
+ *
+ * @package Kanboard\Controller
+ * @author  Frederic Guillot
+ */
+class ProjectGanttController extends BaseController
+{
+    /**
+     * Show Gantt chart for all projects
+     */
+    public function show()
+    {
+        $project_ids = $this->projectPermission->getActiveProjectIds($this->userSession->getId());
+        $filter = $this->projectQuery
+            ->withFilter(new ProjectTypeFilter(Project::TYPE_TEAM))
+            ->withFilter(new ProjectStatusFilter(Project::ACTIVE))
+            ->withFilter(new ProjectIdsFilter($project_ids));
+
+        $filter->getQuery()->asc(Project::TABLE.'.start_date');
+
+        $this->response->html($this->helper->layout->app('project_gantt/show', array(
+            'projects' => $filter->format(new ProjectGanttFormatter($this->container)),
+            'title' => t('Gantt chart for all projects'),
+        )));
+    }
+
+    /**
+     * Save new project start date and end date
+     */
+    public function save()
+    {
+        $values = $this->request->getJson();
+
+        $result = $this->project->update(array(
+            'id' => $values['id'],
+            'start_date' => $this->dateParser->getIsoDate(strtotime($values['start'])),
+            'end_date' => $this->dateParser->getIsoDate(strtotime($values['end'])),
+        ));
+
+        if (! $result) {
+            $this->response->json(array('message' => 'Unable to save project'), 400);
+        } else {
+            $this->response->json(array('message' => 'OK'), 201);
+        }
+    }
+}
diff --git a/app/Controller/TaskGanttController.php b/app/Controller/TaskGanttController.php
new file mode 100644
index 00000000..3d0c5f50
--- /dev/null
+++ b/app/Controller/TaskGanttController.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Kanboard\Controller;
+
+use Kanboard\Filter\TaskProjectFilter;
+use Kanboard\Formatter\TaskGanttFormatter;
+use Kanboard\Model\Task as TaskModel;
+
+/**
+ * Tasks Gantt Controller
+ *
+ * @package  Kanboard\Controller
+ * @author   Frederic Guillot
+ */
+class TaskGanttController extends BaseController
+{
+    /**
+     * Show Gantt chart for one project
+     */
+    public function show()
+    {
+        $project = $this->getProject();
+        $search = $this->helper->projectHeader->getSearchQuery($project);
+        $sorting = $this->request->getStringParam('sorting', 'board');
+        $filter = $this->taskLexer->build($search)->withFilter(new TaskProjectFilter($project['id']));
+
+        if ($sorting === 'date') {
+            $filter->getQuery()->asc(TaskModel::TABLE.'.date_started')->asc(TaskModel::TABLE.'.date_creation');
+        } else {
+            $filter->getQuery()->asc('column_position')->asc(TaskModel::TABLE.'.position');
+        }
+
+        $this->response->html($this->helper->layout->app('task_gantt/show', array(
+            'project' => $project,
+            'title' => $project['name'],
+            'description' => $this->helper->projectHeader->getDescription($project),
+            'sorting' => $sorting,
+            'tasks' => $filter->format(new TaskGanttFormatter($this->container)),
+        )));
+    }
+
+    /**
+     * Save new task start date and due date
+     */
+    public function save()
+    {
+        $this->getProject();
+        $values = $this->request->getJson();
+
+        $result = $this->taskModification->update(array(
+            'id' => $values['id'],
+            'date_started' => strtotime($values['start']),
+            'date_due' => strtotime($values['end']),
+        ));
+
+        if (! $result) {
+            $this->response->json(array('message' => 'Unable to save task'), 400);
+        } else {
+            $this->response->json(array('message' => 'OK'), 201);
+        }
+    }
+}
diff --git a/app/Controller/TaskGanttCreationController.php b/app/Controller/TaskGanttCreationController.php
new file mode 100644
index 00000000..0ae4ab3b
--- /dev/null
+++ b/app/Controller/TaskGanttCreationController.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Kanboard\Controller;
+
+/**
+ * Class TaskGanttCreationController
+ *
+ * @package Kanboard\Controller
+ * @author  Frederic Guillot
+ */
+class TaskGanttCreationController extends BaseController
+{
+    /**
+     * Simplified form to create a new task
+     *
+     * @access public
+     * @param  array $values
+     * @param  array $errors
+     * @throws \Kanboard\Core\Controller\PageNotFoundException
+     */
+    public function show(array $values = array(), array $errors = array())
+    {
+        $project = $this->getProject();
+
+        $values = $values + array(
+                'project_id' => $project['id'],
+                'column_id' => $this->column->getFirstColumnId($project['id']),
+                'position' => 1
+            );
+
+        $values = $this->hook->merge('controller:task:form:default', $values, array('default_values' => $values));
+        $values = $this->hook->merge('controller:gantt:task:form:default', $values, array('default_values' => $values));
+
+        $this->response->html($this->template->render('task_gantt_creation/show', array(
+            'project' => $project,
+            'errors' => $errors,
+            'values' => $values,
+            'users_list' => $this->projectUserRole->getAssignableUsersList($project['id'], true, false, true),
+            'colors_list' => $this->color->getList(),
+            'categories_list' => $this->category->getList($project['id']),
+            'swimlanes_list' => $this->swimlane->getList($project['id'], false, true),
+            '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) {
+            $task_id = $this->taskCreation->create($values);
+
+            if ($task_id !== false) {
+                $this->flash->success(t('Task created successfully.'));
+                return $this->response->redirect($this->helper->url->to('TaskGanttController', 'show', array('project_id' => $project['id'])));
+            } else {
+                $this->flash->failure(t('Unable to create your task.'));
+            }
+        }
+
+        return $this->show($values, $errors);
+    }
+}