From 401b0bdfb10ebfe75c9a392de52d37cc3c22c062 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sun, 19 Jul 2015 18:14:20 -0400 Subject: Split task controller into smaller classes --- app/Controller/Comment.php | 2 +- app/Controller/Task.php | 371 +-------------------- app/Controller/Taskcreation.php | 86 +++++ app/Controller/Taskmodification.php | 212 ++++++++++++ app/Controller/Taskstatus.php | 79 +++++ app/Model/Acl.php | 3 + app/Template/board/table_container.php | 2 +- app/Template/board/table_swimlane.php | 2 +- app/Template/board/task_menu.php | 6 +- app/Template/task/close.php | 15 - app/Template/task/description.php | 33 ++ app/Template/task/edit.php | 68 ---- app/Template/task/edit_description.php | 38 --- app/Template/task/edit_recurrence.php | 47 --- app/Template/task/new.php | 84 ----- app/Template/task/open.php | 15 - app/Template/task/public.php | 2 +- app/Template/task/show.php | 6 +- app/Template/task/show_description.php | 33 -- app/Template/task/sidebar.php | 12 +- app/Template/task/time.php | 20 -- app/Template/task/time_tracking.php | 27 -- app/Template/task/time_tracking_details.php | 27 ++ app/Template/task/time_tracking_summary.php | 13 + app/Template/task/timesheet.php | 13 - app/Template/task_creation/form.php | 84 +++++ .../task_modification/edit_description.php | 38 +++ app/Template/task_modification/edit_recurrence.php | 47 +++ app/Template/task_modification/edit_task.php | 66 ++++ app/Template/task_modification/edit_time.php | 20 ++ app/Template/task_status/close.php | 15 + app/Template/task_status/open.php | 15 + app/common.php | 21 +- 33 files changed, 788 insertions(+), 734 deletions(-) create mode 100644 app/Controller/Taskcreation.php create mode 100644 app/Controller/Taskmodification.php create mode 100644 app/Controller/Taskstatus.php delete mode 100644 app/Template/task/close.php create mode 100644 app/Template/task/description.php delete mode 100644 app/Template/task/edit.php delete mode 100644 app/Template/task/edit_description.php delete mode 100644 app/Template/task/edit_recurrence.php delete mode 100644 app/Template/task/new.php delete mode 100644 app/Template/task/open.php delete mode 100644 app/Template/task/show_description.php delete mode 100644 app/Template/task/time.php delete mode 100644 app/Template/task/time_tracking.php create mode 100644 app/Template/task/time_tracking_details.php create mode 100644 app/Template/task/time_tracking_summary.php delete mode 100644 app/Template/task/timesheet.php create mode 100644 app/Template/task_creation/form.php create mode 100644 app/Template/task_modification/edit_description.php create mode 100644 app/Template/task_modification/edit_recurrence.php create mode 100644 app/Template/task_modification/edit_task.php create mode 100644 app/Template/task_modification/edit_time.php create mode 100644 app/Template/task_status/close.php create mode 100644 app/Template/task_status/open.php 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 @@ +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'].' > '.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 @@ +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 @@ +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, + ))); + } +} diff --git a/app/Model/Acl.php b/app/Model/Acl.php index 6ee78faa..95056de6 100644 --- a/app/Model/Acl.php +++ b/app/Model/Acl.php @@ -42,6 +42,9 @@ class Acl extends Base 'subtask' => '*', 'task' => '*', 'taskduplication' => '*', + 'taskcreation' => '*', + 'taskmodification' => '*', + 'taskstatus' => '*', 'tasklink' => '*', 'timer' => '*', 'calendar' => array('show', 'project'), diff --git a/app/Template/board/table_container.php b/app/Template/board/table_container.php index 9d3a1134..65ccdc4f 100644 --- a/app/Template/board/table_container.php +++ b/app/Template/board/table_container.php @@ -8,7 +8,7 @@ data-check-interval="" data-save-url="url->href('board', 'save', array('project_id' => $project['id'])) ?>" data-check-url="url->href('board', 'check', array('project_id' => $project['id'], 'timestamp' => time())) ?>" - data-task-creation-url="url->href('task', 'create', array('project_id' => $project['id'])) ?>" + data-task-creation-url="url->href('taskcreation', 'create', array('project_id' => $project['id'])) ?>" > diff --git a/app/Template/board/table_swimlane.php b/app/Template/board/table_swimlane.php index 436c53b5..4cd137cb 100644 --- a/app/Template/board/table_swimlane.php +++ b/app/Template/board/table_swimlane.php @@ -15,7 +15,7 @@
- url->link('+', 'task', 'create', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'task-board-popover', t('Add a new task')) ?> + url->link('+', 'taskcreation', 'create', array('project_id' => $column['project_id'], 'column_id' => $column['id'], 'swimlane_id' => $swimlane['id']), false, 'task-board-popover', t('Add a new task')) ?>
diff --git a/app/Template/board/task_menu.php b/app/Template/board/task_menu.php index a84b972d..71963b5e 100644 --- a/app/Template/board/task_menu.php +++ b/app/Template/board/task_menu.php @@ -4,12 +4,12 @@ diff --git a/app/Template/task/close.php b/app/Template/task/close.php deleted file mode 100644 index 160d5400..00000000 --- a/app/Template/task/close.php +++ /dev/null @@ -1,15 +0,0 @@ -
-

-
- -
-

- e($task['title'])) ?> -

- -
- url->link(t('Yes'), 'task', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes', 'redirect' => $redirect), true, 'btn btn-red') ?> - - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?> -
-
\ No newline at end of file diff --git a/app/Template/task/description.php b/app/Template/task/description.php new file mode 100644 index 00000000..f823e7d6 --- /dev/null +++ b/app/Template/task/description.php @@ -0,0 +1,33 @@ + +
+
+

+
+ +
+ + text->markdown( + $task['description'], + array( + 'controller' => 'task', + 'action' => 'show', + 'params' => array( + 'project_id' => $task['project_id'] + ) + ) + ) ?> + + text->markdown( + $task['description'], + array( + 'controller' => 'task', + 'action' => 'readonly', + 'params' => array( + 'token' => $project['token'] + ) + ) + ) ?> + +
+
+ \ No newline at end of file diff --git a/app/Template/task/edit.php b/app/Template/task/edit.php deleted file mode 100644 index 359df779..00000000 --- a/app/Template/task/edit.php +++ /dev/null @@ -1,68 +0,0 @@ -
-

-
-
-
- - form->csrf() ?> - -
- - form->label(t('Title'), 'title') ?> - form->text('title', $values, $errors, array('autofocus', 'required', 'maxlength="200"', 'tabindex="1"')) ?>
- - form->label(t('Description'), 'description') ?> - -
-
- form->textarea('description', $values, $errors, array('placeholder="'.t('Leave a description').'"', 'tabindex="2"')) ?> -
-
-
-
-
    -
  • - -
    • -
  • - -
    • -
-
- -
- -
- -
- form->hidden('id', $values) ?> - form->hidden('project_id', $values) ?> - - form->label(t('Assignee'), 'owner_id') ?> - form->select('owner_id', $users_list, $values, $errors, array('tabindex="3"')) ?>
- - form->label(t('Category'), 'category_id') ?> - form->select('category_id', $categories_list, $values, $errors, array('tabindex="4"')) ?>
- - form->label(t('Color'), 'color_id') ?> - form->select('color_id', $colors_list, $values, $errors, array('tabindex="5"')) ?>
- - form->label(t('Complexity'), 'score') ?> - form->number('score', $values, $errors, array('tabindex="6"')) ?>
- - form->label(t('Due Date'), 'date_due') ?> - form->text('date_due', $values, $errors, array('placeholder="'.$this->text->in($date_format, $date_formats).'"', 'tabindex="7"'), 'form-date') ?>
-
-
- -
- - - - url->link(t('cancel'), 'board', 'show', array('project_id' => $task['project_id']), false, 'close-popover') ?> - - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> - -
-
-
diff --git a/app/Template/task/edit_description.php b/app/Template/task/edit_description.php deleted file mode 100644 index 99a547e1..00000000 --- a/app/Template/task/edit_description.php +++ /dev/null @@ -1,38 +0,0 @@ -
-

-
- -
- - form->csrf() ?> - form->hidden('id', $values) ?> - -
-
    -
  • - -
    • -
  • - -
    • -
-
- form->textarea('description', $values, $errors, array('autofocus', 'placeholder="'.t('Leave a description').'"'), 'task-show-description-textarea') ?> -
-
-
-
-
- -
- -
- - - - url->link(t('cancel'), 'board', 'show', array('project_id' => $task['project_id'])) ?> - - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> - -
-
diff --git a/app/Template/task/edit_recurrence.php b/app/Template/task/edit_recurrence.php deleted file mode 100644 index e7c4c8f8..00000000 --- a/app/Template/task/edit_recurrence.php +++ /dev/null @@ -1,47 +0,0 @@ -
-

-
- - -
- render('task/recurring_info', array( - 'task' => $task, - 'recurrence_trigger_list' => $recurrence_trigger_list, - 'recurrence_timeframe_list' => $recurrence_timeframe_list, - 'recurrence_basedate_list' => $recurrence_basedate_list, - )) ?> -
- - - - -
- - form->csrf() ?> - - form->hidden('id', $values) ?> - form->hidden('project_id', $values) ?> - - form->label(t('Generate recurrent task'), 'recurrence_status') ?> - form->select('recurrence_status', $recurrence_status_list, $values, $errors) ?> - - form->label(t('Trigger to generate recurrent task'), 'recurrence_trigger') ?> - form->select('recurrence_trigger', $recurrence_trigger_list, $values, $errors) ?> - - form->label(t('Factor to calculate new due date'), 'recurrence_factor') ?> - form->number('recurrence_factor', $values, $errors) ?> - - form->label(t('Timeframe to calculate new due date'), 'recurrence_timeframe') ?> - form->select('recurrence_timeframe', $recurrence_timeframe_list, $values, $errors) ?> - - form->label(t('Base date to calculate new due date'), 'recurrence_basedate') ?> - form->select('recurrence_basedate', $recurrence_basedate_list, $values, $errors) ?> - -
- - - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> -
-
- - \ No newline at end of file diff --git a/app/Template/task/new.php b/app/Template/task/new.php deleted file mode 100644 index 8fcdacdf..00000000 --- a/app/Template/task/new.php +++ /dev/null @@ -1,84 +0,0 @@ - -
- -
- -
-

-
- - -
-
- - form->csrf() ?> - -
- form->label(t('Title'), 'title') ?> - form->text('title', $values, $errors, array('autofocus', 'required', 'maxlength="200"', 'tabindex="1"'), 'form-input-large') ?>
- - form->label(t('Description'), 'description') ?> - -
-
- form->textarea('description', $values, $errors, array('placeholder="'.t('Leave a description').'"', 'tabindex="2"')) ?> -
-
-
-
-
    -
  • - -
    • -
  • - -
    • -
-
- -
- - - form->checkbox('another_task', t('Create another task'), 1, isset($values['another_task']) && $values['another_task'] == 1) ?> - -
- -
- form->hidden('project_id', $values) ?> - - form->label(t('Assignee'), 'owner_id') ?> - form->select('owner_id', $users_list, $values, $errors, array('tabindex="3"')) ?>
- - form->label(t('Category'), 'category_id') ?> - form->select('category_id', $categories_list, $values, $errors, array('tabindex="4"')) ?>
- - - form->label(t('Swimlane'), 'swimlane_id') ?> - form->select('swimlane_id', $swimlanes_list, $values, $errors, array('tabindex="5"')) ?>
- - - form->label(t('Column'), 'column_id') ?> - form->select('column_id', $columns_list, $values, $errors, array('tabindex="6"')) ?>
- - form->label(t('Color'), 'color_id') ?> - form->select('color_id', $colors_list, $values, $errors, array('tabindex="7"')) ?>
- - form->label(t('Complexity'), 'score') ?> - form->number('score', $values, $errors, array('tabindex="8"')) ?>
- - form->label(t('Original estimate'), 'time_estimated') ?> - form->numeric('time_estimated', $values, $errors, array('tabindex="9"')) ?>
- - form->label(t('Due Date'), 'date_due') ?> - form->text('date_due', $values, $errors, array('placeholder="'.$this->text->in($date_format, $date_formats).'"', 'tabindex="10"'), 'form-date') ?>
-
-
- -
- - url->link(t('cancel'), 'board', 'show', array('project_id' => $values['project_id']), false, 'close-popover') ?> -
-
-
diff --git a/app/Template/task/open.php b/app/Template/task/open.php deleted file mode 100644 index fbcc1111..00000000 --- a/app/Template/task/open.php +++ /dev/null @@ -1,15 +0,0 @@ -
-

-
- -
-

- e($task['title'])) ?> -

- -
- url->link(t('Yes'), 'task', 'open', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'confirmation' => 'yes'), true, 'btn btn-red') ?> - - url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> -
-
\ No newline at end of file diff --git a/app/Template/task/public.php b/app/Template/task/public.php index 73116de9..e3105488 100644 --- a/app/Template/task/public.php +++ b/app/Template/task/public.php @@ -4,7 +4,7 @@

url->link(t('Back to the board'), 'board', 'readonly', array('token' => $project['token'])) ?>

- render('task/show_description', array( + render('task/description', array( 'task' => $task, 'project' => $project, 'is_public' => true diff --git a/app/Template/task/show.php b/app/Template/task/show.php index a594d906..68d63c58 100644 --- a/app/Template/task/show.php +++ b/app/Template/task/show.php @@ -6,10 +6,10 @@ 'recurrence_basedate_list' => $this->task->recurrenceBasedates(), )) ?> -render('task/time', array('task' => $task, 'values' => $values, 'date_format' => $date_format, 'date_formats' => $date_formats)) ?> -render('task/show_description', array('task' => $task)) ?> +render('task_modification/edit_time', array('task' => $task, 'values' => $values, 'date_format' => $date_format, 'date_formats' => $date_formats)) ?> +render('task/description', array('task' => $task)) ?> render('tasklink/show', array('task' => $task, 'links' => $links, 'link_label_list' => $link_label_list)) ?> render('subtask/show', array('task' => $task, 'subtasks' => $subtasks, 'project' => $project, 'users_list' => isset($users_list) ? $users_list : array())) ?> -render('task/timesheet', array('task' => $task)) ?> +render('task/time_tracking_summary', array('task' => $task)) ?> render('file/show', array('task' => $task, 'files' => $files, 'images' => $images)) ?> render('task/comments', array('task' => $task, 'comments' => $comments, 'project' => $project)) ?> diff --git a/app/Template/task/show_description.php b/app/Template/task/show_description.php deleted file mode 100644 index f823e7d6..00000000 --- a/app/Template/task/show_description.php +++ /dev/null @@ -1,33 +0,0 @@ - -
-
-

-
- -
- - text->markdown( - $task['description'], - array( - 'controller' => 'task', - 'action' => 'show', - 'params' => array( - 'project_id' => $task['project_id'] - ) - ) - ) ?> - - text->markdown( - $task['description'], - array( - 'controller' => 'task', - 'action' => 'readonly', - 'params' => array( - 'token' => $project['token'] - ) - ) - ) ?> - -
-
- \ No newline at end of file diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php index 942e7d01..1116040a 100644 --- a/app/Template/task/sidebar.php +++ b/app/Template/task/sidebar.php @@ -15,20 +15,20 @@ 0 || $task['time_spent'] > 0): ?>
  • - url->link(t('Time tracking'), 'task', 'timesheet', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + url->link(t('Time tracking'), 'task', 'timetracking', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>