Merge pull request #838 from dhis2/develop

Develop 0.16.1
dhis2 · May 23, 2019 · 66c9a67 · 66c9a67
2 parents aea368e + 7d33e88
commit 66c9a67
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 8 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -36,8 +36,8 @@ ext {
             buildToolsVersion: "28.0.3",
             minSdkVersion    : 19,
             targetSdkVersion : 28,
-            versionCode      : 131,
-            versionName      : "0.16.0-SNAPSHOT"
+            versionCode      : 132,
+            versionName      : "0.16.1-SNAPSHOT"
     ]
 
     libraries = [

diff --git a/core/gradle.properties b/core/gradle.properties
@@ -29,8 +29,8 @@
 # Properties which are consumed by plugins/gradle-mvn-push.gradle plugin.
 # They are used for publishing artifact to snapshot repository.
 
-VERSION_NAME=0.16.0-SNAPSHOT
-VERSION_CODE=131
+VERSION_NAME=0.16.1-SNAPSHOT
+VERSION_CODE=132
 
 GROUP=org.hisp.dhis
 

diff --git a/...dhis/android/core/arch/repositories/collection/FiltersOperatorsMockIntegrationShould.java b/...dhis/android/core/arch/repositories/collection/FiltersOperatorsMockIntegrationShould.java
@@ -438,4 +438,21 @@ public void filter_enum_int_with_not_in_with_two_elements() {
                 .get();
         assertThat(objects.size(), is(0));
     }
+
+    @Test
+    public void filter_string_with_is_null() {
+        ProgramStageCollectionRepository repository = d2.programModule().programStages
+                .byDescription().isNull();
+        List<ProgramStage> objects = repository.get();
+        assertThat(objects.size(), is(1));
+    }
+
+    @Test
+    public void filter_string_with_is_not_null() {
+        ProgramStageCollectionRepository repository = d2.programModule().programStages
+                .byDescription().isNotNull();
+        List<ProgramStage> objects = repository.get();
+        assertThat(objects.size(), is(1));
+    }
+
 }
diff --git a/...c/main/java/org/hisp/dhis/android/core/arch/repositories/filters/BaseFilterConnector.java b/...c/main/java/org/hisp/dhis/android/core/arch/repositories/filters/BaseFilterConnector.java
@@ -122,4 +122,13 @@ public R notIn(Collection<V> values) {
     public final R notIn(V... values) {
         return notIn(Arrays.asList(values));
     }
+
+    public final R isNull() {
+        return newWithUnwrappedScope("", "IS NULL");
+    }
+
+    public final R isNotNull() {
+        return newWithUnwrappedScope("", "IS NOT NULL");
+    }
+
 }
diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventCollectionRepository.java
@@ -68,7 +68,10 @@ public final class EventCollectionRepository
 
     @Override
     public Callable<WebResponse> upload() {
-        return () -> postCall.call(byState().in(State.TO_POST, State.TO_UPDATE, State.TO_DELETE).getWithoutChildren());
+        return () -> postCall.call(
+                byState().in(State.TO_POST, State.TO_UPDATE, State.TO_DELETE)
+                        .byEnrollmentUid().isNull()
+                        .getWithoutChildren());
     }
 
     public StringFilterConnector<EventCollectionRepository> byUid() {

diff --git a/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java b/core/src/main/java/org/hisp/dhis/android/core/event/EventStoreImpl.java
@@ -55,7 +55,7 @@
 
 public final class EventStoreImpl extends IdentifiableObjectWithStateStoreImpl<Event> implements EventStore {
 
-    private static final String QUERY_SINGLE_EVENTS = "SELECT Event.* FROM Event WHERE Event.enrollment ISNULL";
+    private static final String QUERY_SINGLE_EVENTS = "SELECT Event.* FROM Event WHERE Event.enrollment IS NULL";
 
     private static final StatementBinder<Event> BINDER = (o, sqLiteStatement) -> {
         sqLiteBind(sqLiteStatement, 1, o.uid());

diff --git a/core/src/sharedTest/resources/program/program_stages.json b/core/src/sharedTest/resources/program/program_stages.json
@@ -181,8 +181,6 @@
       "id": "dBwrot7S421",
       "created": "2015-04-12T15:30:43.805",
       "name": "Child care visit - demo",
-      "description": "Description 2",
-      "displayDescription": "Display Description 2",
       "allowGenerateNextVisit": true,
       "executionDateLabel": "Visit date 2",
       "validCompleteOnly": false,