summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/Console/TaskOverdueNotificationCommand.php2
-rw-r--r--app/Helper/TaskHelper.php2
-rw-r--r--app/Import/TaskImport.php2
-rw-r--r--app/Model/TaskCreationModel.php2
-rw-r--r--app/Model/TaskModificationModel.php2
-rw-r--r--app/Template/board/task_footer.php2
-rw-r--r--app/Template/notification/task_create.php2
-rw-r--r--app/Template/notification/task_overdue.php2
-rw-r--r--app/Template/project_user_overview/tasks.php2
-rw-r--r--app/Template/task/changes.php2
-rw-r--r--app/Template/task/details.php2
-rw-r--r--app/Template/task_list/task_icons.php2
-rw-r--r--app/Template/task_mail/email.php2
13 files changed, 13 insertions, 13 deletions
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 @@
<?php endif ?>
">
<i class="fa fa-calendar"></i>
- <?= $this->dt->date($task['date_due']) ?>
+ <?= $this->dt->datetime($task['date_due']) ?>
</span>
<?php endif ?>
</div>
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 @@
</li>
<?php if ($task['date_due']): ?>
<li>
- <strong><?= t('Due date:').' '.$this->dt->date($task['date_due']) ?></strong>
+ <strong><?= t('Due date:').' '.$this->dt->datetime($task['date_due']) ?></strong>
</li>
<?php endif ?>
<?php if (! empty($task['creator_username'])): ?>
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 @@
<?= $this->text->e($task['title']) ?>
<?php endif ?>
</td>
- <td style="border: 1px solid #eee;"><?= $this->dt->date($task['date_due']) ?></td>
+ <td style="border: 1px solid #eee;"><?= $this->dt->datetime($task['date_due']) ?></td>
<td style="border: 1px solid #eee;"><?= $this->text->e($task['project_name']) ?></td>
<td style="border: 1px solid #eee;">
<?php if (! empty($task['assignee_username'])): ?>
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 @@
<?= $this->dt->date($task['date_started']) ?>
</td>
<td>
- <?= $this->dt->date($task['date_due']) ?>
+ <?= $this->dt->datetime($task['date_due']) ?>
</td>
</tr>
<?php endforeach ?>
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 '<li>'.t('The due date have been removed').'</li>';
} else {
- echo '<li>'.t('New due date: ').$this->dt->date($task['date_due']).'</li>';
+ echo '<li>'.t('New due date: ').$this->dt->datetime($task['date_due']).'</li>';
}
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 @@
<?php if ($task['date_due']): ?>
<li>
<strong><?= t('Due date:') ?></strong>
- <span><?= $this->dt->date($task['date_due']) ?></span>
+ <span><?= $this->dt->datetime($task['date_due']) ?></span>
</li>
<?php endif ?>
<?php if ($task['time_estimated']): ?>
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 @@
<?php endif ?>
">
<i class="fa fa-calendar"></i>
- <?= $this->dt->date($task['date_due']) ?>
+ <?= $this->dt->datetime($task['date_due']) ?>
</span>
<?php endif ?>
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 @@
</li>
<?php if ($task['date_due']): ?>
<li>
- <strong><?= t('Due date:').' '.$this->dt->date($task['date_due']) ?></strong>
+ <strong><?= t('Due date:').' '.$this->dt->datetime($task['date_due']) ?></strong>
</li>
<?php endif ?>
<?php if (! empty($task['creator_username'])): ?>
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-26 17:00:48 +0000