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

Add search within a range of dates for completion and modification

This commit is contained in:
Kamil 2018-07-19 21:22:21 +02:00 committed by Frédéric Guillot
parent fe935d6ec1
commit 03a22132e4
6 changed files with 92 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Filter/BaseDateRangeFilter.php
View File

@ -42,10 +42,10 @@ abstract class BaseDateRangeFilter extends BaseFilter
protected function applyDateFilter($field)
{
$dates = explode('..', $this->value);
if(count($dates)=== 2){
$timestampFrom = $this->dateParser->getTimestamp($dates[0]);
$timestampTo = $this->dateParser->getTimestamp($dates[1]);
if(count($dates)=== 2){
$timestampFrom = $this->dateParser->getTimestamp($dates[0]." 00:00");
$timestampTo = $this->dateParser->getTimestamp($dates[1]." 00:00");
$this->query->gte($field, $timestampFrom);
$this->query->lte($field, $timestampTo + 86399);

38
app/Filter/TaskCompletionDateRangeFilter.php Normal file
View File

@ -0,0 +1,38 @@
<?php
namespace Kanboard\Filter;
use Kanboard\Core\Filter\FilterInterface;
use Kanboard\Model\TaskModel;
/**
* Filter tasks by completion date
*
* @package filter
* @author Kamil Ściana
*/
class TaskCompletionDateRangeFilter extends BaseDateRangeFilter implements FilterInterface
{
/**
* Get search attribute
*
* @access public
* @return string[]
*/
public function getAttributes()
{
return array('completedRange');
}
/**
* Apply filter
*
* @access public
* @return FilterInterface
*/
public function apply()
{
$this->applyDateFilter(TaskModel::TABLE.'.date_completed');
return $this;
}
}

38
app/Filter/TaskModificationDateRangeFilter.php Normal file
View File

@ -0,0 +1,38 @@
<?php
namespace Kanboard\Filter;
use Kanboard\Core\Filter\FilterInterface;
use Kanboard\Model\TaskModel;
/**
* Filter tasks by modification date
*
* @package filter
* @author Kamil Ściana
*/
class TaskModificationDateRangeFilter extends BaseDateRangeFilter implements FilterInterface
{
/**
* Get search attribute
*
* @access public
* @return string[]
*/
public function getAttributes()
{
return array('updatedRange', 'modifiedRange');
}
/**
* Apply filter
*
* @access public
* @return FilterInterface
*/
public function apply()
{
$this->applyDateFilter(TaskModel::TABLE.'.date_modification');
return $this;
}
}

8
app/ServiceProvider/FilterProvider.php
View File

@ -15,6 +15,7 @@ use Kanboard\Filter\TaskColorFilter;
use Kanboard\Filter\TaskColumnFilter;
use Kanboard\Filter\TaskCommentFilter;
use Kanboard\Filter\TaskCompletionDateFilter;
use Kanboard\Filter\TaskCompletionDateRangeFilter;
use Kanboard\Filter\TaskCreationDateFilter;
use Kanboard\Filter\TaskCreationDateRangeFilter;
use Kanboard\Filter\TaskCreatorFilter;
@ -24,6 +25,7 @@ use Kanboard\Filter\TaskStartDateFilter;
use Kanboard\Filter\TaskIdFilter;
use Kanboard\Filter\TaskLinkFilter;
use Kanboard\Filter\TaskModificationDateFilter;
use Kanboard\Filter\TaskModificationDateRangeFilter;
use Kanboard\Filter\TaskMovedDateFilter;
use Kanboard\Filter\TaskMovedDateRangeFilter;
use Kanboard\Filter\TaskPriorityFilter;
@ -166,6 +168,9 @@ class FilterProvider implements ServiceProviderInterface
->withFilter(TaskCompletionDateFilter::getInstance()
->setDateparser($c['dateParser'])
)
->withFilter(TaskCompletionDateRangeFilter::getInstance()
->setDateparser($c['dateParser'])
)
->withFilter(new TaskIdFilter())
->withFilter(TaskLinkFilter::getInstance()
->setDatabase($c['db'])
@ -173,6 +178,9 @@ class FilterProvider implements ServiceProviderInterface
->withFilter(TaskModificationDateFilter::getInstance()
->setDateParser($c['dateParser'])
)
->withFilter(TaskModificationDateRangeFilter::getInstance()
->setDateParser($c['dateParser'])
)
->withFilter(TaskMovedDateFilter::getInstance()
->setDateParser($c['dateParser'])
)

2
vendor/composer/autoload_classmap.php vendored
View File

@ -448,6 +448,7 @@ return array(
'Kanboard\\Filter\\TaskColumnFilter' => $baseDir . '/app/Filter/TaskColumnFilter.php',
'Kanboard\\Filter\\TaskCommentFilter' => $baseDir . '/app/Filter/TaskCommentFilter.php',
'Kanboard\\Filter\\TaskCompletionDateFilter' => $baseDir . '/app/Filter/TaskCompletionDateFilter.php',
'Kanboard\\Filter\\TaskCompletionDateRangeFilter' => $baseDir . '/app/Filter/TaskCompletionDateRangeFilter.php',
'Kanboard\\Filter\\TaskCreationDateFilter' => $baseDir . '/app/Filter/TaskCreationDateFilter.php',
'Kanboard\\Filter\\TaskCreationDateRangeFilter' => $baseDir . '/app/Filter/TaskCreationDateRangeFilter.php',
'Kanboard\\Filter\\TaskCreatorFilter' => $baseDir . '/app/Filter/TaskCreatorFilter.php',
@ -458,6 +459,7 @@ return array(
'Kanboard\\Filter\\TaskIdFilter' => $baseDir . '/app/Filter/TaskIdFilter.php',
'Kanboard\\Filter\\TaskLinkFilter' => $baseDir . '/app/Filter/TaskLinkFilter.php',
'Kanboard\\Filter\\TaskModificationDateFilter' => $baseDir . '/app/Filter/TaskModificationDateFilter.php',
'Kanboard\\Filter\\TaskModificationDateRangeFilter' => $baseDir . '/app/Filter/TaskModificationDateRangeFilter.php',
'Kanboard\\Filter\\TaskMovedDateFilter' => $baseDir . '/app/Filter/TaskMovedDateFilter.php',
'Kanboard\\Filter\\TaskMovedDateRangeFilter' => $baseDir . '/app/Filter/TaskMovedDateRangeFilter.php',
'Kanboard\\Filter\\TaskPriorityFilter' => $baseDir . '/app/Filter/TaskPriorityFilter.php',

2
vendor/composer/autoload_static.php vendored
View File

@ -559,6 +559,7 @@ class ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e
'Kanboard\\Filter\\TaskColumnFilter' => __DIR__ . '/../..' . '/app/Filter/TaskColumnFilter.php',
'Kanboard\\Filter\\TaskCommentFilter' => __DIR__ . '/../..' . '/app/Filter/TaskCommentFilter.php',
'Kanboard\\Filter\\TaskCompletionDateFilter' => __DIR__ . '/../..' . '/app/Filter/TaskCompletionDateFilter.php',
'Kanboard\\Filter\\TaskCompletionDateRangeFilter' => __DIR__ . '/../..' . '/app/Filter/TaskCompletionDateRangeFilter.php',
'Kanboard\\Filter\\TaskCreationDateFilter' => __DIR__ . '/../..' . '/app/Filter/TaskCreationDateFilter.php',
'Kanboard\\Filter\\TaskCreationDateRangeFilter' => __DIR__ . '/../..' . '/app/Filter/TaskCreationDateRangeFilter.php',
'Kanboard\\Filter\\TaskCreatorFilter' => __DIR__ . '/../..' . '/app/Filter/TaskCreatorFilter.php',
@ -569,6 +570,7 @@ class ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e
'Kanboard\\Filter\\TaskIdFilter' => __DIR__ . '/../..' . '/app/Filter/TaskIdFilter.php',
'Kanboard\\Filter\\TaskLinkFilter' => __DIR__ . '/../..' . '/app/Filter/TaskLinkFilter.php',
'Kanboard\\Filter\\TaskModificationDateFilter' => __DIR__ . '/../..' . '/app/Filter/TaskModificationDateFilter.php',
'Kanboard\\Filter\\TaskModificationDateRangeFilter' => __DIR__ . '/../..' . '/app/Filter/TaskModificationDateRangeFilter.php',
'Kanboard\\Filter\\TaskMovedDateFilter' => __DIR__ . '/../..' . '/app/Filter/TaskMovedDateFilter.php',
'Kanboard\\Filter\\TaskMovedDateRangeFilter' => __DIR__ . '/../..' . '/app/Filter/TaskMovedDateRangeFilter.php',
'Kanboard\\Filter\\TaskPriorityFilter' => __DIR__ . '/../..' . '/app/Filter/TaskPriorityFilter.php',