diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/Controller/Taskmodification.php | 22 | ||||
| -rw-r--r-- | app/Helper/Task.php | 2 | ||||
| -rw-r--r-- | app/Template/task/menu.php | 6 | ||||
| -rw-r--r-- | app/Template/task/show.php | 7 | ||||
| -rw-r--r-- | app/Template/task_modification/edit_task.php | 1 | ||||
| -rw-r--r-- | app/Template/task_modification/edit_time.php | 20 |
6 files changed, 9 insertions, 49 deletions
diff --git a/app/Controller/Taskmodification.php b/app/Controller/Taskmodification.php index 0e9316b2..54b4b23a 100644 --- a/app/Controller/Taskmodification.php +++ b/app/Controller/Taskmodification.php @@ -23,27 +23,6 @@ class Taskmodification extends Base } /** - * 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->flash->success(t('Task updated successfully.')); - } else { - $this->flash->failure(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 @@ -104,6 +83,7 @@ class Taskmodification extends Base } $this->dateParser->format($values, array('date_due')); + $this->dateParser->format($values, array('date_started'), 'Y-m-d H:i'); $this->response->html($this->helper->layout->task('task_modification/edit_task', array( 'project' => $project, diff --git a/app/Helper/Task.php b/app/Helper/Task.php index 1cb36b86..0ef3da2c 100644 --- a/app/Helper/Task.php +++ b/app/Helper/Task.php @@ -146,7 +146,7 @@ class Task extends Base $attributes = array_merge(array('tabindex="11"', 'placeholder="'.$placeholder.'"'), $attributes); $html = $this->helper->form->label(t('Start Date'), 'date_started'); - $html .= $this->helper->form->text('date_started', $values, $errors, $attributes, 'form-date'); + $html .= $this->helper->form->text('date_started', $values, $errors, $attributes, 'form-datetime'); return $html; } diff --git a/app/Template/task/menu.php b/app/Template/task/menu.php index 426cfb3d..20fca22b 100644 --- a/app/Template/task/menu.php +++ b/app/Template/task/menu.php @@ -2,6 +2,12 @@ <div class="dropdown"> <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Actions') ?></a> <ul> + <?php if (empty($task['date_started'])): ?> + <li> + <i class="fa fa-play fa-fw"></i> + <?= $this->url->link(t('Set automatically the start date'), 'taskmodification', 'start', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + </li> + <?php endif ?> <li> <i class="fa fa-pencil-square-o fa-fw"></i> <?= $this->url->link(t('Edit the task'), 'taskmodification', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?> diff --git a/app/Template/task/show.php b/app/Template/task/show.php index e18b47fc..277c99c0 100644 --- a/app/Template/task/show.php +++ b/app/Template/task/show.php @@ -1,16 +1,9 @@ <?= $this->render('task/details', array( 'task' => $task, 'project' => $project, - 'recurrence_trigger_list' => $this->task->recurrenceTriggers(), - 'recurrence_timeframe_list' => $this->task->recurrenceTimeframes(), - 'recurrence_basedate_list' => $this->task->recurrenceBasedates(), 'editable' => $this->user->hasProjectAccess('taskmodification', 'edit', $project['id']), )) ?> -<?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $project['id'])): ?> - <?= $this->render('task_modification/edit_time', array('task' => $task, 'values' => $values, 'date_format' => $date_format, 'date_formats' => $date_formats)) ?> -<?php endif ?> - <?= $this->render('task/description', array('task' => $task)) ?> <?= $this->render('subtask/show', array( diff --git a/app/Template/task_modification/edit_task.php b/app/Template/task_modification/edit_task.php index 7365648b..9e98ad5e 100644 --- a/app/Template/task_modification/edit_task.php +++ b/app/Template/task_modification/edit_task.php @@ -19,6 +19,7 @@ <div class="form-column"> <?= $this->task->selectTimeEstimated($values, $errors) ?> <?= $this->task->selectTimeSpent($values, $errors) ?> + <?= $this->task->selectStartDate($values, $errors) ?> <?= $this->task->selectDueDate($values, $errors) ?> </div> diff --git a/app/Template/task_modification/edit_time.php b/app/Template/task_modification/edit_time.php deleted file mode 100644 index 8e7f9b42..00000000 --- a/app/Template/task_modification/edit_time.php +++ /dev/null @@ -1,20 +0,0 @@ -<form method="post" action="<?= $this->url->href('taskmodification', 'time', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" class="form-inline task-time-form" autocomplete="off"> - - <?php if (empty($values['date_started'])): ?> - <?= $this->url->link('<i class="fa fa-play"></i>', 'taskmodification', 'start', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-show-start-link', t('Set automatically the start date')) ?> - <?php endif ?> - - <?= $this->form->csrf() ?> - <?= $this->form->hidden('id', $values) ?> - - <?= $this->form->label(t('Start date'), 'date_started') ?> - <?= $this->form->text('date_started', $values, array(), array('placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-datetime') ?> - - <?= $this->form->label(t('Time estimated'), 'time_estimated') ?> - <?= $this->form->numeric('time_estimated', $values, array(), array('placeholder="'.t('hours').'"')) ?> - - <?= $this->form->label(t('Time spent'), 'time_spent') ?> - <?= $this->form->numeric('time_spent', $values, array(), array('placeholder="'.t('hours').'"')) ?> - - <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/> -</form>
\ No newline at end of file |