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

Fix bug: overdue tasks email notification

This commit is contained in:
Frédéric Guillot 2014-09-18 15:56:43 +02:00
parent c343a74743
commit 7e6d35f829
4 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Model/Task.php
View File

@ -69,7 +69,7 @@ class Task extends Base
* @access public
* @return array
*/
public function getTasksDue()
public function getOverdueTasks()
{
$tasks = $this->db->table(self::TABLE)
->columns(
@ -85,7 +85,7 @@ class Task extends Base
->join(User::TABLE, 'id', 'owner_id')
->eq(Project::TABLE.'.is_active', 1)
->eq(self::TABLE.'.is_active', 1)
->neq(self::TABLE.'.date_due', '')
->neq(self::TABLE.'.date_due', 0)
->lte(self::TABLE.'.date_due', mktime(23, 59, 59))
->findAll();

8
app/Templates/notification_task_due.php
View File

@ -2,7 +2,13 @@
<ul>
<?php foreach ($tasks as $task): ?>
<li>(<strong>#<?= $task['id'] ?></strong>) <?= Helper\escape($task['title']) ?> (<strong><?= t('Assigned to %s', $task['assignee_name'] ?: $task['assignee_username']) ?></strong>)</li>
<li>
(<strong>#<?= $task['id'] ?></strong>)
<?= Helper\escape($task['title']) ?>
<?php if ($task['assignee_username']): ?>
(<strong><?= t('Assigned to %s', $task['assignee_name'] ?: $task['assignee_username']) ?></strong>)
<?php endif ?>
</li>
<?php endforeach ?>
</ul>

2
kanboard
View File

@ -53,7 +53,7 @@ $cli->register('send-notifications-due-tasks', function() use ($cli, $registry)
$notificationModel = new Notification($registry);
$taskModel = new Task($registry);
$tasks = $taskModel->getTasksDue();
$tasks = $taskModel->getOverdueTasks();
// Group tasks by project
$projects = array();

20
tests/units/TaskTest.php
View File

@ -24,6 +24,7 @@ class TaskTest extends Base
$this->assertEquals('yellow', $task['color_id']);
$this->assertEquals(time(), $task['date_creation']);
$this->assertEquals(time(), $task['date_modification']);
$this->assertEquals(0, $task['date_due']);
$this->assertEquals(2, $t->create(array('title' => 'Task #2', 'project_id' => 1)));
@ -33,6 +34,7 @@ class TaskTest extends Base
$this->assertEquals(2, $task['position']);
$this->assertEquals(time(), $task['date_creation']);
$this->assertEquals(time(), $task['date_modification']);
$this->assertEquals(0, $task['date_due']);
$tasks = $t->getAll(1, 1);
$this->assertNotEmpty($tasks);
@ -56,6 +58,24 @@ class TaskTest extends Base
$this->assertFalse($t->remove(1234));
}
public function testGetOverdueTasks()
{
$t = new Task($this->registry);
$p = new Project($this->registry);
$this->assertEquals(1, $p->create(array('name' => 'Project #1')));
$this->assertEquals(1, $t->create(array('title' => 'Task #1', 'project_id' => 1, 'date_due' => strtotime('-1 day'))));
$this->assertEquals(2, $t->create(array('title' => 'Task #2', 'project_id' => 1, 'date_due' => strtotime('+1 day'))));
$this->assertEquals(3, $t->create(array('title' => 'Task #3', 'project_id' => 1, 'date_due' => 0)));
$this->assertEquals(4, $t->create(array('title' => 'Task #3', 'project_id' => 1)));
$tasks = $t->getOverdueTasks();
$this->assertNotEmpty($tasks);
$this->assertTrue(is_array($tasks));
$this->assertEquals(1, count($tasks));
$this->assertEquals('Task #1', $tasks[0]['title']);
}
public function testMoveTaskWithColumnThatNotChange()
{
$t = new Task($this->registry);