Merge pull request #27 from OpenSRP/implement-child-registration

Unicef Tunisia first deliverable
opensrp · Sep 1, 2020 · 9d0e721 · 9d0e721
2 parents fce1cda + 6accf8d
commit 9d0e721
Show file tree

Hide file tree

Showing 87 changed files with 4,217 additions and 2,623 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 
-[![Build Status](https://travis-ci.org/OpenSRP/opensrp-client-unicef-tunisia.svg?branch=master)](https://travis-ci.org/OpenSRP/opensrp-client-unicef-tunisia)
+[![Build Status](https://travis-ci.com/OpenSRP/opensrp-client-unicef-tunisia.svg?branch=master)](https://travis-ci.com/OpenSRP/opensrp-client-unicef-tunisia)
 &nbsp;[![Coverage Status](https://coveralls.io/repos/github/OpenSRP/opensrp-client-unicef-tunisia/badge.svg?branch=master)](https://coveralls.io/github/OpenSRP/opensrp-client-unicef-tunisia?branch=master)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/4a58cd4e1748432780ac66a9fbee0394)](https://www.codacy.com/app/OpenSRP/opensrp-client-unicef-tunisia?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=OpenSRP/opensrp-client-unicef-tunisia&amp;utm_campaign=Badge_Grade) 
 

diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,6 @@ buildscript {
     }
 }
 
-
 allprojects {
     repositories {
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }

diff --git a/opensrp-unicef-tunisia/build.gradle b/opensrp-unicef-tunisia/build.gradle
@@ -21,7 +21,6 @@ jacoco {
     toolVersion = jacocoVersion
 }
 
-
 android {
     useLibrary 'org.apache.http.legacy'
     compileSdkVersion androidCompileSdkVersion
@@ -32,14 +31,14 @@ android {
         minSdkVersion androidMinSdkVersion
         targetSdkVersion androidTargetSdkVersion
         versionCode 1
-        versionName "0.0.1"
+        versionName "0.0.8"
         multiDexEnabled true
         buildConfigField "long", "MAX_SERVER_TIME_DIFFERENCE", "1800000l"
         buildConfigField "boolean", "TIME_CHECK", "false"
-        buildConfigField "String", "SYNC_TYPE", '"teamId"'
+        buildConfigField "String", "SYNC_TYPE", '"location"'
         buildConfigField "int", "MAX_SYNC_RETRIES", '3'
         buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L"
-        buildConfigField "boolean", "IS_SYNC_SETTINGS", "true"
+        buildConfigField "boolean", "IS_SYNC_SETTINGS", "false"
         buildConfigField "long", "EVENT_VERSION", System.currentTimeMillis() + "L"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -86,7 +85,7 @@ android {
             buildConfigField "int", "CLIENT_SETTINGS_SYNC_MINUTES", '15'
             buildConfigField "int", "GROWTH_MONITORING_SYNC_TIME", '15'
             buildConfigField "String[]", "LOCATION_LEVELS", '{"Country", "Region", "District", "Delegation", "Health Facility"}'
-            buildConfigField "String[]", "HEALTH_FACILITY_LEVELS", '{"Country", "Region", "District", "Delegation", "Health Facility", "Village"}'
+            buildConfigField "String[]", "HEALTH_FACILITY_LEVELS", '{"Country", "Region", "District", "Delegation", "Health Facility"}'
             buildConfigField "String", 'DEFAULT_LOCATION', '"Health Facility"'
         }
 
@@ -109,7 +108,7 @@ android {
             buildConfigField "int", "CLIENT_SETTINGS_SYNC_MINUTES", '15'
             buildConfigField "int", "GROWTH_MONITORING_SYNC_TIME", '15'
             buildConfigField "String[]", "LOCATION_LEVELS", '{"Country", "Region", "District", "Delegation", "Health Facility"}'
-            buildConfigField "String[]", "HEALTH_FACILITY_LEVELS", '{"Country", "Region", "District", "Delegation", "Health Facility", "Village"}'
+            buildConfigField "String[]", "HEALTH_FACILITY_LEVELS", '{"Country", "Region", "District", "Delegation", "Health Facility"}'
             buildConfigField "String", 'DEFAULT_LOCATION', '"Health Facility"'
             testCoverageEnabled true
         }
@@ -139,7 +138,7 @@ android {
             buildConfigField "int", "CLIENT_SETTINGS_SYNC_MINUTES", '15'
             buildConfigField "int", "GROWTH_MONITORING_SYNC_TIME", '15'
             buildConfigField "String[]", "LOCATION_LEVELS", '{"Country", "Region", "District", "Delegation", "Health Facility"}'
-            buildConfigField "String[]", "HEALTH_FACILITY_LEVELS", '{"Country", "Region", "District", "Delegation", "Health Facility", "Village"}'
+            buildConfigField "String[]", "HEALTH_FACILITY_LEVELS", '{"Country", "Region", "District", "Delegation", "Health Facility"}'
             buildConfigField "String", 'DEFAULT_LOCATION', '"Health Facility"'
         }
 
@@ -167,10 +166,9 @@ android {
             buildConfigField "int", "CLIENT_SETTINGS_SYNC_MINUTES", '15'
             buildConfigField "int", "GROWTH_MONITORING_SYNC_TIME", '15'
             buildConfigField "String[]", "LOCATION_LEVELS", '{"Country", "Region", "District", "Delegation", "Health Facility"}'
-            buildConfigField "String[]", "HEALTH_FACILITY_LEVELS", '{"Country", "Region", "District", "Delegation", "Health Facility", "Village"}'
+            buildConfigField "String[]", "HEALTH_FACILITY_LEVELS", '{"Country", "Region", "District", "Delegation", "Health Facility"}'
             buildConfigField "String", 'DEFAULT_LOCATION', '"Health Facility"'
         }
-
     }
 
     packagingOptions {
@@ -185,10 +183,8 @@ android {
         exclude 'META-INF/dependencies.txt'
         exclude 'META-INF/LGPL2.1'
         exclude 'LICENSE.txt'
-
     }
 
-
     testOptions {
         unitTests {
             returnDefaultValues = true
@@ -218,18 +214,19 @@ dependencies {
         exclude group: 'com.rengwuxian.materialedittext', module: 'library'
     }
 
-    implementation('org.smartregister:opensrp-client-child:0.3.1-SNAPSHOT@aar') {
+//    implementation(project(':opensrp-child')) {
+    implementation('org.smartregister:opensrp-client-child:0.3.4-ALPHA1-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'id.zelory', module: 'compressor'
         exclude group: 'org.smartregister', module: 'opensrp-client-core'
         exclude group: 'org.smartregister', module: 'opensrp-client-native-form'
-        exclude group: 'org.smartregister', module: 'opensrp-client-immunization'
+        exclude group: 'org.smartregister', module: 'opensrp-client-growth-monitoring'
         exclude group: 'org.smartregister', module: 'opensrp-client-configurable-views'
         exclude group: 'com.android.support', module: 'appcompat-v7'
     }
 
 
-    implementation('org.smartregister:opensrp-client-native-form:1.10.0-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-native-form:1.14.1-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'id.zelory', module: 'compressor'
         exclude group: 'com.android.support', module: 'recyclerview-v7'
@@ -242,17 +239,6 @@ dependencies {
         exclude group: 'io.ona.rdt-capture', module: 'lib'
     }
 
-
-    api('org.smartregister:opensrp-client-immunization:1.4.44-SNAPSHOT@aar') {
-        //api (project(':opensrp-immunization')) {
-        transitive = true
-        exclude group: 'id.zelory', module: 'compressor'
-        exclude group: 'org.smartregister', module: 'opensrp-client-core'
-        exclude group: 'org.smartregister', module: 'opensrp-client-native-form'
-        exclude group: 'com.android.support', module: 'design'
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-    }
-
     implementation('org.smartregister:opensrp-client-configurable-views:1.1.5-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'id.zelory', module: 'compressor'
@@ -264,7 +250,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-v4'
     }
 
-    implementation('org.smartregister:opensrp-client-growth-monitoring:1.1.22-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-growth-monitoring:1.1.23-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'id.zelory', module: 'compressor'
         exclude group: 'org.smartregister', module: 'opensrp-client-core'
@@ -273,7 +259,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'appcompat-v7'
     }
 
-    implementation('org.smartregister:opensrp-client-reporting:0.0.20-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-reporting:0.0.21-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'id.zelory', module: 'compressor'
         exclude group: 'org.smartregister', module: 'opensrp-client-core'
@@ -328,7 +314,6 @@ dependencies {
     }
     implementation group: 'io.fabric.sdk.android', name: 'fabric', version: '1.4.8'
 
-
 //    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.2'
 
     testImplementation 'junit:junit:4.13'

diff --git a/opensrp-unicef-tunisia/src/main/AndroidManifest.xml b/opensrp-unicef-tunisia/src/main/AndroidManifest.xml
@@ -10,9 +10,6 @@
     <uses-feature
         android:name="android.hardware.camera.autofocus"
         android:required="false" />
-    <uses-feature
-        android:name="android.hardware.nfc"
-        android:required="false" />
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -25,7 +22,7 @@
     <application
         android:name="org.smartregister.uniceftunisia.application.UnicefTunisiaApplication"
         android:allowBackup="false"
-        android:icon="@drawable/opensrp_logo"
+        android:icon="@drawable/logo_pnv"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
@@ -93,6 +90,11 @@
             android:screenOrientation="portrait"
             android:theme="@style/ChildTheme.NoActionBar"
             android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
+        <activity
+            android:name="com.vijay.jsonwizard.activities.JsonWizardFormActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/ChildTheme.NoActionBar"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
 
         <provider
             android:name="android.support.v4.content.FileProvider"
@@ -105,16 +107,17 @@
         </provider>
 
         <service android:name="org.smartregister.immunization.service.intent.VaccineIntentService" />
-        <service android:name="org.smartregister.immunization.service.intent.RecurringIntentService" />
         <service android:name="org.smartregister.immunization.service.intent.VaccineSchedulesUpdateIntentService" />
         <service android:name="org.smartregister.growthmonitoring.service.intent.ZScoreRefreshIntentService" />
         <service android:name="org.smartregister.growthmonitoring.service.intent.WeightIntentService" />
         <service android:name="org.smartregister.growthmonitoring.service.intent.HeightIntentService" />
+        <service android:name="org.smartregister.growthmonitoring.service.intent.WeightForHeightIntentService" />
         <service android:name="org.smartregister.sync.intent.PullUniqueIdsIntentService" />
         <service android:name="org.smartregister.sync.intent.ValidateIntentService" />
         <service android:name="org.smartregister.sync.intent.ExtendedSyncIntentService" />
         <service android:name="org.smartregister.sync.intent.SettingsSyncIntentService" />
         <service android:name="org.smartregister.sync.intent.SyncIntentService" />
+        <service android:name=".service.intent.ArchiveChildrenAgedAboveFiveIntentService" />
 
         <uses-library
             android:name="org.apache.http.legacy"

diff --git a/opensrp-unicef-tunisia/src/main/assets/app.properties b/opensrp-unicef-tunisia/src/main/assets/app.properties
@@ -14,10 +14,14 @@ home.toolbar.scan.qr.enabled=false
 home.toolbar.scan.card.enabled=false
 details.side.navigation.enabled=true
 monitor.height=true
+monitor.weight.for.height=true
 CAN_SAVE_INITIAL_SITE_SETTING=true
 mother.lookup.undo.duration=60000
 mother.lookup.show.results.duration=60000
-vaccine.expired.entry.allow=true
-disable.location.picker.view=true
+vaccine.expired.entry.allow=false
+disable.location.picker.view=false
 vaccine.expired.red=true
-SHOULD_ALLOW_ZERO_TALLIES=true
+SHOULD_ALLOW_ZERO_TALLIES=true
+vaccine.relaxation.days=7
+vaccine.requisite.date.constraint.enabled=true
+use.new.advance.search.approach=true
diff --git a/opensrp-unicef-tunisia/src/main/assets/ec_client_classification.json b/opensrp-unicef-tunisia/src/main/assets/ec_client_classification.json
@@ -13,6 +13,14 @@
               "ec_mother_details"
             ]
           },
+          {
+            "field": "eventType",
+            "field_value": "Father Registration",
+            "creates_case": [
+              "ec_client",
+              "ec_father_details"
+            ]
+          },
           {
             "field": "eventType",
             "field_value": "Birth Registration",
@@ -28,6 +36,30 @@
               "ec_client",
               "ec_child_details"
             ]
+          },
+          {
+            "field": "eventType",
+            "field_value": "Update Mother Details",
+            "creates_case": [
+              "ec_client",
+              "ec_mother_details"
+            ]
+          },
+          {
+            "field": "eventType",
+            "field_value": "Update Father Details",
+            "creates_case": [
+              "ec_client",
+              "ec_father_details"
+            ]
+          },
+          {
+            "field": "eventType",
+            "field_value": "archive_child_record",
+            "closes_case": [
+              "ec_client",
+              "ec_child_details"
+            ]
           }
         ]
       }