Improve iCalendar feed to include tasks with start/end date and due date with a time

This commit is contained in:
Frederic Guillot
2017-11-08 14:50:02 -08:00
parent 5e98a66aeb
commit cafbd1f5a7
12 changed files with 101 additions and 144 deletions

View File

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