From daf39ee16aa15572b92f96bd7cc3705305a50b9d Mon Sep 17 00:00:00 2001 From: Oliver Buchmann Date: Wed, 10 May 2017 22:42:34 +0200 Subject: Change Due Date to Due Timestamp fixes #919 (#3249) --- app/Console/TaskOverdueNotificationCommand.php | 2 +- app/Helper/TaskHelper.php | 2 +- app/Import/TaskImport.php | 2 +- app/Model/TaskCreationModel.php | 2 +- app/Model/TaskModificationModel.php | 2 +- app/Template/board/task_footer.php | 2 +- app/Template/notification/task_create.php | 2 +- app/Template/notification/task_overdue.php | 2 +- app/Template/project_user_overview/tasks.php | 2 +- app/Template/task/changes.php | 2 +- app/Template/task/details.php | 2 +- app/Template/task_list/task_icons.php | 2 +- app/Template/task_mail/email.php | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) (limited to 'app') diff --git a/app/Console/TaskOverdueNotificationCommand.php b/app/Console/TaskOverdueNotificationCommand.php index 36276615..107ecc05 100644 --- a/app/Console/TaskOverdueNotificationCommand.php +++ b/app/Console/TaskOverdueNotificationCommand.php @@ -44,7 +44,7 @@ class TaskOverdueNotificationCommand extends BaseCommand $rows[] = array( $task['id'], $task['title'], - date('Y-m-d', $task['date_due']), + date('Y-m-d H:i', $task['date_due']), $task['project_id'], $task['project_name'], $task['assignee_name'] ?: $task['assignee_username'], diff --git a/app/Helper/TaskHelper.php b/app/Helper/TaskHelper.php index 334f4f33..f3084759 100644 --- a/app/Helper/TaskHelper.php +++ b/app/Helper/TaskHelper.php @@ -208,7 +208,7 @@ class TaskHelper extends Base public function renderDueDateField(array $values, array $errors = array(), array $attributes = array()) { $attributes = array_merge(array('tabindex="9"'), $attributes); - return $this->helper->form->date(t('Due Date'), 'date_due', $values, $errors, $attributes); + return $this->helper->form->datetime(t('Due Date'), 'date_due', $values, $errors, $attributes); } public function renderPriority($priority) diff --git a/app/Import/TaskImport.php b/app/Import/TaskImport.php index f5ca9b0e..cabf6b0c 100644 --- a/app/Import/TaskImport.php +++ b/app/Import/TaskImport.php @@ -124,7 +124,7 @@ class TaskImport extends Base } if (! empty($row['date_due'])) { - $values['date_due'] = $this->dateParser->getTimestampFromIsoFormat($row['date_due']); + $values['date_due'] = $this->dateParser->getTimestamp($row['date_due']); } $this->helper->model->removeEmptyFields( diff --git a/app/Model/TaskCreationModel.php b/app/Model/TaskCreationModel.php index 95f62ee5..dbec2b12 100644 --- a/app/Model/TaskCreationModel.php +++ b/app/Model/TaskCreationModel.php @@ -58,7 +58,7 @@ class TaskCreationModel extends Base */ protected function prepare(array &$values) { - $values = $this->dateParser->convert($values, array('date_due')); + $values = $this->dateParser->convert($values, array('date_due'), true); $values = $this->dateParser->convert($values, array('date_started'), true); $this->helper->model->removeFields($values, array('another_task', 'duplicate_multiple_projects')); diff --git a/app/Model/TaskModificationModel.php b/app/Model/TaskModificationModel.php index 0ae29293..b10c0aa9 100644 --- a/app/Model/TaskModificationModel.php +++ b/app/Model/TaskModificationModel.php @@ -98,7 +98,7 @@ class TaskModificationModel extends Base */ protected function prepare(array &$values) { - $values = $this->dateParser->convert($values, array('date_due')); + $values = $this->dateParser->convert($values, array('date_due'), true); $values = $this->dateParser->convert($values, array('date_started'), true); $this->helper->model->removeFields($values, array('id')); diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php index 1ad1c9f1..8829204a 100644 --- a/app/Template/board/task_footer.php +++ b/app/Template/board/task_footer.php @@ -65,7 +65,7 @@ "> - dt->date($task['date_due']) ?> + dt->datetime($task['date_due']) ?> diff --git a/app/Template/notification/task_create.php b/app/Template/notification/task_create.php index 6e80b26a..e56c252d 100644 --- a/app/Template/notification/task_create.php +++ b/app/Template/notification/task_create.php @@ -6,7 +6,7 @@
  • - dt->date($task['date_due']) ?> + dt->datetime($task['date_due']) ?>
    • diff --git a/app/Template/notification/task_overdue.php b/app/Template/notification/task_overdue.php index 01ad0a01..2ad4c14d 100644 --- a/app/Template/notification/task_overdue.php +++ b/app/Template/notification/task_overdue.php @@ -19,7 +19,7 @@ text->e($task['title']) ?> - dt->date($task['date_due']) ?> + dt->datetime($task['date_due']) ?> text->e($task['project_name']) ?> diff --git a/app/Template/project_user_overview/tasks.php b/app/Template/project_user_overview/tasks.php index 8d682170..1e01a43f 100644 --- a/app/Template/project_user_overview/tasks.php +++ b/app/Template/project_user_overview/tasks.php @@ -36,7 +36,7 @@ dt->date($task['date_started']) ?> - dt->date($task['date_due']) ?> + dt->datetime($task['date_due']) ?> diff --git a/app/Template/task/changes.php b/app/Template/task/changes.php index 2c2bf267..6aa3d49b 100644 --- a/app/Template/task/changes.php +++ b/app/Template/task/changes.php @@ -31,7 +31,7 @@ if (empty($task['date_due'])) { echo '
  • '.t('The due date have been removed').'
    • '; } else { - echo '
  • '.t('New due date: ').$this->dt->date($task['date_due']).'
    • '; + echo '
  • '.t('New due date: ').$this->dt->datetime($task['date_due']).'
    • '; } break; case 'description': diff --git a/app/Template/task/details.php b/app/Template/task/details.php index 24099a3c..a42e09d1 100644 --- a/app/Template/task/details.php +++ b/app/Template/task/details.php @@ -95,7 +95,7 @@
  • - dt->date($task['date_due']) ?> + dt->datetime($task['date_due']) ?>
    • diff --git a/app/Template/task_list/task_icons.php b/app/Template/task_list/task_icons.php index 6897c260..9545b1e1 100644 --- a/app/Template/task_list/task_icons.php +++ b/app/Template/task_list/task_icons.php @@ -39,7 +39,7 @@ "> - dt->date($task['date_due']) ?> + dt->datetime($task['date_due']) ?> diff --git a/app/Template/task_mail/email.php b/app/Template/task_mail/email.php index 70db572e..ee85b1d1 100644 --- a/app/Template/task_mail/email.php +++ b/app/Template/task_mail/email.php @@ -9,7 +9,7 @@
  • - dt->date($task['date_due']) ?> + dt->datetime($task['date_due']) ?>
    • -- cgit v1.2.3