dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 20984
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-11-09 13:56:21 +0700
message:
  Date support for BetweenOperator + tests
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/operators/BetweenOperator.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/operators/GreaterEqualOperator.java
  dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/query/InMemoryQueryEngineTest.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/operators/BetweenOperator.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/operators/BetweenOperator.java	2015-11-05 03:55:41 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/operators/BetweenOperator.java	2015-11-09 06:56:21 +0000
@@ -75,6 +75,14 @@
 
             return s1 >= min && s1 <= max;
         }
+        else if ( Date.class.isInstance( value ) )
+        {
+            Date min = getValue( Date.class, 0 );
+            Date max = getValue( Date.class, 1 );
+            Date s2 = (Date) value;
+
+            return (s2.equals( min ) || s2.after( min )) && (s2.before( max ) || s2.equals( max ));
+        }
         else if ( Collection.class.isInstance( value ) )
         {
             Collection<?> collection = (Collection<?>) value;

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/operators/GreaterEqualOperator.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/operators/GreaterEqualOperator.java	2015-11-05 03:55:41 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/operators/GreaterEqualOperator.java	2015-11-09 06:56:21 +0000
@@ -73,6 +73,13 @@
 
             return s1 != null && s2 >= s1;
         }
+        else if ( Date.class.isInstance( value ) )
+        {
+            Date s1 = getValue( Date.class );
+            Date s2 = (Date) value;
+
+            return s1 != null && (s2.after( s1 ) || s2.equals( s1 ));
+        }
         else if ( Collection.class.isInstance( value ) )
         {
             Collection<?> collection = (Collection<?>) value;
@@ -80,13 +87,6 @@
 
             return size != null && collection.size() >= size;
         }
-        else if ( Date.class.isInstance( value ) )
-        {
-            Date s1 = getValue( Date.class );
-            Date s2 = (Date) value;
-
-            return s1 != null && (s2.after( s1 ) || s2.equals( s1 ));
-        }
 
         return false;
     }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/query/InMemoryQueryEngineTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/query/InMemoryQueryEngineTest.java	2015-11-09 05:57:33 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/query/InMemoryQueryEngineTest.java	2015-11-09 06:56:21 +0000
@@ -270,7 +270,6 @@
     }
 
     @Test
-    @Ignore
     public void getBetweenQuery()
     {
         Query query = Query.from( schemaService.getDynamicSchema( DataElement.class ) );