Adding the translatable text attribute to several widgets

build.gradle

@@ -7,10 +7,11 @@ buildscript {
         jcenter()
         maven { url 'https://maven.fabric.io/public' }
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
+        maven{  url 'https://plugins.gradle.org/m2/' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.0.0'
-        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.3'
+        classpath 'gradle.plugin.org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.12.0'
         classpath 'com.palantir:jacoco-coverage:0.4.0'
         classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.11.0"
         classpath 'com.google.gms:google-services:4.3.5'
@@ -22,8 +23,6 @@ buildscript {
     }
 }
 
-//apply plugin: 'com.palantir.jacoco-full-report'
-apply plugin: 'com.github.kt3k.coveralls'
 
 configure(allprojects) { project ->
 
@@ -35,6 +34,7 @@ configure(allprojects) { project ->
             mavenCentral()
             jcenter()
             maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
+            maven { url 'https://plugins.gradle.org/m2/'}
             mavenLocal()
         }
     }
@@ -87,26 +87,14 @@ subprojects {
     // Improve build server performance by allowing disabling of pre-dexing
     // (see http://tools.android.com/tech-docs/new-build-system/tips#TOC-Improving-Build-Server-performance.)
     project.plugins.whenPluginAdded { plugin ->
-        if ("com.android.build.gradle.AppPlugin".equals(plugin.class.name)) {
+        if ("com.android.build.gradle.AppPlugin" == plugin.class.name) {
             project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
-        } else if ("com.android.build.gradle.LibraryPlugin".equals(plugin.class.name)) {
+        } else if ("com.android.build.gradle.LibraryPlugin" == plugin.class.name) {
             project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
         }
     }
 }
 
-/*task clean(type: Delete) {
-    delete rootProject.buildDir
-}*/
-
-//jacocoFull {
-//    excludeProject ":sample", ":opensrp-client-anc"
-//}
-
-coveralls {
-    jacocoReportPath = "${buildDir}/reports/jacoco/jacocoFullReport/jacocoFullReport.xml"
-    sourceDirs += ["opensrp-anc/src/main/java/", "reference-app/src/main/java"]
-}
 apply plugin: 'io.codearte.nexus-staging'
 
 def isReleaseBuild() {

opensrp-anc/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.3'
-        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.3'
+        classpath 'gradle.plugin.org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.10.2'
         classpath 'com.google.gms:google-services:4.3.10'
     }
     configurations.all {
@@ -178,7 +178,7 @@ tasks.withType(Test) {
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation('org.smartregister:opensrp-client-native-form:2.1.17-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-native-form:2.1.19-PREVIEW-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.android.support', module: 'recyclerview-v7'
         exclude group: 'com.android.support', module: 'appcompat-v7'
@@ -327,6 +327,7 @@ task javadoc(type: Javadoc) {
 }
 
 def jacocoReportPath,sourceDirs
+
 task coveralls {
     jacocoReportPath = "${buildDir}/reports/jacoco/jacocoTestReport/merged.xml"
     sourceDirs = ["$project.projectDir/src/main/java"]

opensrp-anc/src/main/AndroidManifest.xml

@@ -8,7 +8,8 @@
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

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

@@ -16,7 +16,7 @@ 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.isEmpty() && !substances_used.contains('none')"
+    relevance: "substances_used != null && !substances_used.isEmpty() && (!substances_used.contains('none') && !substances_used.contains('None'))"
 
   - template: "{{attention_flags.yellow.pre_eclampsia_risk}}"
     relevance: "preeclampsia_risk == 1"
@@ -28,22 +28,22 @@ fields:
     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('dont_know')"
+    relevance: "!health_conditions.isEmpty() && !health_conditions.contains('none') && !health_conditions.contains('None') && !health_conditions.contains('dont_know')"
 
   - template: "{{attention_flags.yellow.high_daily_consumption_of_caffeine}}"
     relevance: "!caffeine_intake.isEmpty() && !caffeine_intake.contains('none')"
 
   - template: "{{attention_flags.yellow.second_hand_exposure_to_tobacco_smoke}}"
-    relevance: "shs_exposure == 'yes'"
+    relevance: "!shs_exposure.isEmpty() && shs_exposure.contains('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 != '' && mat_percept_fetal_move != 'normal_fetal_move'"
+    relevance: "!mat_percept_fetal_move.isEmpty() && mat_percept_fetal_move.contains('normal_fetal_move')"
 
   - template: "{{attention_flags.yellow.weight_category}}: {weight_cat_value}"
-    relevance: "weight_cat != '' && (weight_cat == 'underweight' || weight_cat == 'overweight' || weight_cat == 'obese')"
+    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'))"
 
   - template: "{{attention_flags.yellow.abnormal_breast_exam}}: {breast_exam_abnormal_value}"
     relevance: "!breast_exam_abnormal.contains('none') && !breast_exam_abnormal.isEmpty()"
@@ -55,16 +55,16 @@ fields:
     relevance: "!pelvic_exam_abnormal.contains('none') && !pelvic_exam_abnormal.isEmpty()"
 
   - template: "{{attention_flags.yellow.oedema_present}}"
-    relevance: "oedema == 'yes'"
+    relevance: "!oedema.isEmpty() && oedema.contains('yes')"
 
   - template: "{{attention_flags.yellow.rh_factor_negative}}"
-    relevance: "rh_factor == 'negative'"
+    relevance: "!rh_factor.isEmpty() && rh_factor.contains('negative')"
 ---
 group: red_attention_flag
 fields:
 
   - template: "{{attention_flags.red.danger_sign}}: {danger_signs_value}"
-    relevance: "!danger_signs.isEmpty() && (!danger_signs.contains('danger_none') || !danger_signs.contains('none'))"
+    relevance: "!danger_signs.isEmpty() && !danger_signs.contains('none') && !danger_signs.contains('None') && !danger_signs.contains('danger_none')"
 
   - template: "{{attention_flags.red.occupation_informal_employment_sex_worker}}"
     relevance: "!occupation.isEmpty() && occupation.contains('informal_employment_sex_worker')"
@@ -79,16 +79,17 @@ fields:
     relevance: "{c_sections} >= 1"
 
   - template: "{{attention_flags.red.allergies}}: {allergies_value}"
-    relevance: "!allergies.isEmpty() && !allergies.contains('none')"
+    relevance: "!allergies.isEmpty() && (!allergies.contains('none') || allergies.contains('None'))"
 
   - template: "{{attention_flags.red.tobacco_user_or_recently_quit}}"
-    relevance: "tobacco_user == 'yes' ||  tobacco_user == 'recently_quit'"
+    relevance: "!tobacco_user.isEmpty() &&
+     (tobacco_user.contains('yes') || tobacco_user.contains('Yes') || tobacco_user.contains('recently_quit'))"
 
   - template: "{{attention_flags.red.woman_and_her_partner_do_not_use_condoms}}"
-    relevance: "condom_use == 'no'"
+    relevance: "!condom_use.isEmpty() && (condom_use.contains('no') || condom_use.contains('No'))"
 
   - template: "{{attention_flags.red.alcohol_substances_currently_using}}: {alcohol_substance_use_value}"
-    relevance: "!alcohol_substance_use.isEmpty()  && !alcohol_substance_use.contains('none')"
+    relevance: "!alcohol_substance_use.isEmpty() && (!alcohol_substance_use.contains('none') && !alcohol_substance_use.contains('None'))"
 
   - template: "{{attention_flags.red.hypertension_diagnosis}}"
     relevance: "hypertension == 1"
@@ -127,7 +128,7 @@ fields:
     relevance: "dilation_cm > 2"
 
   - template: "{{attention_flags.red.no_fetal_heartbeat_observed}}"
-    relevance: "fetal_heartbeat == 'no' && gest_age > 20"
+    relevance: "fetal_heartbeat.contains('no') && gest_age > 20"
 
   - template: "{{attention_flags.red.abnormal_fetal_heart_rate}}: {fetal_heart_rate_repeat}bpm"
     relevance: "fetal_heart_rate_repeat < 100 || fetal_heart_rate_repeat > 180"
@@ -136,13 +137,13 @@ fields:
     relevance: "no_of_fetuses > 1"
 
   - template: "{{attention_flags.red.fetal_presentation}}: {fetal_presentation} "
-    relevance: "gest_age >= 28 && fetal_presentation == 'transverse'"
+    relevance: "gest_age >= 28 && fetal_presentation.contains('transverse')"
 
   - template: "{{attention_flags.red.amniotic_fluid}}: {amniotic_fluid}"
-    relevance: "amniotic_fluid == 'reduced' || amniotic_fluid == 'increased'"
+    relevance: "!amniotic_fluid.isEmpty() && (amniotic_fluid.contains('reduced') || amniotic_fluid.contains('increased'))"
 
   - template: "{{attention_flags.red.placenta_location}}: {placenta_location_value}"
-    relevance: "placenta_location == 'praevia'"
+    relevance: "!placenta_location.isEmpty() && placenta_location.contains('praevia')"
 
   - template: "{{attention_flags.red.hiv_risk}}"
     relevance: "hiv_risk == 1"
@@ -163,7 +164,7 @@ fields:
     relevance: "asb_positive == 1"
 
   - template: "{{attention_flags.red.group_b_streptococcus_gbs_diagnosis}}"
-    relevance: "urine_culture == 'positive - group b streptococcus (gbs)'"
+    relevance: "!urine_culture.isEmpty() && (urine_culture.contains('positive - group b streptococcus (gbs)') || urine_culture.contains('positive_gbs'))"
 
   - template: "{{attention_flags.red.gestational_diabetes_mellitus_gdm_diagnosis}}"
     relevance: "gdm == 1"
@@ -181,4 +182,4 @@ fields:
     relevance: "platelets < 100000"
 
   - template: "{{attention_flags.red.tb_screening_positive}}"
-    relevance: "tb_screening_result == 'positive'"
+    relevance: "!tb_screening_result.isEmpty() && tb_screening_result.contains('positive')"

opensrp-anc/src/main/assets/config/profile-overview.yml

@@ -243,7 +243,7 @@ fields:
     relevance: "severe_preeclampsia == 1"
     isRedFont: "true"
 
-  - template: "Rh factor negative: {rh_factor}"
+  - template: "Rh factor : {rh_factor}"
     relevance: "rh_factor == 'negative'"
     isRedFont: "true"
 

opensrp-anc/src/main/assets/config/profile_contact_tab_tests.yml

@@ -121,7 +121,7 @@ fields:
   - template: "{{profile_contact_test.syphilis_test.syphilis_test_type}}: {syph_test_type}"
     relevance: "syph_test_type != ''"
 
-  - template: "{{profile_contact_test.syphilis_test.syphilis_test_type}}: {rapid_syphilis_test}"
+  - template: "{{profile_contact_test.syphilis_test.rapid_syphilis_test}}: {rapid_syphilis_test}"
     relevance: "rapid_syphilis_test != ''"
 
   - template: "{{profile_contact_test.syphilis_test.rapid_plasma_reagin_rpr_test_result}}: {rpr_syphilis_test}"

opensrp-anc/src/main/assets/config/profile_tab_previous_contact_tests.yml

@@ -121,7 +121,7 @@ fields:
   - template: "{{profile_contact_test.syphilis_test.syphilis_test_type}}: {syph_test_type}"
     relevance: "syph_test_type != '' && helper.compareDateAgainstContactDate(syphilis_test_date, contact_date)"
 
-  - template: "{{profile_contact_test.syphilis_test.syphilis_test_type}}: {rapid_syphilis_test}"
+  - template: "{{profile_contact_test.syphilis_test.rapid_syphilis_test}}: {rapid_syphilis_test}"
     relevance: "rapid_syphilis_test != '' && helper.compareDateAgainstContactDate(syphilis_test_date, contact_date)"
 
   - template: "{{profile_contact_test.syphilis_test.rapid_plasma_reagin_rpr_test_result}}: {rpr_syphilis_test}"

opensrp-anc/src/main/assets/ec_client_fields.json

@@ -12,18 +12,16 @@
         },
         {
           "column_name": "phone_number",
-          "type": "Event",
+          "type": "Client",
           "json_mapping": {
-            "field": "obs.fieldCode",
-            "concept": "159635AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+            "field": "attributes.phone_number"
           }
         },
         {
           "column_name": "alt_name",
           "type": "Event",
           "json_mapping": {
-            "field": "obs.fieldCode",
-            "concept": "163258AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+            "field": "attributes.alt_name"
           }
         },
         {

opensrp-anc/src/main/assets/json.form/anc_physical_exam.json

@@ -2756,4 +2756,4 @@
     ]
   },
   "properties_file_name": "anc_physical_exam"
-}
+}