Filters\Date: Fixed for DATETIME columns

o5 · Jan 11, 2014 · ba44903 · ba44903
1 parent eaab5fc
commit ba44903
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/Grido/Components/Filters/Date.php b/Grido/Components/Filters/Date.php
@@ -23,11 +23,6 @@
  */
 class Date extends Text
 {
-    const DEFAULT_CONDITION = '= ?';
-
-    /** @var string */
-    protected $condition = self::DEFAULT_CONDITION;
-
     /** @var string */
     protected $formatValue;
 
@@ -39,7 +34,7 @@ class Date extends Text
     /**
      * @var string
      */
-    protected $dateFormatOutput = 'Y-m-d';
+    protected $dateFormatOutput = 'Y-m-d%';
 
     /**
      * Sets date-input format.
@@ -101,7 +96,7 @@ protected function getFormControl()
      */
     public function __getCondition($value)
     {
-        if ($this->where === NULL && $this->condition == self::DEFAULT_CONDITION) {
+        if ($this->where === NULL && is_string($this->condition)) {
             return ($date = \DateTime::createFromFormat($this->dateFormatInput, $value))
                 ? Condition::setupFromArray(array($this->getColumn(), $this->condition, $date->format($this->dateFormatOutput)))
                 : Condition::setupEmpty();

diff --git a/Grido/Components/Filters/DateRange.php b/Grido/Components/Filters/DateRange.php
@@ -22,13 +22,13 @@
  */
 class DateRange extends Date
 {
-    const DEFAULT_CONDITION = 'BETWEEN ? AND ?';
-
     /** @var string */
-    protected $condition = self::DEFAULT_CONDITION;
+    protected $condition = 'BETWEEN ? AND ?';
 
-    /** @var string */
-    protected $formatValue;
+    /**
+     * @var string
+     */
+    protected $dateFormatOutput = 'Y-m-d';
 
     /**
      * @var string
@@ -76,7 +76,7 @@ protected function getFormControl()
      */
     public function __getCondition($value)
     {
-        if ($this->where === NULL && $this->condition == self::DEFAULT_CONDITION) {
+        if ($this->where === NULL && is_string($this->condition)) {
             list (, $from, $to) = \Nette\Utils\Strings::match($value, $this->mask);
             $from = \DateTime::createFromFormat($this->dateFormatInput, trim($from));
             $to = \DateTime::createFromFormat($this->dateFormatInput, trim($to));

diff --git a/tests/Grido/Components/Filter.Date.phpt b/tests/Grido/Components/Filter.Date.phpt
@@ -30,14 +30,14 @@ class FilterDateTest extends \Tester\TestCase
         $grid = new Grid;
         $filter = $grid->addFilterDate('date', 'Date');
 
-        Assert::same(array('date = ?', '2012-12-21'), $filter->__getCondition('21.12.2012')->__toArray());
+        Assert::same(array('date LIKE ?', '2012-12-21%'), $filter->__getCondition('21.12.2012')->__toArray());
         Assert::same(array('0 = 1'), $filter->__getCondition('TEST BAD INPUT')->__toArray());
 
         $filter
             ->setDateFormatInput('d/m/Y')
             ->setDateFormatOutput('d.m.Y');
 
-        Assert::same(array('date = ?', '21.12.2012'), $filter->__getCondition('21/12/2012')->__toArray());
+        Assert::same(array('date LIKE ?', '21.12.2012'), $filter->__getCondition('21/12/2012')->__toArray());
         Assert::same(array('0 = 1'), $filter->__getCondition('21.12.2012')->__toArray()); //test bad input
     }
 }