Merge pull request #161 from dhis2/develop

0.5-SNAPSHOT
dhis2 · Mar 18, 2018 · 600e4e4 · 600e4e4
2 parents aa82e33 + 097b348
commit 600e4e4
Show file tree

Hide file tree

Showing 259 changed files with 9,163 additions and 1,911 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,7 +26,7 @@ branches:
   - develop
 
 script:
-- travis_wait 60 "./build.sh"
+- travis_wait 70 "./build.sh"
 
 before_script:
 - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a

diff --git a/build.gradle b/build.gradle
@@ -54,8 +54,8 @@ ext {
             buildToolsVersion: "25.0.2",
             minSdkVersion    : 15,
             targetSdkVersion : 25,
-            versionCode      : 43_1,
-            versionName      : "0.4.3.1-SNAPSHOT"
+            versionCode      : 50,
+            versionName      : "0.5-SNAPSHOT"
     ]
 
     libraries = [

diff --git a/core/src/androidTest/assets/admin/data_values.json b/core/src/androidTest/assets/admin/data_values.json
@@ -0,0 +1,17 @@
+{
+  "dataValues": [
+    {
+      "dataElement": "g9eOBujte1U",
+      "period": "201712",
+      "orgUnit": "Rp268JB6Ne4",
+      "categoryOptionCombo": "Gmbgme7z9BF",
+      "attributeOptionCombo": "bRowv6yZOF2",
+      "value": "12",
+      "storedBy": "bodata1",
+      "created": "2011-01-11T00:00:00.000+0000",
+      "lastUpdated": "2011-01-11T00:00:00.000+0000",
+      "comment": "",
+      "followUp": false
+    }
+  ]
+}
diff --git a/core/src/androidTest/assets/admin/organisation_units.json b/core/src/androidTest/assets/admin/organisation_units.json
@@ -46,6 +46,11 @@
         {
           "id": "WSGAb5XwJ3Y"
         }
+      ],
+      "dataSets": [
+        {
+          "id": "lyLU2wR22tC"
+        }
       ]
     },
     {
@@ -94,6 +99,11 @@
         {
           "id": "WSGAb5XwJ3Y"
         }
+      ],
+      "dataSets": [
+        {
+          "id": "lyLU2wR22tC"
+        }
       ]
     }
   ]

diff --git a/core/src/androidTest/assets/data_sets.json b/core/src/androidTest/assets/data_sets.json
@@ -32,7 +32,21 @@
             "id": "g9eOBujte1U"
           }
         }
-      ]
+      ],
+      "indicators": [
+        {
+          "id": "ReUHfIn0pTQ"
+        }
+      ],
+      "access": {
+        "data": {
+          "write": true
+        }
+      },
+      "style": {
+        "color": "#000",
+        "icon": "my-icon-name"
+      }
     }
   ]
 }
diff --git a/core/src/androidTest/assets/data_values.json b/core/src/androidTest/assets/data_values.json
@@ -0,0 +1,17 @@
+{
+  "dataValues": [
+    {
+      "dataElement": "g9eOBujte1U",
+      "period": "201712",
+      "orgUnit": "DiszpKrYNg8",
+      "categoryOptionCombo": "Gmbgme7z9BF",
+      "attributeOptionCombo": "bRowv6yZOF2",
+      "value": "12",
+      "storedBy": "bodata1",
+      "created": "2011-01-11T00:00:00.000+0000",
+      "lastUpdated": "2011-01-11T00:00:00.000+0000",
+      "comment": "",
+      "followUp": false
+    }
+  ]
+}
diff --git a/core/src/androidTest/assets/indicator_types.json b/core/src/androidTest/assets/indicator_types.json
@@ -0,0 +1,13 @@
+{
+  "indicatorTypes": [
+    {
+      "created": "2011-12-24T12:24:22.592",
+      "lastUpdated": "2013-03-15T16:08:57.670",
+      "name": "Per cent",
+      "id": "bWuNrMHEoZ0",
+      "displayName": "Per cent",
+      "number": false,
+      "factor": 100
+    }
+  ]
+}
diff --git a/core/src/androidTest/assets/indicators.json b/core/src/androidTest/assets/indicators.json
@@ -0,0 +1,24 @@
+{
+  "indicators": [
+    {
+      "code": "IN_52462",
+      "lastUpdated": "2013-03-21T11:17:44.926",
+      "id": "ReUHfIn0pTQ",
+      "created": "2012-11-05T09:16:29.054",
+      "name": "ANC 1-3 Dropout Rate",
+      "shortName": "ANC 1-3 Dropout Rate",
+      "displayName": "ANC 1-3 Dropout Rate",
+      "description": "Indicates the percentage of clients dropping out between the 1st and the 3rd ANC visit. Calculated as the difference between ANC1 and ANC3 by the ANC 1 visits.",
+      "denominatorDescription": "Total 1st ANC visits",
+      "numeratorDescription": "ANC1-ANC3",
+      "displayDescription": "Indicates the percentage of clients dropping out between the 1st and the 3rd ANC visit. Calculated as the difference between ANC1 and ANC3 by the ANC 1 visits.",
+      "url": "",
+      "numerator": "#{fbfJHSPpUQD.pq2XI5kz2BY}+#{fbfJHSPpUQD.PT59n8BQbqM}-#{Jtf34kNZhzP.pq2XI5kz2BY}-#{Jtf34kNZhzP.PT59n8BQbqM}",
+      "denominator": "#{fbfJHSPpUQD.pq2XI5kz2BY}+#{fbfJHSPpUQD.PT59n8BQbqM}",
+      "annualized": false,
+      "indicatorType": {
+        "id": "bWuNrMHEoZ0"
+      }
+    }
+  ]
+}
diff --git a/core/src/androidTest/assets/organisationUnits.json b/core/src/androidTest/assets/organisationUnits.json
@@ -49,6 +49,11 @@
         {
           "id": "fDd25txQckK"
         }
+      ],
+      "dataSets": [
+        {
+          "id": "lyLU2wR22tC"
+        }
       ]
     }
   ]

diff --git a/core/src/androidTest/assets/programs.json b/core/src/androidTest/assets/programs.json
@@ -22,6 +22,11 @@
       "selectEnrollmentDatesInFuture": false,
       "registration": false,
       "useFirstStageDuringRegistration": false,
+      "access": {
+        "data": {
+          "write": true
+        }
+      },
       "programRuleVariables": [
         {
           "created": "2016-04-12T15:57:18.645",
@@ -270,6 +275,11 @@
       "selectEnrollmentDatesInFuture": false,
       "registration": true,
       "useFirstStageDuringRegistration": true,
+      "access": {
+        "data": {
+          "write": true
+        }
+      },
       "trackedEntity": {
         "id": "nEenWmSyUEp"
       },
@@ -1429,6 +1439,11 @@
       "selectEnrollmentDatesInFuture": false,
       "registration": false,
       "useFirstStageDuringRegistration": false,
+      "access": {
+        "data": {
+          "write": true
+        }
+      },
       "programRuleVariables": [],
       "programTrackedEntityAttributes": [],
       "programIndicators": [],
@@ -1679,6 +1694,11 @@
       "selectEnrollmentDatesInFuture": false,
       "registration": false,
       "useFirstStageDuringRegistration": false,
+      "access": {
+        "data": {
+          "write": true
+        }
+      },
       "programRuleVariables": [],
       "programTrackedEntityAttributes": [],
       "programIndicators": [],
@@ -1924,6 +1944,11 @@
       "selectEnrollmentDatesInFuture": false,
       "registration": false,
       "useFirstStageDuringRegistration": false,
+      "access": {
+        "data": {
+          "write": true
+        }
+      },
       "programRuleVariables": [
         {
           "created": "2015-08-07T18:38:12.931",
@@ -2786,6 +2811,11 @@
       "selectEnrollmentDatesInFuture": false,
       "registration": false,
       "useFirstStageDuringRegistration": false,
+      "access": {
+        "data": {
+          "write": true
+        }
+      },
       "programRuleVariables": [],
       "programTrackedEntityAttributes": [],
       "programIndicators": [
@@ -2947,6 +2977,11 @@
       "selectEnrollmentDatesInFuture": false,
       "registration": false,
       "useFirstStageDuringRegistration": false,
+      "access": {
+        "data": {
+          "write": true
+        }
+      },
       "programRuleVariables": [],
       "programTrackedEntityAttributes": [],
       "programIndicators": [],
@@ -3109,6 +3144,11 @@
       "selectEnrollmentDatesInFuture": false,
       "registration": true,
       "useFirstStageDuringRegistration": false,
+      "access": {
+        "data": {
+          "write": true
+        }
+      },
       "trackedEntity": {
         "id": "nEenWmSyUEp"
       },
@@ -5127,6 +5167,11 @@
       "selectEnrollmentDatesInFuture": false,
       "registration": true,
       "useFirstStageDuringRegistration": false,
+      "access": {
+        "data": {
+          "write": true
+        }
+      },
       "trackedEntity": {
         "id": "nEenWmSyUEp"
       },
@@ -7402,6 +7447,11 @@
       "selectEnrollmentDatesInFuture": false,
       "registration": true,
       "useFirstStageDuringRegistration": false,
+      "access": {
+        "data": {
+          "write": true
+        }
+      },
       "trackedEntity": {
         "id": "nEenWmSyUEp"
       },
@@ -8735,6 +8785,11 @@
       "selectEnrollmentDatesInFuture": false,
       "registration": true,
       "useFirstStageDuringRegistration": false,
+      "access": {
+        "data": {
+          "write": true
+        }
+      },
       "trackedEntity": {
         "id": "nEenWmSyUEp"
       },

diff --git a/core/src/androidTest/assets/programs_complete.json b/core/src/androidTest/assets/programs_complete.json
@@ -29,6 +29,15 @@
           "selectEnrollmentDatesInFuture": false,
           "registration": true,
           "useFirstStageDuringRegistration": true,
+          "access": {
+              "data": {
+                  "write": false
+              }
+          },
+          "style": {
+              "color": "#fff",
+              "icon": "my-icon-name"
+          },
           "trackedEntity": {
               "id": "nEenWmSyUEp"
           },
@@ -103,7 +112,24 @@
                       "inherit": false,
                       "unique": false,
                       "valueType": "TEXT",
-                      "orgunitScope": false
+                      "orgunitScope": false,
+                      "renderType": {
+                          "DESKTOP": {
+                              "type": "SPINNER",
+                              "min": 5,
+                              "max": 600,
+                              "step": 4,
+                              "decimalPoints": 3
+                          },
+                          "MOBILE": {
+                              "type": "SLIDER",
+                              "min": 555,
+                              "max": 88888,
+                              "step": 77,
+                              "decimalPoints": 1
+                          }
+                      }
+
                   }
               },
               {
@@ -585,7 +611,22 @@
                           }
                       }
                   ],
-                  "programStageSections": [ ]
+                  "programStageSections": [
+                      {
+                          "id": "OeSqs7pkKqI",
+                          "dataElements": [
+
+                          ],
+                          "renderType": {
+                              "DESKTOP": {
+                                  "type": "SEQUENTIAL"
+                              },
+                              "MOBILE": {
+                                  "type": "MATRIX"
+                              }
+                          }
+                      }
+                  ]
               },
               {
                   "lastUpdated": "2015-08-06T20:16:48.321",

diff --git a/core/src/androidTest/assets/tracked_entities.json b/core/src/androidTest/assets/tracked_entities.json
@@ -1,5 +1,5 @@
 {
-  "trackedEntities": [
+  "trackedEntityTypes": [
     {
       "lastUpdated": "2015-10-14T13:36:53.063",
       "created": "2014-08-20T12:28:56.409",

diff --git a/core/src/androidTest/assets/tracked_entity_instance.json b/core/src/androidTest/assets/tracked_entity_instance.json
@@ -1,5 +1,5 @@
 {
-  "trackedEntity": "nEenWmSyUEp",
+  "trackedEntityType": "nEenWmSyUEp",
   "orgUnit": "DiszpKrYNg8",
   "trackedEntityInstance": "PgmUFEQYZdt",
   "deleted": false,

diff --git a/core/src/androidTest/assets/tracked_entity_instance_2.json b/core/src/androidTest/assets/tracked_entity_instance_2.json
@@ -1,5 +1,5 @@
 {
-  "trackedEntity": "nEenWmSyUEp",
+  "trackedEntityType": "nEenWmSyUEp",
   "orgUnit": "DiszpKrYNg8",
   "trackedEntityInstance": "IaxoagO9899",
   "deleted": false,

diff --git a/core/src/androidTest/assets/tracked_entity_instance_with_removed_data.json b/core/src/androidTest/assets/tracked_entity_instance_with_removed_data.json
@@ -1,5 +1,5 @@
 {
-  "trackedEntity": "nEenWmSyUEp",
+  "trackedEntityType": "nEenWmSyUEp",
   "orgUnit": "DiszpKrYNg8",
   "trackedEntityInstance": "PgmUFEQYZdt",
   "deleted": false,
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,6 +49,11 @@ @@
             {
               "id": "fDd25txQckK"
             }
+          ],
+          "dataSets": [
+            {
+              "id": "lyLU2wR22tC"
+            }
           ]
         }
       ]
@@ Expand Down @@