Add search within a range of dates for creation/moved date fields

4 files changed, 138 insertions, 0 deletions

diff --git a/app/Filter/BaseDateRangeFilter.php b/app/Filter/BaseDateRangeFilter.php
new file mode 100644
index 00000000..336f8c8e
--- /dev/null
+++ b/app/Filter/BaseDateRangeFilter.php
@@ -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);
+        }
+    }
+}
diff --git a/app/Filter/TaskCreationDateRangeFilter.php b/app/Filter/TaskCreationDateRangeFilter.php
new file mode 100644
index 00000000..7696af07
--- /dev/null
+++ b/app/Filter/TaskCreationDateRangeFilter.php
@@ -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;
+    }
+}
diff --git a/app/Filter/TaskMovedDateRangeFilter.php b/app/Filter/TaskMovedDateRangeFilter.php
new file mode 100644
index 00000000..b5b826b0
--- /dev/null
+++ b/app/Filter/TaskMovedDateRangeFilter.php
@@ -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;
+    }
+}
diff --git a/app/ServiceProvider/FilterProvider.php b/app/ServiceProvider/FilterProvider.php
index 11a29e69..c61d2284 100644
--- a/app/ServiceProvider/FilterProvider.php
+++ b/app/ServiceProvider/FilterProvider.php
@@ -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())