Opensrp-client-chw changes

build.gradle

@@ -54,7 +54,13 @@ allprojects {
         maven { url 'https://maven.fabric.io/public' }
         maven { url "https://s3.amazonaws.com/repo.commonsware.com" }
         maven { url 'https://nexus.pentaho.org/content/groups/omni/' }
-        maven { url 'https://dl.bintray.com/ibm-watson-health/ibm-fhir-server-releases' }
+        maven {
+            url 'https://dl.bintray.com/ibm-watson-health/ibm-fhir-server-releases'
+            content {
+                // Does only include this group
+                includeGroup "com.ibm.fhir"
+            }
+        }
     }
 }
 

opensrp-chw/build.gradle

@@ -39,6 +39,7 @@ allprojects {
     }
 }
 
+
 apply plugin: 'com.android.application'
 apply plugin: 'jacoco'
 apply plugin: 'com.github.kt3k.coveralls'
@@ -61,8 +62,14 @@ android {
         checkReleaseBuilds false
         abortOnError false
     }
+    defaultConfig {
+        // Required when setting minSdkVersion to 20 or lower
+        multiDexEnabled true
+    }
 
     compileOptions {
+        coreLibraryDesugaringEnabled true
+
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -142,9 +149,6 @@ android {
             minifyEnabled false
             zipAlignEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '500'
-            buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '500'
-            buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
             buildConfigField "boolean", "TIME_CHECK", "true"
             buildConfigField "int", "DATA_SYNC_DURATION_MINUTES", '15'
             buildConfigField "int", "VACCINE_SYNC_PROCESSING_MINUTES", '30'
@@ -157,12 +161,10 @@ android {
             buildConfigField "int", "STOCK_USAGE_REPORT_MINUTES", '1440'
             buildConfigField "boolean", "USE_UNIFIED_REFERRAL_APPROACH", "true"
             buildConfigField "boolean", "BUILD_FOR_BORESHA_AFYA_SOUTH", "false"
+            buildConfigField "boolean", "LOG_CRASHLYTICS", "true"
         }
 
         debug {
-            buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '30'
-            buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '15'
-            buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
             buildConfigField "boolean", "TIME_CHECK", "false"
             buildConfigField "int", "DATA_SYNC_DURATION_MINUTES", '15'
             buildConfigField "int", "VACCINE_SYNC_PROCESSING_MINUTES", '30'
@@ -175,8 +177,14 @@ android {
             buildConfigField "int", "STOCK_USAGE_REPORT_MINUTES", '1440'
             buildConfigField "boolean", "USE_UNIFIED_REFERRAL_APPROACH", "true"
             buildConfigField "boolean", "BUILD_FOR_BORESHA_AFYA_SOUTH", "false"
+            buildConfigField "boolean", "LOG_CRASHLYTICS", "false"
             testCoverageEnabled true
         }
+
+        preview {
+            initWith debug
+            buildConfigField "boolean", "LOG_CRASHLYTICS", "true"
+        }
     }
 
     packagingOptions {
@@ -203,6 +211,7 @@ android {
             returnDefaultValues = true
             includeAndroidResources = true
         }
+
         unitTests.all {
             systemProperty 'robolectric.enabledSdks', '28'
             jvmArgs '-noverify'
@@ -223,6 +232,9 @@ android {
             applicationIdSuffix ".ba"
             versionCode 8
             versionName "1.0.8"
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '10000'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '10000'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
             buildConfigField "String", 'opensrp_url', '"https://boresha-afya.smartregister.org/opensrp/"'
             buildConfigField "String", 'guidebooks_url', '"https://opensrp.s3.amazonaws.com/media/ba/"'
             buildConfigField "String", 'opensrp_url_debug', '"https://boresha-afya-stage.smartregister.org/opensrp/"'
@@ -239,6 +251,9 @@ android {
             applicationIdSuffix ".chad"
             versionCode 3
             versionName "1.0.3"
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '10000'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '10000'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
             buildConfigField "String", 'opensrp_url', '"https://wcaro-td.smartregister.org/opensrp/"'
             buildConfigField "String", 'guidebooks_url', '"https://opensrp.s3.amazonaws.com/media/chad/"'
             buildConfigField "String", 'opensrp_url_debug', '"https://wcaro-stage.smartregister.org/opensrp/"'
@@ -257,6 +272,9 @@ android {
             applicationIdSuffix ".drc"
             versionCode 11
             versionName "1.0.16"
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '10000'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '10000'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
             buildConfigField "String", 'opensrp_url', '"https://wcaro-cd.smartregister.org/opensrp/"'
             buildConfigField "String", 'guidebooks_url', '"https://opensrp.s3.amazonaws.com/media/drc/"'
             buildConfigField "String", 'opensrp_url_preview', '"https://wcaro-cd-preview.smartregister.org/opensrp/"'
@@ -275,6 +293,7 @@ android {
             applicationIdSuffix ".guinea"
             versionCode 4
             versionName "1.0.3"
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '1000'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '500'
             buildConfigField "String", 'opensrp_url', '"https://wcaro-guinea.smartregister.org/opensrp/"'
@@ -295,6 +314,7 @@ android {
             applicationIdSuffix ".togo"
             versionCode 26
             versionName "1.2.7"
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '1000'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '500'
             buildConfigField "String", 'opensrp_url', '"https://wcaro-tg.smartregister.org/opensrp/"'
@@ -313,6 +333,9 @@ android {
             dimension = 'baseDimension'
             versionCode 8
             versionName "1.0.1"
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '10000'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '10000'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
             buildConfigField "String", 'opensrp_url', '"https://wcaro-lr.smartregister.org/opensrp/"'
             buildConfigField "String", 'guidebooks_url', '"https://opensrp.s3.amazonaws.com/media/liberia/"'
             buildConfigField "String", 'opensrp_url_debug', '"https://wcaro-stage.smartregister.org/opensrp/"'
@@ -328,17 +351,20 @@ android {
         lmh {
             dimension = 'baseDimension'
             applicationIdSuffix ".lmh"
-            versionCode 2
-            versionName "0.1.7"
-            buildConfigField "String", 'opensrp_url', '"https://lmh-liberia.smartregister.org/opensrp/"'
+            versionCode 7
+            versionName "2.0.3"
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '10000'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '10000'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '1'
+            buildConfigField "String", 'opensrp_url', '"https://liberiavts.smartregister.org/opensrp/"'
             buildConfigField "String", 'guidebooks_url', '"https://opensrp.s3.amazonaws.com/media/lmh/"'
-            buildConfigField "String", 'opensrp_url_debug', '"https://lmh-stage.smartregister.org/opensrp/"'
+            buildConfigField "String", 'opensrp_url_debug', '"https://lmh-liberia-preview.smartregister.org/opensrp/"'
             buildConfigField "String[]", "LOCATION_HIERACHY", '{"Country" , "County" , "District", "Clinics", "CHSS", "Village","Commune"}'
             buildConfigField "String[]", "ALLOWED_LOCATION_LEVELS", '{"Country" , "County" , "District", "Clinics", "CHSS", "Village","Commune"}'
-            buildConfigField "String[]", "ALLOWED_LOCATION_LEVELS_DEBUG", '{"Clinic" , "CHSS" , "CHA"}'
+            buildConfigField "String[]", "ALLOWED_LOCATION_LEVELS_DEBUG", '{"Country" , "County" , "District", "Clinics", "CHSS", "Village","Commune"}'
             buildConfigField "String", 'DEFAULT_LOCATION', '"Commune"'
-            buildConfigField "String", 'DEFAULT_LOCATION_DEBUG', '"CHA"'
-            buildConfigField "int", "DATABASE_VERSION", '6'
+            buildConfigField "String", 'DEFAULT_LOCATION_DEBUG', '"Commune"'
+            buildConfigField "int", "DATABASE_VERSION", '7'
         }
     }
 
@@ -348,7 +374,11 @@ android {
 }
 
 dependencies {
-    implementation('org.smartregister:opensrp-client-chw-core:2.1.3-SNAPSHOT@aar') {
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+
+    implementation('com.google.android.gms:play-services-vision:17.0.2')
+
+    implementation('org.smartregister:opensrp-client-chw-core:2.1.4-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.android.support', module: 'appcompat-v7'
         exclude group: 'androidx.legacy', module: 'legacy-support-v4'
@@ -379,6 +409,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     androidTestImplementation 'org.mockito:mockito-android:3.0.0'
 
+    //implementation 'com.github.lecho:hellocharts-android:1.5.8@aar'
     //For viewing PDFs in the app
     implementation 'com.github.barteksc:android-pdf-viewer:3.2.0-beta.1'
 
@@ -391,6 +422,15 @@ dependencies {
     testImplementation 'org.robolectric:shadows-multidex:4.3.1'
     testImplementation 'org.robolectric:shadows-support-v4:3.4-rc2'
     testImplementation 'androidx.test:core:1.3.0'
+    //  testImplementation 'com.ibm.fhir:fhir-model:4.7.0'
+    // testImplementation 'com.ibm.fhir:fhir-path:4.7.0'
+
+    // unit test
+    def powerMockVersion = '2.0.7'
+    testImplementation "org.powermock:powermock-module-junit4:$powerMockVersion"
+    testImplementation "org.powermock:powermock-module-junit4-rule:$powerMockVersion"
+    testImplementation "org.powermock:powermock-api-mockito2:$powerMockVersion"
+    testImplementation "org.powermock:powermock-classloading-xstream:$powerMockVersion"
 }
 
 def flavors = android.productFlavors.collect { flavor -> flavor.name }
@@ -430,6 +470,11 @@ task jacocoTestReport(type: JacocoReport, dependsOn: [
 tasks.withType(Test) {
     jacoco.includeNoLocationClasses = true
     maxHeapSize = "3g"
+
+    testLogging {
+        events "failed"
+        exceptionFormat "full"
+    }
 }
 
 tasks.coveralls {
@@ -439,4 +484,4 @@ tasks.coveralls {
 coveralls {
     jacocoReportPath = "${buildDir}/reports/jacoco/jacocoRootReport/merged.xml"
     sourceDirs = ["$project.projectDir/src/main/java"]
-}
+}

opensrp-chw/src/ba/java/org/smartregister/chw/custom_view/FamilyFloatingMenuFlv.java

@@ -0,0 +1,4 @@
+package org.smartregister.chw.custom_view;
+
+public class FamilyFloatingMenuFlv extends DefaultFamilyFloatingMenuFlv {
+}

opensrp-chw/src/ba/java/org/smartregister/chw/custom_view/NavigationMenuFlv.java

@@ -6,7 +6,6 @@
 import org.apache.commons.lang3.tuple.Pair;
 import org.smartregister.chw.core.activity.CoreStockInventoryReportActivity;
 import org.smartregister.chw.core.activity.HIA2ReportsActivity;
-import org.smartregister.chw.core.custom_views.NavigationMenu;
 import org.smartregister.chw.core.utils.CoreConstants;
 import org.smartregister.chw.referral.util.Constants;
 
@@ -15,7 +14,7 @@
 import java.util.List;
 import java.util.Locale;
 
-public class NavigationMenuFlv implements NavigationMenu.Flavour {
+public class NavigationMenuFlv extends DefaultNavigationMenuFlv {
 
     @Override
     public List<Pair<String, Locale>> getSupportedLanguages() {

opensrp-chw/src/ba/java/org/smartregister/chw/interactor/PncHomeVisitInteractorFlv.java

@@ -759,7 +759,7 @@ protected void evaluateImmunization(Person baby) throws Exception {
                         .withBaseEntityID(baby.getBaseEntityID())
                         .withProcessingMode(BaseAncHomeVisitAction.ProcessingMode.SEPARATE)
                         .withDestinationFragment(BaseHomeVisitImmunizationFragment.getInstance(view, baby.getBaseEntityID(), details, displays))
-                        .withHelper(new ImmunizationActionHelper(context, wrappers))
+                        .withHelper(new ImmunizationActionHelper(context, () -> wrappers))
                         .build();
                 actionList.put(MessageFormat.format(context.getString(R.string.pnc_immunization_at_birth), baby.getFullName()), action);
 

opensrp-chw/src/chad/java/org/smartregister/chw/custom_view/FamilyFloatingMenuFlv.java

@@ -0,0 +1,4 @@
+package org.smartregister.chw.custom_view;
+
+public class FamilyFloatingMenuFlv extends DefaultFamilyFloatingMenuFlv {
+}

opensrp-chw/src/drc/java/org/smartregister/chw/custom_view/FamilyFloatingMenuFlv.java

@@ -0,0 +1,4 @@
+package org.smartregister.chw.custom_view;
+
+public class FamilyFloatingMenuFlv extends DefaultFamilyFloatingMenuFlv {
+}

opensrp-chw/src/guinea/java/org/smartregister/chw/custom_view/FamilyFloatingMenuFlv.java

@@ -0,0 +1,4 @@
+package org.smartregister.chw.custom_view;
+
+public class FamilyFloatingMenuFlv extends DefaultFamilyFloatingMenuFlv {
+}

opensrp-chw/src/liberia/java/org/smartregister/chw/custom_view/FamilyFloatingMenuFlv.java

@@ -0,0 +1,4 @@
+package org.smartregister.chw.custom_view;
+
+public class FamilyFloatingMenuFlv extends DefaultFamilyFloatingMenuFlv {
+}

opensrp-chw/src/lmh/assets/json.form/child_enrollment.json

@@ -87,6 +87,7 @@
         "openmrs_entity_id": "first_name",
         "openmrs_data_type": "text",
         "type": "edit_text",
+        "edit_type": "name",
         "hint": "{{child_enrollment.step1.first_name.hint}}",
         "expanded": false,
         "v_required": {
@@ -105,6 +106,7 @@
         "openmrs_entity_id": "middle_name",
         "openmrs_data_type": "text",
         "type": "edit_text",
+        "edit_type": "name",
         "hint": "{{child_enrollment.step1.middle_name.hint}}",
         "expanded": false,
         "v_regex": {
@@ -206,11 +208,18 @@
         "openmrs_entity_parent": "",
         "openmrs_entity": "person",
         "openmrs_entity_id": "gender",
-        "type": "spinner",
+        "type": "native_radio",
         "hint": "{{child_enrollment.step1.gender.hint}}",
-        "values": [
-          "{{child_enrollment.step1.gender.values[0]}}",
-          "{{child_enrollment.step1.gender.values[1]}}"
+        "label": "{{child_enrollment.step1.gender.hint}}",
+        "options": [
+          {
+            "key": "{{child_enrollment.step1.gender.values[0]}}",
+            "text": "{{child_enrollment.step1.gender.values[0]}}"
+          },
+          {
+            "key": "{{child_enrollment.step1.gender.values[1]}}",
+            "text": "{{child_enrollment.step1.gender.values[1]}}"
+          }
         ],
         "v_required": {
           "value": "true",

opensrp-chw/src/lmh/assets/json.form/family_member_register.json

@@ -206,11 +206,18 @@
         "openmrs_entity_parent": "",
         "openmrs_entity": "person",
         "openmrs_entity_id": "gender",
-        "type": "spinner",
+        "type": "native_radio",
+        "label": "{{family_member_register.step1.sex.hint}}",
         "hint": "{{family_member_register.step1.sex.hint}}",
-        "values": [
-          "{{family_member_register.step1.sex.values[0]}}",
-          "{{family_member_register.step1.sex.values[1]}}"
+        "options": [
+          {
+            "key":  "{{family_member_register.step1.sex.values[0]}}",
+            "text":  "{{family_member_register.step1.sex.values[0]}}"
+          },
+          {
+            "key": "{{family_member_register.step1.sex.values[1]}}",
+            "text":"{{family_member_register.step1.sex.values[1]}}"
+          }
         ],
         "v_required": {
           "value": "true",

opensrp-chw/src/lmh/assets/json.form/family_register.json

@@ -1,5 +1,5 @@
 {
-  "validate_on_submit": true,
+  "validate_on_submit": false,
   "show_errors_on_submit": false,
   "count": "2",
   "encounter_type": "Family Registration",
@@ -80,7 +80,8 @@
         "openmrs_entity": "person_identifier",
         "openmrs_entity_id": "opensrp_id",
         "hidden": "true",
-        "type": "barcode",
+        "type": "edit_text",
+        "value": "0",
         "barcode_type": "qrcode",
         "hint": "{{family_register.step1.unique_id.hint}}",
         "scanButtonText": "{{family_register.step1.unique_id.scanButtonText}}",
@@ -95,6 +96,7 @@
         "openmrs_entity": "person_address",
         "openmrs_entity_id": "cityVillage",
         "type": "edit_text",
+        "edit_type": "name",
         "hint": "{{family_register.step1.village_town.hint}}",
         "v_required": {
           "value": "true",
@@ -257,11 +259,18 @@
         "openmrs_entity_parent": "",
         "openmrs_entity": "person",
         "openmrs_entity_id": "gender",
-        "type": "spinner",
+        "type": "native_radio",
+        "label": "{{family_register.step2.sex.hint}}",
         "hint": "{{family_register.step2.sex.hint}}",
-        "values": [
-          "{{family_register.step2.sex.values[0]}}",
-          "{{family_register.step2.sex.values[1]}}"
+        "options": [
+          {
+            "key":  "{{family_register.step2.sex.values[0]}}",
+            "text":  "{{family_register.step2.sex.values[0]}}"
+          },
+          {
+            "key": "{{family_register.step2.sex.values[1]}}",
+            "text": "{{family_register.step2.sex.values[1]}}"
+          }
         ],
         "v_required": {
           "value": "true",