From 7d6c3edcdd2730a46d59c186048e76fa72e364c7 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sat, 22 Aug 2015 15:35:28 +0200
Subject: Fix date filter on same day

Fix #1379
---
 .../Subscriber/CustomDoctrineORMSubscriber.php     | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php

(limited to 'src/Wallabag/CoreBundle/Event')

diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php b/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php
new file mode 100644
index 00000000..20ced679
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Wallabag\CoreBundle\Event\Subscriber;
+
+use Lexik\Bundle\FormFilterBundle\Event\Subscriber\DoctrineORMSubscriber;
+use Lexik\Bundle\FormFilterBundle\Event\GetFilterConditionEvent;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * This custom class override the default behavior of LexikFilterBundle on `filter_date_range`
+ * It converts a date_range to date_time_range to add hour to be able to grab a whole day (from 00:00:00 to 23:59:59)
+ */
+class CustomDoctrineORMSubscriber extends DoctrineORMSubscriber implements EventSubscriberInterface
+{
+    /**
+     * @param GetFilterConditionEvent $event
+     */
+    public function filterDateRange(GetFilterConditionEvent $event)
+    {
+        $expr   = $event->getFilterQuery()->getExpressionBuilder();
+        $values = $event->getValues();
+        $value  = $values['value'];
+
+        // left date should start at midnight
+        if (isset($value['left_date'][0]) && $value['left_date'][0] instanceOf \DateTime) {
+            $value['left_date'][0]->setTime(0, 0, 0);
+        }
+
+        // right adte should end one second before midnight
+        if (isset($value['right_date'][0]) && $value['right_date'][0] instanceOf \DateTime) {
+            $value['right_date'][0]->setTime(23, 59, 59);
+        }
+
+        if (isset($value['left_date'][0]) || isset($value['right_date'][0])) {
+            $event->setCondition($expr->dateTimeInRange($event->getField(), $value['left_date'][0], $value['right_date'][0]));
+        }
+    }
+}
-- 
cgit v1.2.3


From f90af145caa040d17f2fb01e78b645c4157c3781 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sun, 23 Aug 2015 22:06:27 +0200
Subject: Add test for same day filter

---
 .../Event/Subscriber/CustomDoctrineORMSubscriber.php           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Event')

diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php b/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php
index 20ced679..cfdbfe97 100644
--- a/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php
+++ b/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php
@@ -8,7 +8,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
  * This custom class override the default behavior of LexikFilterBundle on `filter_date_range`
- * It converts a date_range to date_time_range to add hour to be able to grab a whole day (from 00:00:00 to 23:59:59)
+ * It converts a date_range to date_time_range to add hour to be able to grab a whole day (from 00:00:00 to 23:59:59).
  */
 class CustomDoctrineORMSubscriber extends DoctrineORMSubscriber implements EventSubscriberInterface
 {
@@ -17,17 +17,17 @@ class CustomDoctrineORMSubscriber extends DoctrineORMSubscriber implements Event
      */
     public function filterDateRange(GetFilterConditionEvent $event)
     {
-        $expr   = $event->getFilterQuery()->getExpressionBuilder();
+        $expr = $event->getFilterQuery()->getExpressionBuilder();
         $values = $event->getValues();
-        $value  = $values['value'];
+        $value = $values['value'];
 
         // left date should start at midnight
-        if (isset($value['left_date'][0]) && $value['left_date'][0] instanceOf \DateTime) {
+        if (isset($value['left_date'][0]) && $value['left_date'][0] instanceof \DateTime) {
             $value['left_date'][0]->setTime(0, 0, 0);
         }
 
         // right adte should end one second before midnight
-        if (isset($value['right_date'][0]) && $value['right_date'][0] instanceOf \DateTime) {
+        if (isset($value['right_date'][0]) && $value['right_date'][0] instanceof \DateTime) {
             $value['right_date'][0]->setTime(23, 59, 59);
         }
 
-- 
cgit v1.2.3