Merge pull request #237 from opensrp/dhis2-indicator-update

Dhis2 indicator update
opensrp · Nov 25, 2021 · 6a891a4 · 6a891a4
2 parents 69db5d3 + 53df9b5
commit 6a891a4
Show file tree

Hide file tree

Showing 17 changed files with 986 additions and 446 deletions.
diff --git a/opensrp-path-zeir/build.gradle b/opensrp-path-zeir/build.gradle
@@ -75,8 +75,8 @@ android {
     applicationVariants.all { variant ->
         if (variant.name == "debug") {
             variant.outputs.each { output ->
-                output.versionCodeOverride = 19
-                output.versionNameOverride = "0.0.19-debug"
+                output.versionCodeOverride = 30
+                output.versionNameOverride = "0.0.30-debug"
             }
         } else if (variant.name == "preview") {
             variant.outputs.each { output ->
@@ -149,7 +149,7 @@ android {
             buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '100'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
             buildConfigField "int", "VACCINE_SYNC_TIME", '0'
-            buildConfigField "int", "DATABASE_VERSION", '18'
+            buildConfigField "int", "DATABASE_VERSION", '19'
             buildConfigField "long", "MAX_SERVER_TIME_DIFFERENCE", "1800000l"
             buildConfigField "boolean", "TIME_CHECK", "true"
             buildConfigField "int", "DATA_SYNC_DURATION_MINUTES", '15'
@@ -259,7 +259,7 @@ dependencies {
     implementation "androidx.cardview:cardview:1.0.0"
 
 //    implementation(project(':opensrp-child')) {
-    implementation('org.smartregister:opensrp-client-child:0.7.1-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-child:0.7.2-PREVIEW-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'id.zelory', module: 'compressor'
         exclude group: 'org.smartregister', module: 'opensrp-client-growth-monitoring'
@@ -272,7 +272,7 @@ dependencies {
         exclude group: 'io.ona.rdt-capture', module: 'lib'
     }
 
-    implementation('org.smartregister:opensrp-client-immunization:3.0.10-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-immunization:4.0.2-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'org.smartregister', module: 'opensrp-client-core'
         exclude group: 'org.smartregister', module: 'opensrp-client-native-form'
@@ -305,7 +305,7 @@ dependencies {
         exclude group: 'com.github.lecho', module: 'hellocharts-library'
     }
 
-    implementation('org.smartregister:opensrp-client-reporting:0.0.22-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-reporting:0.1.5-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'id.zelory', module: 'compressor'
         exclude group: 'org.smartregister', module: 'opensrp-client-core'
@@ -327,7 +327,7 @@ dependencies {
         exclude group: 'com.ibm.fhir', module: 'fhir-model'
     }
 
-    implementation('org.smartregister:opensrp-client-native-form:2.1.3-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-native-form:2.1.9-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.android.support', module: 'recyclerview-v7'
         exclude group: 'com.android.support', module: 'appcompat-v7'

diff --git a/opensrp-path-zeir/src/main/assets/app.properties b/opensrp-path-zeir/src/main/assets/app.properties
@@ -22,7 +22,7 @@ mother.lookup.show.results.duration=60000
 vaccine.expired.entry.allow=true
 disable.location.picker.view=false
 vaccine.expired.red=true
-vaccine.relaxation.days=5
+vaccine.relaxation.days=10
 vaccine.requisite.date.constraint.enabled=true
 use.new.advance.search.approach=true
 multi.language.support=true

diff --git a/opensrp-path-zeir/src/main/assets/configs/reporting/extended-indicators.json b/opensrp-path-zeir/src/main/assets/configs/reporting/extended-indicators.json
@@ -3,153 +3,194 @@
     "indicator": "CHN1_005",
     "grouping": "report_group_header_under_5_attendance",
     "dependentCalculations": [
-      "CHN1_011"
+      "CHN1_025"
     ]
   },
   {
     "indicator": "CHN1_010",
     "grouping": "report_group_header_under_5_attendance",
     "dependentCalculations": [
-      "CHN1_011"
+      "CHN1_025"
     ]
   },
+
   {
-    "indicator": "CHN1_011",
+    "indicator": "CHN1_025",
     "grouping": "report_group_header_under_5_attendance",
-    "enteredManually": false,
+    "enteredManually": false
+  },
+  {
+    "indicator": "CHN2_005",
+    "grouping": "report_group_header_growth_nutrition",
     "dependentCalculations": [
-      "CHN1_025"
+      "CHN2_015"
     ]
   },
   {
-    "indicator": "CHN1_015",
-    "grouping": "report_group_header_under_5_attendance",
+    "indicator": "CHN2_010",
+    "grouping": "report_group_header_growth_nutrition",
+    "enteredManually": false,
     "dependentCalculations": [
-      "CHN1_021"
+      "CHN2_015"
     ]
   },
   {
-    "indicator": "CHN1_020",
-    "grouping": "report_group_header_under_5_attendance",
+    "indicator": "CHN2_015",
+    "grouping": "report_group_header_growth_nutrition",
+    "enteredManually": false
+  },
+
+  {
+    "indicator": "CHN2_020",
+    "grouping": "report_group_header_growth_nutrition",
     "dependentCalculations": [
-      "CHN1_021"
+      "CHN2_030"
     ]
   },
   {
-    "indicator": "CHN1_021",
-    "grouping": "report_group_header_under_5_attendance",
+    "indicator": "CHN2_025",
+    "grouping": "report_group_header_growth_nutrition",
     "enteredManually": false,
     "dependentCalculations": [
-      "CHN1_025"
+      "CHN2_030"
     ]
   },
+
   {
-    "indicator": "CHN1_025",
-    "grouping": "report_group_header_under_5_attendance",
+    "indicator": "CHN2_030",
+    "grouping": "report_group_header_growth_nutrition",
     "enteredManually": false
   },
+
+
+
   {
-    "indicator": "CHN2_005",
+    "indicator": "CHN2_035",
     "grouping": "report_group_header_growth_nutrition",
     "dependentCalculations": [
-      "CHN2_015"
+      "CHN2_045"
     ]
   },
   {
-    "indicator": "CHN2_010",
+    "indicator": "CHN2_040",
     "grouping": "report_group_header_growth_nutrition",
     "enteredManually": false,
     "dependentCalculations": [
-      "CHN2_015"
+      "CHN2_045"
     ]
   },
   {
-    "indicator": "CHN2_015",
+    "indicator": "CHN2_045",
     "grouping": "report_group_header_growth_nutrition",
     "enteredManually": false
   },
+
+
   {
-    "indicator": "CHN2_020",
+    "indicator": "CHN2_050",
     "grouping": "report_group_header_growth_nutrition",
     "dependentCalculations": [
-      "CHN2_030"
+      "CHN2_060"
     ]
   },
   {
-    "indicator": "CHN2_025",
+    "indicator": "CHN2_055",
     "grouping": "report_group_header_growth_nutrition",
     "enteredManually": false,
     "dependentCalculations": [
-      "CHN2_030"
+      "CHN2_060"
     ]
   },
   {
-    "indicator": "CHN2_030",
+    "indicator": "CHN2_060",
     "grouping": "report_group_header_growth_nutrition",
     "enteredManually": false
   },
+
   {
-    "indicator": "CHN2_035",
+    "indicator": "CHN2_065",
     "grouping": "report_group_header_growth_nutrition",
     "dependentCalculations": [
-      "CHN2_041"
+      "CHN2_075"
     ]
   },
   {
-    "indicator": "CHN2_040",
+    "indicator": "CHN2_070",
     "grouping": "report_group_header_growth_nutrition",
     "enteredManually": false,
     "dependentCalculations": [
-      "CHN2_041"
+      "CHN2_075"
     ]
   },
   {
-    "indicator": "CHN2_041",
+    "indicator": "CHN2_075",
     "grouping": "report_group_header_growth_nutrition",
     "enteredManually": false
   },
+
   {
-    "indicator": "CHN2_045",
+    "indicator": "CHN2_080",
     "grouping": "report_group_header_growth_nutrition",
     "dependentCalculations": [
-      "CHN2_051"
+      "CHN2_090"
     ]
   },
   {
-    "indicator": "CHN2_050",
+    "indicator": "CHN2_085",
     "grouping": "report_group_header_growth_nutrition",
     "enteredManually": false,
     "dependentCalculations": [
-      "CHN2_051"
+      "CHN2_090"
     ]
   },
   {
-    "indicator": "CHN2_051",
+    "indicator": "CHN2_090",
     "grouping": "report_group_header_growth_nutrition",
     "enteredManually": false
   },
+
   {
-    "indicator": "CHN2_055",
+    "indicator": "CHN2_095",
     "grouping": "report_group_header_growth_nutrition",
     "dependentCalculations": [
-      "CHN2_061"
+      "CHN2_105"
     ]
   },
   {
-    "indicator": "CHN2_060",
+    "indicator": "CHN2_100",
     "grouping": "report_group_header_growth_nutrition",
     "enteredManually": false,
     "dependentCalculations": [
-      "CHN2_061"
+      "CHN2_105"
     ]
   },
   {
-    "indicator": "CHN2_061",
+    "indicator": "CHN2_105",
     "grouping": "report_group_header_growth_nutrition",
     "enteredManually": false
   },
   {
-    "indicator": "CHN3_090",
+    "indicator": "CHN3_390",
+    "grouping": "report_group_header_immunisation",
+    "enteredManually": false
+  },
+  {
+    "indicator": "CHN3_395",
+    "grouping": "report_group_header_immunisation",
+    "enteredManually": false
+  },
+  {
+    "indicator": "CHN3_305",
+    "grouping": "report_group_header_immunisation",
+    "enteredManually": true
+  },
+  {
+    "indicator": "CHN3_310",
+    "grouping": "report_group_header_immunisation",
+    "enteredManually": true
+  },
+  {
+    "indicator": "CHN3_315",
     "grouping": "report_group_header_immunisation",
     "enteredManually": true
   }