From cafbd1f5a7e60d931e4dbd700b12e5f50319340d Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Wed, 8 Nov 2017 14:50:02 -0800 Subject: Improve iCalendar feed to include tasks with start/end date and due date with a time --- app/Filter/TaskDueDateRangeFilter.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'app/Filter/TaskDueDateRangeFilter.php') diff --git a/app/Filter/TaskDueDateRangeFilter.php b/app/Filter/TaskDueDateRangeFilter.php index a6aefbe2..a4250f80 100644 --- a/app/Filter/TaskDueDateRangeFilter.php +++ b/app/Filter/TaskDueDateRangeFilter.php @@ -32,6 +32,11 @@ class TaskDueDateRangeFilter extends BaseFilter implements FilterInterface */ public function apply() { + $this->query->beginOr(); + $this->query->isNull(TaskModel::TABLE.'.date_started'); + $this->query->eq(TaskModel::TABLE.'.date_started', 0); + $this->query->closeOr(); + $this->query->gte(TaskModel::TABLE.'.date_due', is_numeric($this->value[0]) ? $this->value[0] : strtotime($this->value[0])); $this->query->lte(TaskModel::TABLE.'.date_due', is_numeric($this->value[1]) ? $this->value[1] : strtotime($this->value[1])); return $this; -- cgit v1.2.3