From 7af5a923b047f612c02af2fe39a09beb45792f3a Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sun, 28 Jun 2015 18:57:25 -0400 Subject: Improve date due filter --- app/Model/TaskFilter.php | 2 ++ tests/units/TaskFilterTest.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/Model/TaskFilter.php b/app/Model/TaskFilter.php index 4f306b14..c47b059f 100644 --- a/app/Model/TaskFilter.php +++ b/app/Model/TaskFilter.php @@ -321,6 +321,8 @@ class TaskFilter extends Base */ public function filterByDueDate($date) { + $this->query->neq('date_due', 0); + $this->query->notNull('date_due'); return $this->filterWithOperator('date_due', $date, true); } diff --git a/tests/units/TaskFilterTest.php b/tests/units/TaskFilterTest.php index e509371c..4e2366e5 100644 --- a/tests/units/TaskFilterTest.php +++ b/tests/units/TaskFilterTest.php @@ -38,6 +38,8 @@ class TaskFilterTest extends Base $this->assertNotFalse($tc->create(array('project_id' => 1, 'title' => 'my task title is amazing', 'date_due' => $dp->getTimestampFromIsoFormat('+1 day')))); $this->assertNotFalse($tc->create(array('project_id' => 1, 'title' => 'Bob at work', 'date_due' => $dp->getTimestampFromIsoFormat('-1 day')))); $this->assertNotFalse($tc->create(array('project_id' => 1, 'title' => 'youpi', 'date_due' => $dp->getTimestampFromIsoFormat(time())))); + $this->assertNotFalse($tc->create(array('project_id' => 1, 'title' => 'no due date'))); + $this->assertNotFalse($tc->create(array('project_id' => 1, 'title' => 'due date at 0', 'date_due' => 0))); $tf->search('due:>'.date('Y-m-d')); $tasks = $tf->findAll(); -- cgit v1.2.3