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)

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

2
tests/integration/OverdueTaskProcedureTest.php
View File

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

2
tests/units/Action/TaskAssignDueDateOnCreationTest.php
View File

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

2
tests/units/Export/TaskExportTest.php
View File

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

8
tests/units/Model/TaskCreationModelTest.php
View File

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

6
tests/units/Model/TaskModificationModelTest.php
View File

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

4
tests/units/Model/TaskRecurrenceModelTest.php
View File

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