Merge pull request #171 from dhis2/develop

Develop (0.6.0)
dhis2 · Apr 1, 2018 · 2a8b630 · 2a8b630
2 parents 600e4e4 + 88f436d
commit 2a8b630
Show file tree

Hide file tree

Showing 203 changed files with 4,095 additions and 21,208 deletions.
diff --git a/build.gradle b/build.gradle
@@ -54,8 +54,8 @@ ext {
             buildToolsVersion: "25.0.2",
             minSdkVersion    : 15,
             targetSdkVersion : 25,
-            versionCode      : 50,
-            versionName      : "0.5-SNAPSHOT"
+            versionCode      : 60,
+            versionName      : "0.6.0-SNAPSHOT"
     ]
 
     libraries = [

diff --git a/core/src/androidTest/assets/admin/login.json b/core/src/androidTest/assets/admin/login.json
@@ -36,7 +36,8 @@
       "displayName": "Sierra Leone",
       "displayShortName": "Sierra Leone",
       "path": "/ImspTQPwCqd",
-      "openingDate": "1994-01-01T00:00:00.000"
+      "openingDate": "1994-01-01T00:00:00.000",
+      "ancestors": []
     }
   ]
 }
diff --git a/core/src/androidTest/assets/admin/organisation_units.json b/core/src/androidTest/assets/admin/organisation_units.json
@@ -16,42 +16,16 @@
         "id": "qtr8GGlm4gg"
       },
       "programs": [
-        {
-          "id": "q04UBOqq3rp"
-        },
-        {
-          "id": "kla3mAPgvCH"
-        },
-        {
-          "id": "uy2gU8kT1jF"
-        },
-        {
-          "id": "VBqh0ynB2wv"
-        },
-        {
-          "id": "eBAyeGv0exc"
-        },
         {
           "id": "lxAQ7Zs9VYR"
-        },
-        {
-          "id": "IpHINAT79UW"
-        },
-        {
-          "id": "bMcwwoVnbSR"
-        },
-        {
-          "id": "ur1Edk5Oe2n"
-        },
-        {
-          "id": "WSGAb5XwJ3Y"
         }
       ],
       "dataSets": [
         {
           "id": "lyLU2wR22tC"
         }
-      ]
+      ],
+      "ancestors": []
     },
     {
       "code": "OU_278371",
@@ -69,42 +43,16 @@
         "id": "qtr8GGlm4gg"
       },
       "programs": [
-        {
-          "id": "q04UBOqq3rp"
-        },
-        {
-          "id": "kla3mAPgvCH"
-        },
-        {
-          "id": "uy2gU8kT1jF"
-        },
-        {
-          "id": "VBqh0ynB2wv"
-        },
-        {
-          "id": "eBAyeGv0exc"
-        },
         {
           "id": "lxAQ7Zs9VYR"
-        },
-        {
-          "id": "IpHINAT79UW"
-        },
-        {
-          "id": "bMcwwoVnbSR"
-        },
-        {
-          "id": "ur1Edk5Oe2n"
-        },
-        {
-          "id": "WSGAb5XwJ3Y"
         }
       ],
       "dataSets": [
         {
           "id": "lyLU2wR22tC"
         }
-      ]
+      ],
+      "ancestors": []
     }
   ]
 }
diff --git a/core/src/androidTest/assets/admin/user.json b/core/src/androidTest/assets/admin/user.json
@@ -31,105 +31,6 @@
             "id": "lxAQ7Zs9VYR"
           }
         ]
-      },
-      {
-        "id": "Ufph3mGRmMo",
-        "programs": [
-          {
-            "id": "uy2gU8kT1jF"
-          },
-          {
-            "id": "q04UBOqq3rp"
-          },
-          {
-            "id": "VBqh0ynB2wv"
-          },
-          {
-            "id": "eBAyeGv0exc"
-          },
-          {
-            "id": "kla3mAPgvCH"
-          },
-          {
-            "id": "lxAQ7Zs9VYR"
-          },
-          {
-            "id": "IpHINAT79UW"
-          },
-          {
-            "id": "ur1Edk5Oe2n"
-          },
-          {
-            "id": "WSGAb5XwJ3Y"
-          },
-          {
-            "id": "fDd25txQckK"
-          }
-        ]
-      },
-      {
-        "id": "Euq3XfEIEbx",
-        "programs": []
-      },
-      {
-        "id": "aNk5AyC7ydy",
-        "programs": [
-          {
-            "id": "uy2gU8kT1jF"
-          }
-        ]
-      },
-      {
-        "id": "cUlTcejWree",
-        "programs": [
-          {
-            "id": "ur1Edk5Oe2n"
-          }
-        ]
-      },
-      {
-        "id": "TMK9CMZ2V98",
-        "programs": [
-          {
-            "id": "IpHINAT79UW"
-          }
-        ]
-      },
-      {
-        "id": "Ql6Gew7eaX6",
-        "programs": []
-      },
-      {
-        "id": "Pqoy4DLOdMK",
-        "programs": [
-          {
-            "id": "WSGAb5XwJ3Y"
-          }
-        ]
-      },
-      {
-        "id": "DRdaVRtwmG5",
-        "programs": [
-          {
-            "id": "eBAyeGv0exc"
-          }
-        ]
-      },
-      {
-        "id": "jRWSNIHdKww",
-        "programs": []
-      },
-      {
-        "id": "txB7vu1w2Pr",
-        "programs": []
-      },
-      {
-        "id": "xJZBzAHI88H",
-        "programs": []
-      },
-      {
-        "id": "XS0dNzuZmfH",
-        "programs": []
       }
     ]
   },
@@ -140,23 +41,15 @@
       "path": "/ImspTQPwCqd",
       "programs": [
         {
-          "id": "VBqh0ynB2wv"
-        },
-        {
-          "id": "kla3mAPgvCH"
-        },
-        {
-          "id": "bMcwwoVnbSR"
-        },
-        {
-          "id": "uEXeVjhiJ4x"
+          "id": "lxAQ7Zs9VYR"
         }
       ],
       "dataSets": [
         {
           "id": "lyLU2wR22tC"
         }
-      ]
+      ],
+      "ancestors": []
     }
   ]
 }
diff --git a/core/src/androidTest/assets/event_1_with_only_one_data_values.json b/core/src/androidTest/assets/event_1_with_only_one_data_values.json
@@ -9,10 +9,10 @@
     {
       "attributeOptionCombo": "bRowv6yZOF2",
       "attributeCategoryOptions": "as6ygGvUGNg",
-      "programStage": "A03MvHHogjR",
+      "programStage": "dBwrot7S420",
       "orgUnit": "DiszpKrYNg8",
       "dueDate": "2017-02-28T00:00:00.000",
-      "program": "IpHINAT79UW",
+      "program": "lxAQ7Zs9VYR",
       "event": "V1CerIi3sdL",
       "status": "COMPLETED",
       "eventDate": "2017-02-27T00:00:00.000",

diff --git a/core/src/androidTest/assets/events.json b/core/src/androidTest/assets/events.json
@@ -0,0 +1,73 @@
+{
+  "pager": {
+    "page": 1,
+    "pageCount": 1,
+    "total": 0,
+    "pageSize": 50
+  },
+  "events": [
+    {
+      "attributeOptionCombo": "bRowv6yZOF2",
+      "attributeCategoryOptions": "as6ygGvUGNg",
+      "programStage": "dBwrot7S420",
+      "orgUnit": "DiszpKrYNg8",
+      "dueDate": "2017-02-28T00:00:00.000",
+      "program": "lxAQ7Zs9VYR",
+      "event": "V1CerIi3sdL",
+      "status": "COMPLETED",
+      "eventDate": "2017-02-27T00:00:00.000",
+      "created": "2017-08-07T15:47:25.959",
+      "completedDate": "2017-02-27T00:00:00.000",
+      "lastUpdated": "2017-09-14T22:26:39.094",
+      "deleted": false,
+      "coordinate": {
+        "latitude": 0,
+        "longitude": 0
+      },
+      "dataValues": [
+        {
+          "lastUpdated": "2015-02-28T12:05:00.000",
+          "created": "2015-02-28T12:05:00.000",
+          "dataElement": "ebaJjqltK5N",
+          "value": "1",
+          "providedElsewhere": false
+        },
+        {
+          "lastUpdated": "2015-02-28T12:05:00.000",
+          "created": "2015-02-28T12:05:00.000",
+          "dataElement": "bx6fsa0t90x",
+          "value": "false",
+          "providedElsewhere": false
+        },
+        {
+          "lastUpdated": "2015-02-28T12:05:00.000",
+          "created": "2015-02-28T12:05:00.000",
+          "dataElement": "wQLfBvPrXqq",
+          "value": "NVP only",
+          "providedElsewhere": false
+        },
+        {
+          "lastUpdated": "2015-02-28T12:05:00.000",
+          "created": "2015-02-28T12:05:00.000",
+          "dataElement": "a3kGcGDCuk6",
+          "value": "11",
+          "providedElsewhere": false
+        },
+        {
+          "lastUpdated": "2015-02-28T12:05:00.000",
+          "created": "2015-02-28T12:05:00.000",
+          "dataElement": "UXz7xuGCEhU",
+          "value": "3843",
+          "providedElsewhere": false
+        },
+        {
+          "lastUpdated": "2015-02-28T12:05:00.000",
+          "created": "2015-02-28T12:05:00.000",
+          "dataElement": "X8zyunlgUfM",
+          "value": "Replacement",
+          "providedElsewhere": false
+        }
+      ]
+    }
+  ]
+}