Merge pull request #7 from pedro-teixeira/issue-7-pt-improvements

Improvements
pedro-teixeira · Apr 16, 2013 · aa22dd4 · aa22dd4
2 parents a4afde8 + 9873c2f
commit aa22dd4
Show file tree

Hide file tree

Showing 8 changed files with 145 additions and 7 deletions.
diff --git a/Grid/Filter/Date.php b/Grid/Filter/Date.php
@@ -12,13 +12,29 @@ class Date extends FilterAbstract
      */
     protected $operatorType = 'date';
 
+    /**
+     * @var string
+     */
+    protected $dateFormat;
+
+    /**
+     * @param \Symfony\Component\DependencyInjection\Container $container
+     */
+    public function __construct(\Symfony\Component\DependencyInjection\Container $container)
+    {
+        parent::__construct($container);
+
+        $this->dateFormat = $this->container->getParameter('pedro_teixeira_grid.date.date_format');
+        $this->setPlaceholder(strtoupper($this->dateFormat));
+    }
+
     /**
      * @return string
      */
     public function render()
     {
         if ($this->getUseDatePicker()) {
-            $html  = '<input ' . $this->getNameAndId() . ' type="text" value="' . $this->getValue() . '" placeholder="' . $this->getPlaceholder() . '" data-date-format="' . strtolower($this->container->getParameter('pedro_teixeira_grid.date.date_format')) . '">';
+            $html  = '<input ' . $this->getNameAndId() . ' type="text" value="' . $this->getValue() . '" placeholder="' . $this->getPlaceholder() . '" data-date-format="' . strtolower($this->dateFormat) . '">';
             $html .= '<script type="text/javascript">$(document).ready(function () {$("#' . $this->getId() . '").datepicker()})</script>';
         } else {
             $html = '<input ' . $this->getNameAndId() . ' type="date" value="' . $this->getValue() . '" placeholder="' . $this->getPlaceholder() . '">';

diff --git a/Grid/Filter/DateRange.php b/Grid/Filter/DateRange.php
@@ -24,15 +24,16 @@ public function render()
     {
         if ($this->getUseDatePicker()) {
 
-            $html  = '<input class="date-input" name="' . $this->getIndex() . '[]" id="' . $this->getId() . 'from" type="text" value="' . $this->getValue() . '" placeholder="' . $this->getPlaceholder() . '" data-date-format="' . strtolower($this->container->getParameter('pedro_teixeira_grid.date.date_format')) . '">';
+            $html  = '<input class="date-input" name="' . $this->getIndex() . '[]" id="' . $this->getId() . 'from" type="text" value="' . $this->getValue() . '" placeholder="' . $this->getPlaceholder() . '" data-date-format="' . strtolower($this->dateFormat) . '">';
             $html .= $this->getInputSeparator();
-            $html .= '<input class="date-input" name="' . $this->getIndex() . '[]" id="' . $this->getId() . 'to" type="text" value="' . $this->getValue() . '" placeholder="' . $this->getPlaceholder() . '" data-date-format="' . strtolower($this->container->getParameter('pedro_teixeira_grid.date.date_format')) . '">';
+            $html .= '<input class="date-input" name="' . $this->getIndex() . '[]" id="' . $this->getId() . 'to" type="text" value="' . $this->getValue() . '" placeholder="' . $this->getPlaceholder() . '" data-date-format="' . strtolower($this->dateFormat) . '">';
             $html .= '<script type="text/javascript">$(document).ready(function () {$("#' . $this->getId() . 'from").datepicker(); $("#' . $this->getId() . 'to").datepicker()})</script>';
 
         } else {
 
-            $html  = '<input name="' . $this->getIndex() . '[]" id="' . $this->getId() . 'from" type="date" value="' . $this->getValue() . '"> ';
-            $html .= '<input name="' . $this->getIndex() . '[]" id="' . $this->getId() . 'to" type="date" value="' . $this->getValue() . '">';
+            $html  = '<input class="date-input" name="' . $this->getIndex() . '[]" id="' . $this->getId() . 'from" type="date" placeholder="' . $this->getPlaceholder() . '" value="' . $this->getValue() . '"> ';
+            $html .= $this->getInputSeparator();
+            $html .= '<input class="date-input" name="' . $this->getIndex() . '[]" id="' . $this->getId() . 'to" type="date" placeholder="' . $this->getPlaceholder() . '" value="' . $this->getValue() . '">';
 
         }
 

diff --git a/Grid/Filter/NumberRange.php b/Grid/Filter/NumberRange.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace PedroTeixeira\Bundle\GridBundle\Grid\Filter;
+
+/**
+ * Filter NumberRange
+ */
+class NumberRange extends FilterAbstract
+{
+    /**
+     * @var string
+     */
+    protected $operatorType = 'number_range';
+
+    /**
+     * @var string
+     */
+    protected $inputSeparator = ' : ';
+
+    /**
+     * @return string
+     */
+    public function render()
+    {
+        $html  = '<input class="number-input" name="' . $this->getIndex() . '[]" id="' . $this->getId() . 'from" type="text" placeholder="' . $this->getPlaceholder() . '" value="' . $this->getValue() . '"> ';
+        $html .= $this->getInputSeparator();
+        $html .= '<input class="number-input" name="' . $this->getIndex() . '[]" id="' . $this->getId() . 'to" type="text" placeholder="' . $this->getPlaceholder() . '" value="' . $this->getValue() . '">';
+
+        return $html;
+    }
+
+    /**
+     * @param string $inputSeparator
+     *
+     * @return DateRange
+     */
+    public function setInputSeparator($inputSeparator)
+    {
+        $this->inputSeparator = $inputSeparator;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getInputSeparator()
+    {
+        return $this->inputSeparator;
+    }
+}
diff --git a/Grid/Filter/Operator/NumberRange.php b/Grid/Filter/Operator/NumberRange.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace PedroTeixeira\Bundle\GridBundle\Grid\Filter\Operator;
+
+/**
+ * NumberRange
+ */
+class NumberRange extends OperatorAbstract
+{
+    /**
+     * @param array $value
+     *
+     * @throws \Exception
+     */
+    public function execute($value)
+    {
+        if (!is_array($value) || count($value) != 2) {
+            throw new \Exception('Value for number range comparison should have to values');
+        }
+
+        $queryBuilder = $this->getQueryBuilder();
+
+        if (!empty($value[0])) {
+            $queryBuilder->andWhere(
+                $queryBuilder->expr()->gte(
+                    $this->getIndex(),
+                    ":{$this->getIndexClean()}_1"
+                ))
+                ->setParameter(
+                    ":{$this->getIndexClean()}_1",
+                    (float) $value[0]
+                );
+        }
+
+        if (!empty($value[1])) {
+
+            $queryBuilder->andWhere(
+                $queryBuilder->expr()->lte(
+                    $this->getIndex(),
+                    ":{$this->getIndexClean()}_2"
+                ))
+                ->setParameter(
+                    ":{$this->getIndexClean()}_2",
+                    (float) $value[1]
+                );
+        }
+    }
+}
diff --git a/README.md b/README.md
@@ -129,6 +129,11 @@ Create your grid
                 ->setField('name')
                 ->setIndex('r.name');
 
+            $this->addColumn('Number')
+                ->setField('number')
+                ->setIndex('r.number')
+                ->setFilterType('number_range');
+
             $this->addColumn('Options')
                 ->setField('option')
                 ->setIndex('r.options')

diff --git a/Resources/doc/column/filter.md b/Resources/doc/column/filter.md
@@ -62,6 +62,7 @@ Operator Comparison Types:
 * end_with
 * not_end_with
 * not_contain
+* number_range
 
 date
 ------------
@@ -77,6 +78,15 @@ Attributes:
 
 * inputSeparator
 
+number_range
+------------
+
+Two fields to define a number range.
+
+Attributes:
+
+* inputSeparator
+
 select
 ------------
 

diff --git a/Resources/public/css/grid.css b/Resources/public/css/grid.css
@@ -30,7 +30,11 @@
 }
 
 .pedroteixeira-grid-wrapper table thead tr th .date-input {
-    width: 70px;
+    width: 75px;
+}
+
+.pedroteixeira-grid-wrapper table thead tr th .number-input {
+    width: 75px;
 }
 
 .pedroteixeira-grid-wrapper table tfoot #pagination {

diff --git a/Resources/public/less/grid.less b/Resources/public/less/grid.less
@@ -25,7 +25,10 @@
           width: auto;
         }
         .date-input {
-          width: 70px;
+          width: 75px;
+        }
+        .number-input {
+          width: 75px;
         }
       }
     }