Upstream merge and ec_client migrations

build.gradle

@@ -77,7 +77,7 @@ subprojects {
 
     ext.androidToolsBuildGradle = '30.0.3'
     ext.androidBuildToolsVersion = '30.0.3'
-    ext.androidMinSdkVersion = 21
+    ext.androidMinSdkVersion = 26
     ext.androidCompileSdkVersion = 31
     ext.androidTargetSdkVersion = 31
     ext.androidAnnotationsVersion = '3.0.1'

opensrp-anc/build.gradle

@@ -7,7 +7,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+//        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:7.0.4'
         classpath 'gradle.plugin.org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.12.0'
         classpath 'com.google.gms:google-services:4.3.14'
     }
@@ -181,7 +182,7 @@ tasks.withType(Test) {
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation('org.smartregister:opensrp-client-native-form:3.1.1-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-native-form:3.1.3-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.android.support', module: 'recyclerview-v7'
         exclude group: 'com.android.support', module: 'appcompat-v7'
@@ -192,7 +193,7 @@ dependencies {
         exclude group: 'org.yaml', module: 'snakeyaml'
         exclude group: 'io.ona.rdt-capture', module: 'lib'
     }
-    implementation('org.smartregister:opensrp-client-core:6.0.0-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-core:6.1.2-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.github.bmelnychuk', module: 'atv'
         exclude group: 'com.google.guava', module: 'guava'
@@ -208,7 +209,7 @@ dependencies {
         exclude group: 'org.smartregister', module: 'android-p2p-sync'
     }
 
-    api("org.smartregister:android-p2p-sync:0.4.0-DEV-SNAPSHOT") {
+    api("org.smartregister:android-p2p-sync:0.4.3-DEV-SNAPSHOT") {
         transitive = true
         exclude group: 'org.smartregister', module: 'opensrp-client-core'
         exclude group: 'com.android.support', module: 'appcompat-v7'
@@ -229,6 +230,7 @@ dependencies {
     implementation group: 'org.apache.commons', name: 'commons-text', version: '1.9'
     implementation 'junit:junit:4.12'
     implementation 'androidx.test:core:1.4.0'
+    testImplementation project(path: ':opensrp-anc')
     annotationProcessor 'com.jakewharton:butterknife:10.2.3'
     implementation 'net.zetetic:android-database-sqlcipher:4.4.0@aar'
     implementation 'commons-validator:commons-validator:1.7'

opensrp-anc/src/main/assets/config/attention-flags.yml

@@ -16,34 +16,34 @@ fields:
     relevance: "!prev_preg_comps.isEmpty() && !prev_preg_comps.contains('none') && !prev_preg_comps.contains('dont_know')"
 
   - template: "{{attention_flags.yellow.past_alcohol_substances_used}}: {substances_used_value}"
-    relevance: "substances_used != null && !substances_used.isEmpty() && (!substances_used.contains('none') && !substances_used.contains('None'))"
+    relevance: "!substances_used.isEmpty() && !substances_used.contains('none')"
 
-  - template: "{{attention_flags.yellow.pre_eclampsia_risk}}"
+  - template: "{{attention_flags.yellow.pre_eclampsia_risk}}: {{attention_flags.yes}}"
     relevance: "preeclampsia_risk == 1"
 
-  - template: "{{attention_flags.yellow.diabetes_risk}}"
+  - template: "{{attention_flags.yellow.diabetes_risk}}: {{attention_flags.yes}}"
     relevance: "gdm_risk == 1"
 
   - template: "{{attention_flags.yellow.surgeries}}: {surgeries_value}"
     relevance: "!surgeries.isEmpty() && !surgeries.contains('none')"
 
   - template: "{{attention_flags.yellow.chronic_health_conditions}}: {health_conditions_value}"
-    relevance: "!health_conditions.isEmpty() && !health_conditions.contains('none') && !health_conditions.contains('None') && !health_conditions.contains('dont_know')"
+    relevance: "!health_conditions.isEmpty() && !health_conditions.contains('none') && !health_conditions.contains('dont_know')"
 
-  - template: "{{attention_flags.yellow.high_daily_consumption_of_caffeine}}"
+  - template: "{{attention_flags.yellow.high_daily_consumption_of_caffeine}}: {{attention_flags.yes}}"
     relevance: "!caffeine_intake.isEmpty() && !caffeine_intake.contains('none')"
 
-  - template: "{{attention_flags.yellow.second_hand_exposure_to_tobacco_smoke}}"
-    relevance: "!shs_exposure.isEmpty() && shs_exposure.contains('yes')"
+  - template: "{{attention_flags.yellow.second_hand_exposure_to_tobacco_smoke}}: {shs_exposure_value}"
+    relevance: "shs_exposure == 'yes'"
 
   - template: "{{attention_flags.yellow.persistent_physiological_symptoms}}: {phys_symptoms_persist_value}"
     relevance: "!phys_symptoms_persist.isEmpty() && !phys_symptoms_persist.contains('none')"
 
-  - template: "{{attention_flags.yellow.reduced_or_no_fetal_movement_perceived_by_woman}}"
-    relevance: "!mat_percept_fetal_move.isEmpty() && mat_percept_fetal_move.contains('normal_fetal_move')"
+  - template: "{{attention_flags.yellow.reduced_or_no_fetal_movement_perceived_by_woman}}: {mat_percept_fetal_move_value}"
+    relevance: "mat_percept_fetal_move != '' && mat_percept_fetal_move != 'normal_fetal_move'"
 
   - template: "{{attention_flags.yellow.weight_category}}: {weight_cat_value}"
-    relevance: "!weight_cat.isEmpty() && (weight_cat.contains('underweight') || weight_cat.contains('Underweight') || weight_cat.contains('overweight') || weight_cat.contains('Overweight') || weight_cat.contains('obese') || weight_cat.contains('Obese'))"
+    relevance: "weight_cat != '' && (weight_cat == 'underweight' || weight_cat == 'overweight' || weight_cat == 'obese')"
 
   - template: "{{attention_flags.yellow.abnormal_breast_exam}}: {breast_exam_abnormal_value}"
     relevance: "!breast_exam_abnormal.contains('none') && !breast_exam_abnormal.isEmpty()"
@@ -54,20 +54,20 @@ fields:
   - template: "{{attention_flags.yellow.abnormal_pelvic_exam}}: {pelvic_exam_abnormal_value}"
     relevance: "!pelvic_exam_abnormal.contains('none') && !pelvic_exam_abnormal.isEmpty()"
 
-  - template: "{{attention_flags.yellow.oedema_present}}"
-    relevance: "!oedema.isEmpty() && oedema.contains('yes')"
+  - template: "{{attention_flags.yellow.oedema_present}}: {oedema_value}"
+    relevance: "oedema == 'yes'"
 
-  - template: "{{attention_flags.yellow.rh_factor_negative}}"
-    relevance: "!rh_factor.isEmpty() && rh_factor.contains('negative')"
+  - template: "{{attention_flags.yellow.rh_factor_negative}}: {rh_factor_value}"
+    relevance: "rh_factor == 'negative'"
 ---
 group: red_attention_flag
 fields:
 
   - template: "{{attention_flags.red.danger_sign}}: {danger_signs_value}"
-    relevance: "!danger_signs.isEmpty() && !danger_signs.contains('none') && !danger_signs.contains('None') && !danger_signs.contains('danger_none')"
+    relevance: "!danger_signs.isEmpty() && !danger_signs.contains('danger_none')"
 
-  - template: "{{attention_flags.red.occupation_informal_employment_sex_worker}}"
-    relevance: "!occupation.isEmpty() && occupation.contains('informal_employment_sex_worker')"
+  - template: "{{attention_flags.red.occupation_informal_employment_sex_worker}}: {{attention_flags.yes}}"
+    relevance: "occupation.contains('informal_employment_sex_worker')"
 
   - template: "{{attention_flags.red.no_of_pregnancies_lost_ended}}: {miscarriages_abortions}"
     relevance: "miscarriages_abortions >= 2"
@@ -79,17 +79,16 @@ fields:
     relevance: "{c_sections} >= 1"
 
   - template: "{{attention_flags.red.allergies}}: {allergies_value}"
-    relevance: "!allergies.isEmpty() && (!allergies.contains('none') || allergies.contains('None'))"
+    relevance: "!allergies.isEmpty() && !allergies.contains('none')"
 
-  - template: "{{attention_flags.red.tobacco_user_or_recently_quit}}"
-    relevance: "!tobacco_user.isEmpty() &&
-     (tobacco_user.contains('yes') || tobacco_user.contains('Yes') || tobacco_user.contains('recently_quit'))"
+  - template: "{{attention_flags.red.tobacco_user_or_recently_quit}}: {{attention_flags.yes}}"
+    relevance: "tobacco_user == 'yes' ||  tobacco_user == 'recently_quit'"
 
-  - template: "{{attention_flags.red.woman_and_her_partner_do_not_use_condoms}}"
-    relevance: "!condom_use.isEmpty() && (condom_use.contains('no') || condom_use.contains('No'))"
+  - template: "{{attention_flags.red.woman_and_her_partner_do_not_use_condoms}}: {{attention_flags.yes}}"
+    relevance: "condom_use == 'no'"
 
   - template: "{{attention_flags.red.alcohol_substances_currently_using}}: {alcohol_substance_use_value}"
-    relevance: "!alcohol_substance_use.isEmpty() && (!alcohol_substance_use.contains('none') && !alcohol_substance_use.contains('None'))"
+    relevance: "!alcohol_substance_use.isEmpty()  && !alcohol_substance_use.contains('none')"
 
   - template: "{{attention_flags.red.hypertension_diagnosis}}"
     relevance: "hypertension == 1"
@@ -109,10 +108,10 @@ fields:
   - template: "{{attention_flags.red.fever}}: {body_temp_repeat}ºC"
     relevance: "body_temp_repeat >= 38"
 
-  - template: "{{attention_flags.red.abnormal_pulse_rate}}: {pulse_rate_repeat}bpm"
+  - template: "{{attention_flags.red.abnormal_pulse_rate}}: {pulse_rate_repeat}kpm"
     relevance: "pulse_rate_repeat < 60 || pulse_rate_repeat > 100"
 
-  - template: "{{attention_flags.red.anaemia_diagnosis}}"
+  - template: "{{attention_flags.red.anaemia_diagnosis}} : {{attention_flags.yes}}"
     relevance: "anaemic == 1"
 
   - template: "{{attention_flags.red.respiratory_distress}}: {respiratory_exam_abnormal_value}"
@@ -128,48 +127,51 @@ fields:
     relevance: "dilation_cm > 2"
 
   - template: "{{attention_flags.red.no_fetal_heartbeat_observed}}"
-    relevance: "fetal_heartbeat.contains('no') && gest_age > 20"
+    relevance: "fetal_heartbeat == 'no' && gest_age >= 16"
 
-  - template: "{{attention_flags.red.abnormal_fetal_heart_rate}}: {fetal_heart_rate_repeat}bpm"
+  - template: "{{attention_flags.red.abnormal_fetal_heart_rate}}: {fetal_heart_rate_repeat}kpm"
     relevance: "fetal_heart_rate_repeat < 100 || fetal_heart_rate_repeat > 180"
 
   - template: "{{attention_flags.red.no_of_fetuses}}: {no_of_fetuses}"
     relevance: "no_of_fetuses > 1"
 
   - template: "{{attention_flags.red.fetal_presentation}}: {fetal_presentation} "
-    relevance: "gest_age >= 28 && fetal_presentation.contains('transverse')"
+    relevance: "gest_age >= 28 && fetal_presentation == 'transverse'"
 
-  - template: "{{attention_flags.red.amniotic_fluid}}: {amniotic_fluid}"
-    relevance: "!amniotic_fluid.isEmpty() && (amniotic_fluid.contains('reduced') || amniotic_fluid.contains('increased'))"
+  - template: "{{attention_flags.red.amniotic_fluid}}: {{attention_flags.amniotic_fluid.reduced}}"
+    relevance: "amniotic_fluid == 'reduced'"
+
+  - template: "{{attention_flags.red.amniotic_fluid}}: {{attention_flags.amniotic_fluid.increased}}"
+    relevance: "amniotic_fluid == 'increased'"
 
   - template: "{{attention_flags.red.placenta_location}}: {placenta_location_value}"
-    relevance: "!placenta_location.isEmpty() && placenta_location.contains('praevia')"
+    relevance: "placenta_location == 'praevia'"
 
-  - template: "{{attention_flags.red.hiv_risk}}"
+  - template: "{{attention_flags.red.hiv_risk}}: {{attention_flags.yes}}"
     relevance: "hiv_risk == 1"
 
-  - template: "{{attention_flags.red.hiv_positive}}"
+  - template: "{{attention_flags.red.hiv_positive}}: {{attention_flags.yes}}"
     relevance: "hiv_positive == 1"
 
-  - template: "{{attention_flags.red.hepatitis_b_positive}}"
+  - template: "{{attention_flags.red.hepatitis_b_positive}}: {{attention_flags.yes}}"
     relevance: "hepb_positive == 1"
 
-  - template: "{{attention_flags.red.hepatitis_c_positive}}"
+  - template: "{{attention_flags.red.hepatitis_c_positive}}: {{attention_flags.yes}}"
     relevance: "hepc_positive == 1"
 
-  - template: "{{attention_flags.red.syphilis_positive}}"
+  - template: "{{attention_flags.red.syphilis_positive}}: {{attention_flags.yes}}"
     relevance: "syphilis_positive == 1"
 
-  - template: "{{attention_flags.red.asymptomatic_bacteriuria_asb_diagnosis}}"
+  - template: "{{attention_flags.red.asymptomatic_bacteriuria_asb_diagnosis}}: {{attention_flags.yes}}"
     relevance: "asb_positive == 1"
 
-  - template: "{{attention_flags.red.group_b_streptococcus_gbs_diagnosis}}"
-    relevance: "!urine_culture.isEmpty() && (urine_culture.contains('positive - group b streptococcus (gbs)') || urine_culture.contains('positive_gbs'))"
+  - template: "{{attention_flags.red.group_b_streptococcus_gbs_diagnosis}}: {{attention_flags.yes}}"
+    relevance: "urine_culture == 'positive - group b streptococcus (gbs)'"
 
-  - template: "{{attention_flags.red.gestational_diabetes_mellitus_gdm_diagnosis}}"
+  - template: "{{attention_flags.red.gestational_diabetes_mellitus_gdm_diagnosis}}: {{attention_flags.yes}}"
     relevance: "gdm == 1"
 
-  - template: "{{attention_flags.red.diabetes_mellitus_dm_in_pregnancy_diagnosis}}"
+  - template: "{{attention_flags.red.diabetes_mellitus_dm_in_pregnancy_diagnosis}}: {{attention_flags.yes}}"
     relevance: "dm_in_preg == 1"
 
   - template: "{{attention_flags.red.hematocrit_ht}}: {ht}"
@@ -182,4 +184,4 @@ fields:
     relevance: "platelets < 100000"
 
   - template: "{{attention_flags.red.tb_screening_positive}}"
-    relevance: "!tb_screening_result.isEmpty() && tb_screening_result.contains('positive')"
+    relevance: "tb_screening_result == 'positive'"

opensrp-anc/src/main/assets/config/contact-globals.yml

@@ -1,6 +1,11 @@
 ---
+form: anc_quick_check
+fields:
+  - "entity_id"
+---
 form: anc_counselling_treatment
 fields:
+  - "visit_date"
   - "hepc_positive"
   - "danger_signs"
   - "danger_signs_value"
@@ -122,6 +127,7 @@ fields:
 ---
 form: anc_profile
 fields:
+  - "visit_date"
   - "contact_no"
   - "no_of_fetuses"
   - "bmi"