From 42a843aba133392007c62b8689be76b58b5022b1 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Tue, 7 May 2013 17:16:14 +0000
Subject: [PATCH] BUG 11093 "Advanced search. El filtro Delegate date no..."
 SOLVED

- Advanced search. El filtro Delegate date no funciona bien.
- Problema resuelto, en la opcion HOME -> Search -> Advanced Search, al colocar un intervalo de fechas en "Delegated date"
  se muestra correctamente el listado de casos, al colocar la misma fecha se muestran los casos correctamente
* Available from version ProcessMaker-2.0.47 (2.5.1)
---
 .../engine/classes/class.applications.php     | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/workflow/engine/classes/class.applications.php b/workflow/engine/classes/class.applications.php
index 4069afc03..0e33b1c45 100644
--- a/workflow/engine/classes/class.applications.php
+++ b/workflow/engine/classes/class.applications.php
@@ -230,20 +230,28 @@ class Applications
         }
         */
 
-        if ($dateFrom != '') {
-            if ($dateTo != '') {
-                if ($dateFrom == $dateTo) {
-                    $dateAux = $dateFrom;
-                    $dateFrom = $dateAux . " 00:00:00";
-                    $dateTo = $dateAux . " 23:23:59";
-               }
-                $Criteria->add( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->addAnd( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
+        if ($dateFrom != "") {
+            if ($dateTo != "") {
+                if ($dateFrom == $dateTo) {
+                    $dateSame = $dateFrom;
+                    $dateFrom = $dateSame . " 00:00:00";
+                    $dateTo = $dateSame . " 23:59:59";
+                } else {
+                    $dateFrom = $dateFrom . " 00:00:00";
+                    $dateTo = $dateTo . " 23:59:59";
+                }
+
+                $Criteria->add( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->addAnd( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
                 $CriteriaCount->add( $CriteriaCount->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL )->addAnd( $Criteria->getNewCriterion( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL ) ) );
             } else {
+                $dateFrom = $dateFrom . " 00:00:00";
+
                 $Criteria->add( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL );
                 $CriteriaCount->add( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateFrom, Criteria::GREATER_EQUAL );
             }
-        } elseif ($dateTo != '') {
+        } elseif ($dateTo != "") {
+            $dateTo = $dateTo . " 23:59:59";
+
             $Criteria->add( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL );
             $CriteriaCount->add( AppCacheViewPeer::DEL_DELEGATE_DATE, $dateTo, Criteria::LESS_EQUAL );
         }