Add search within a range of dates for creation/moved date fields
This commit is contained in:
54
app/Filter/BaseDateRangeFilter.php
Normal file
54
app/Filter/BaseDateRangeFilter.php
Normal file
@@ -0,0 +1,54 @@
|
||||
<?php
|
||||
|
||||
namespace Kanboard\Filter;
|
||||
|
||||
use Kanboard\Core\DateParser;
|
||||
|
||||
/**
|
||||
* Base date filter class
|
||||
*
|
||||
* @package filter
|
||||
* @author Kamil Ściana
|
||||
*/
|
||||
abstract class BaseDateRangeFilter extends BaseFilter
|
||||
{
|
||||
/**
|
||||
* DateParser object
|
||||
*
|
||||
* @access protected
|
||||
* @var DateParser
|
||||
*/
|
||||
protected $dateParser;
|
||||
|
||||
/**
|
||||
* Set DateParser object
|
||||
*
|
||||
* @access public
|
||||
* @param DateParser $dateParser
|
||||
* @return $this
|
||||
*/
|
||||
public function setDateParser(DateParser $dateParser)
|
||||
{
|
||||
$this->dateParser = $dateParser;
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Apply a date filter
|
||||
*
|
||||
* @access protected
|
||||
* @param string $field
|
||||
*/
|
||||
protected function applyDateFilter($field)
|
||||
{
|
||||
$dates = explode('..', $this->value);
|
||||
|
||||
if(count($dates)=== 2){
|
||||
$timestampFrom = $this->dateParser->getTimestamp($dates[0]);
|
||||
$timestampTo = $this->dateParser->getTimestamp($dates[1]);
|
||||
|
||||
$this->query->gte($field, $timestampFrom);
|
||||
$this->query->lte($field, $timestampTo + 86399);
|
||||
}
|
||||
}
|
||||
}
|
||||
38
app/Filter/TaskCreationDateRangeFilter.php
Normal file
38
app/Filter/TaskCreationDateRangeFilter.php
Normal file
@@ -0,0 +1,38 @@
|
||||
<?php
|
||||
|
||||
namespace Kanboard\Filter;
|
||||
|
||||
use Kanboard\Core\Filter\FilterInterface;
|
||||
use Kanboard\Model\TaskModel;
|
||||
|
||||
/**
|
||||
* Filter tasks by creation date
|
||||
*
|
||||
* @package filter
|
||||
* @author Kamil Ściana
|
||||
*/
|
||||
class TaskCreationDateRangeFilter extends BaseDateRangeFilter implements FilterInterface
|
||||
{
|
||||
/**
|
||||
* Get search attribute
|
||||
*
|
||||
* @access public
|
||||
* @return string[]
|
||||
*/
|
||||
public function getAttributes()
|
||||
{
|
||||
return array('createdRange');
|
||||
}
|
||||
|
||||
/**
|
||||
* Apply filter
|
||||
*
|
||||
* @access public
|
||||
* @return FilterInterface
|
||||
*/
|
||||
public function apply()
|
||||
{
|
||||
$this->applyDateFilter(TaskModel::TABLE.'.date_creation');
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
38
app/Filter/TaskMovedDateRangeFilter.php
Normal file
38
app/Filter/TaskMovedDateRangeFilter.php
Normal file
@@ -0,0 +1,38 @@
|
||||
<?php
|
||||
|
||||
namespace Kanboard\Filter;
|
||||
|
||||
use Kanboard\Core\Filter\FilterInterface;
|
||||
use Kanboard\Model\TaskModel;
|
||||
|
||||
/**
|
||||
* Filter tasks by creation date
|
||||
*
|
||||
* @package filter
|
||||
* @author Kamil Ściana
|
||||
*/
|
||||
class TaskMovedDateRangeFilter extends BaseDateRangeFilter implements FilterInterface
|
||||
{
|
||||
/**
|
||||
* Get search attribute
|
||||
*
|
||||
* @access public
|
||||
* @return string[]
|
||||
*/
|
||||
public function getAttributes()
|
||||
{
|
||||
return array('movedRange');
|
||||
}
|
||||
|
||||
/**
|
||||
* Apply filter
|
||||
*
|
||||
* @access public
|
||||
* @return FilterInterface
|
||||
*/
|
||||
public function apply()
|
||||
{
|
||||
$this->applyDateFilter(TaskModel::TABLE.'.date_moved');
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
@@ -16,6 +16,7 @@ use Kanboard\Filter\TaskColumnFilter;
|
||||
use Kanboard\Filter\TaskCommentFilter;
|
||||
use Kanboard\Filter\TaskCompletionDateFilter;
|
||||
use Kanboard\Filter\TaskCreationDateFilter;
|
||||
use Kanboard\Filter\TaskCreationDateRangeFilter;
|
||||
use Kanboard\Filter\TaskCreatorFilter;
|
||||
use Kanboard\Filter\TaskDescriptionFilter;
|
||||
use Kanboard\Filter\TaskDueDateFilter;
|
||||
@@ -24,6 +25,7 @@ use Kanboard\Filter\TaskIdFilter;
|
||||
use Kanboard\Filter\TaskLinkFilter;
|
||||
use Kanboard\Filter\TaskModificationDateFilter;
|
||||
use Kanboard\Filter\TaskMovedDateFilter;
|
||||
use Kanboard\Filter\TaskMovedDateRangeFilter;
|
||||
use Kanboard\Filter\TaskPriorityFilter;
|
||||
use Kanboard\Filter\TaskProjectFilter;
|
||||
use Kanboard\Filter\TaskReferenceFilter;
|
||||
@@ -148,6 +150,9 @@ class FilterProvider implements ServiceProviderInterface
|
||||
->withFilter(TaskCreationDateFilter::getInstance()
|
||||
->setDateParser($c['dateParser'])
|
||||
)
|
||||
->withFilter(TaskCreationDateRangeFilter::getInstance()
|
||||
->setDateParser($c['dateParser'])
|
||||
)
|
||||
->withFilter(TaskCreatorFilter::getInstance()
|
||||
->setCurrentUserId($c['userSession']->getId())
|
||||
)
|
||||
@@ -171,6 +176,9 @@ class FilterProvider implements ServiceProviderInterface
|
||||
->withFilter(TaskMovedDateFilter::getInstance()
|
||||
->setDateParser($c['dateParser'])
|
||||
)
|
||||
->withFilter(TaskMovedDateRangeFilter::getInstance()
|
||||
->setDateParser($c['dateParser'])
|
||||
)
|
||||
->withFilter(new TaskProjectFilter())
|
||||
->withFilter(new TaskReferenceFilter())
|
||||
->withFilter(new TaskScoreFilter())
|
||||
|
||||
Reference in New Issue
Block a user