diff --git a/app/Console/TaskOverdueNotificationCommand.php b/app/Console/TaskOverdueNotificationCommand.php index 362766151..107ecc053 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 334f4f336..f3084759a 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 f5ca9b0e7..cabf6b0c6 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 95f62ee5d..dbec2b12a 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 0ae292938..b10c0aa97 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 1ad1c9f13..8829204a1 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 6e80b26a4..e56c252d6 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 01ad0a01f..2ad4c14d0 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 8d6821701..1e01a43f8 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 2c2bf2678..6aa3d49be 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 24099a3c9..a42e09d1d 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 6897c2607..9545b1e1f 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 70db572ee..ee85b1d1c 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']) ?>
    • diff --git a/tests/integration/OverdueTaskProcedureTest.php b/tests/integration/OverdueTaskProcedureTest.php index 65f52301a..0e31afa05 100644 --- a/tests/integration/OverdueTaskProcedureTest.php +++ b/tests/integration/OverdueTaskProcedureTest.php @@ -19,7 +19,7 @@ class OverdueTaskProcedureTest extends BaseProcedureTest $this->assertNotFalse($this->app->createTask(array( 'title' => 'overdue task', 'project_id' => $this->projectId, - 'date_due' => date('Y-m-d', strtotime('-2days')), + 'date_due' => date('Y-m-d H:i', strtotime('-2days')), ))); } diff --git a/tests/units/Action/TaskAssignDueDateOnCreationTest.php b/tests/units/Action/TaskAssignDueDateOnCreationTest.php index 26c0584ec..64625d2c9 100644 --- a/tests/units/Action/TaskAssignDueDateOnCreationTest.php +++ b/tests/units/Action/TaskAssignDueDateOnCreationTest.php @@ -32,6 +32,6 @@ class TaskAssignDueDateOnCreationTest extends Base $task = $taskFinderModel->getById(1); $this->assertNotEmpty($task); - $this->assertEquals(date('Y-m-d', strtotime('+4days')), date('Y-m-d', $task['date_due'])); + $this->assertEquals(date('Y-m-d H:i', strtotime('+4days')), date('Y-m-d H:i', $task['date_due'])); } } diff --git a/tests/units/Export/TaskExportTest.php b/tests/units/Export/TaskExportTest.php index e8b347ace..8e0be4333 100644 --- a/tests/units/Export/TaskExportTest.php +++ b/tests/units/Export/TaskExportTest.php @@ -70,7 +70,7 @@ class TaskExportTest extends Base $this->assertEquals('Yellow', $report[2][8]); $this->assertEquals('', $report[1][9]); - $this->assertEquals(date('m/d/Y').' 00:00', $report[2][9]); + $this->assertEquals(date('m/d/Y H:i'), $report[2][9]); $this->assertEquals(3, $report[1][21]); $this->assertEquals(0, $report[2][21]); diff --git a/tests/units/Model/TaskCreationModelTest.php b/tests/units/Model/TaskCreationModelTest.php index ce9996d9e..7723bece4 100644 --- a/tests/units/Model/TaskCreationModelTest.php +++ b/tests/units/Model/TaskCreationModelTest.php @@ -248,7 +248,7 @@ class TaskCreationModelTest extends Base public function testDateDue() { - $date = '2014-11-23'; + $date = '2014-11-23 14:30'; $timestamp = strtotime('+2days'); $projectModel = new ProjectModel($this->container); $taskCreationModel = new TaskCreationModel($this->container); @@ -262,12 +262,12 @@ class TaskCreationModelTest extends Base $task = $taskFinderModel->getById(1); $this->assertNotEmpty($task); $this->assertEquals(1, $task['id']); - $this->assertEquals($date, date('Y-m-d', $task['date_due'])); + $this->assertEquals($date, date('Y-m-d H:i', $task['date_due'])); $task = $taskFinderModel->getById(2); $this->assertNotEmpty($task); $this->assertEquals(2, $task['id']); - $this->assertEquals(date('Y-m-d 00:00', $timestamp), date('Y-m-d 00:00', $task['date_due'])); + $this->assertEquals(date('Y-m-d H:i', $timestamp), date('Y-m-d H:i', $task['date_due'])); $task = $taskFinderModel->getById(3); $this->assertEquals(3, $task['id']); @@ -398,6 +398,6 @@ class TaskCreationModelTest extends Base $task = $taskFinderModel->getById(1); $this->assertNotEmpty($task); - $this->assertEquals('2050-01-10 00:00', date('Y-m-d H:i', $task['date_due'])); + $this->assertEquals('2050-01-10 12:30', date('Y-m-d H:i', $task['date_due'])); } } diff --git a/tests/units/Model/TaskModificationModelTest.php b/tests/units/Model/TaskModificationModelTest.php index f70561b35..a716cf3d9 100644 --- a/tests/units/Model/TaskModificationModelTest.php +++ b/tests/units/Model/TaskModificationModelTest.php @@ -195,15 +195,15 @@ class TaskModificationModelTest extends Base $task = $taskFinderModel->getById(1); $this->assertEquals(0, $task['date_due']); - $this->assertTrue($taskModificationModel->update(array('id' => 1, 'date_due' => '2014-11-24'))); + $this->assertTrue($taskModificationModel->update(array('id' => 1, 'date_due' => '2014-11-24 14:30'))); $task = $taskFinderModel->getById(1); - $this->assertEquals('2014-11-24', date('Y-m-d', $task['date_due'])); + $this->assertEquals('2014-11-24 14:30', date('Y-m-d H:i', $task['date_due'])); $this->assertTrue($taskModificationModel->update(array('id' => 1, 'date_due' => time()))); $task = $taskFinderModel->getById(1); - $this->assertEquals(date('Y-m-d'), date('Y-m-d', $task['date_due'])); + $this->assertEquals(date('Y-m-d H:i'), date('Y-m-d H:i', $task['date_due'])); } public function testChangeStartedDate() diff --git a/tests/units/Model/TaskRecurrenceModelTest.php b/tests/units/Model/TaskRecurrenceModelTest.php index 85d77bc20..56f6cf84b 100644 --- a/tests/units/Model/TaskRecurrenceModelTest.php +++ b/tests/units/Model/TaskRecurrenceModelTest.php @@ -106,7 +106,7 @@ class TaskRecurrenceModelTest extends Base $this->assertNotEmpty($task); $this->assertEquals(TaskModel::RECURRING_STATUS_PROCESSED, $task['recurrence_status']); $this->assertEquals(2, $task['recurrence_child']); - $this->assertEquals(1436486400, $task['date_due'], '', 2); + $this->assertEquals(1436561776, $task['date_due'], '', 2); $task = $taskFinderModel->getById(2); $this->assertNotEmpty($task); @@ -116,7 +116,7 @@ class TaskRecurrenceModelTest extends Base $this->assertEquals(TaskModel::RECURRING_BASEDATE_TRIGGERDATE, $task['recurrence_basedate']); $this->assertEquals(1, $task['recurrence_parent']); $this->assertEquals(2, $task['recurrence_factor']); - $this->assertEquals($dateParser->removeTimeFromTimestamp(strtotime('+2 days')), $task['date_due'], '', 2); + $this->assertEquals(strtotime('+2 days'), $task['date_due'], '', 2); $tags = $taskTagModel->getList(2); $this->assertCount(2, $tags);