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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Filter/BaseFilter.php
View File

@@ -51,7 +51,7 @@ abstract class BaseFilter
*
* @access public
* @param Table $query
* @return \Kanboard\Core\Filter\FilterInterface
* @return $this
*/
public function withQuery(Table $query)
{
@@ -64,7 +64,7 @@ abstract class BaseFilter
*
* @access public
* @param string $value
* @return \Kanboard\Core\Filter\FilterInterface
* @return $this
*/
public function withValue($value)
{

5
app/Filter/TaskDueDateRangeFilter.php
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;