AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change Due Date to Due Timestamp fixes #919 (#3249)

Browse Source
This commit is contained in:
Oliver Buchmann
2017-05-10 22:42:34 +02:00
committed by Frédéric Guillot
parent 136936ae3d
commit daf39ee16a
19 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/TaskOverdueNotificationCommand.php
View File

@@ -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'],

2
app/Helper/TaskHelper.php
View File

@@ -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)

2
app/Import/TaskImport.php
View File

@@ -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(

2
app/Model/TaskCreationModel.php
View File

@@ -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'));

2
app/Model/TaskModificationModel.php
View File

@@ -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'));

2
app/Template/board/task_footer.php
View File

@@ -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>

2
app/Template/notification/task_create.php
View File

@@ -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'])): ?>

2
app/Template/notification/task_overdue.php
View File

@@ -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'])): ?>

2
app/Template/project_user_overview/tasks.php
View File

@@ -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 ?>

2
app/Template/task/changes.php
View File

@@ -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':

2
app/Template/task/details.php
View File

@@ -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']): ?>

2
app/Template/task_list/task_icons.php
View File

@@ -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 ?>

2
app/Template/task_mail/email.php
View File

@@ -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'])): ?>