Optibp master merge

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: Android CI with Gradle
 
 on:
   push:
-    branches: [ master, develop]
+    branches: [ master, develop,optibp_main,brazil_main]
   pull_request:
-    branches: [ master, develop]
+    branches: [ master, develop,optibp_main,brazil_main]
 
 jobs:
   build:

build.gradle

@@ -4,7 +4,7 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        jcenter()
+        gradlePluginPortal()
         maven { url 'https://maven.fabric.io/public' }
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
         maven{  url 'https://plugins.gradle.org/m2/' }
@@ -23,8 +23,6 @@ buildscript {
     }
 }
 
-//apply plugin: 'com.palantir.jacoco-full-report'
-apply plugin: 'com.github.kt3k.coveralls'
 
 configure(allprojects) { project ->
 
@@ -34,7 +32,7 @@ configure(allprojects) { project ->
         repositories {
             google()
             mavenCentral()
-            jcenter()
+            gradlePluginPortal()
             maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
             maven { url 'https://plugins.gradle.org/m2/'}
             mavenLocal()
@@ -49,14 +47,14 @@ allprojects {
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
         mavenLocal()
         mavenCentral()
+        gradlePluginPortal()
         maven { url 'https://jitpack.io' }
         maven { url "https://acra.googlecode.com/svn/repository/releases" }
         maven { url "https://repo.maven.apache.org/maven2" }
         maven { url "https://cloudant.github.io/cloudant-sync-eap/repository" }
         maven { url "https://s3.amazonaws.com/repo.commonsware.com" }
         //maven { url "https://dl.bintray.com/ibm-watson-health/ibm-fhir-server-releases" }
         google()
-        jcenter()
     }
 
     subprojects {
@@ -79,7 +77,7 @@ subprojects {
 
     ext.androidToolsBuildGradle = '30.0.3'
     ext.androidBuildToolsVersion = '30.0.3'
-    ext.androidMinSdkVersion = 18
+    ext.androidMinSdkVersion = 21
     ext.androidCompileSdkVersion = 31
     ext.androidTargetSdkVersion = 31
     ext.androidAnnotationsVersion = '3.0.1'

gradle.properties

@@ -19,7 +19,7 @@ POM_SETTING_LICENCE_NAME=The Apache Software License, Version 2.0
 android.useAndroidX=true
 android.enableJetifier=true
 android.debug.obsoleteApi=true
-VERSION_NAME=2.1.0-SNAPSHOT
+VERSION_NAME=3.0.0-SNAPSHOT
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client ANC Library
 POM_SETTING_SCM_CONNECTION=scm\:[email protected]\:OpenSRP/opensrp-client-anc.git

opensrp-anc/build.gradle

@@ -2,11 +2,14 @@ buildscript {
     repositories {
         mavenCentral()
         google()
+        maven {
+            url "https://s3.amazonaws.com/repo.commonsware.com"
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.3'
-        classpath 'gradle.plugin.org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.10.2'
-        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'gradle.plugin.org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.12.0'
+        classpath 'com.google.gms:google-services:4.3.14'
     }
     configurations.all {
         resolutionStrategy {
@@ -178,7 +181,7 @@ tasks.withType(Test) {
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation('org.smartregister:opensrp-client-native-form:3.1.0-PREVIEW-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-native-form:3.1.1-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.android.support', module: 'recyclerview-v7'
         exclude group: 'com.android.support', module: 'appcompat-v7'
@@ -189,7 +192,7 @@ dependencies {
         exclude group: 'org.yaml', module: 'snakeyaml'
         exclude group: 'io.ona.rdt-capture', module: 'lib'
     }
-    implementation('org.smartregister:opensrp-client-core:4.3.26-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-core:6.0.0-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.github.bmelnychuk', module: 'atv'
         exclude group: 'com.google.guava', module: 'guava'
@@ -205,7 +208,7 @@ dependencies {
         exclude group: 'org.smartregister', module: 'android-p2p-sync'
     }
 
-    api("org.smartregister:android-p2p-sync:0.3.8-aplha4-SNAPSHOT") {
+    api("org.smartregister:android-p2p-sync:0.4.0-DEV-SNAPSHOT") {
         transitive = true
         exclude group: 'org.smartregister', module: 'opensrp-client-core'
         exclude group: 'com.android.support', module: 'appcompat-v7'
@@ -255,7 +258,7 @@ dependencies {
     implementation("com.itextpdf:itext7-core:7.1.12")
     implementation 'org.jacoco:org.jacoco.agent:0.7.9:runtime'
     testImplementation 'org.jacoco:org.jacoco.agent:0.7.9:runtime'
-
+    implementation 'com.android.volley:volley:1.2.1'
     implementation 'org.jacoco:org.jacoco.agent:0.8.7:runtime'
     testImplementation 'org.jacoco:org.jacoco.agent:0.8.7:runtime'
 

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

@@ -5,4 +5,7 @@ fields:
     relevance: "phys_symptoms != ''"
 
 -   template: "{{profile_contact_tab_contacts.average_weight_gain_per_week_since_last_contact}}: {weight_gain} kg"
-    relevance: "weight_gain != ''"
+    relevance: "weight_gain != '' && weight_gain != '0'"
+
+-   template: "{{profile_contact_tab_contacts.total_weight_gain}}: {tot_weight_gain} kg"
+    relevance: "weight_gain == '' || weight_gain == '0'"

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

@@ -361,6 +361,44 @@
           }
         }
       },
+      {
+        "key": "accordion_covid-19",
+        "openmrs_entity_parent": "",
+        "openmrs_entity": "",
+        "openmrs_entity_id": "",
+        "text": "{{anc_test.step2.accordion_covid_19.text}}",
+        "accordion_info_text": "{{anc_test.step2.accordion_covid_19.text}}",
+        "accordion_info_title": "{{anc_test.step2.accordion_covid_19.text}}",
+        "type": "expansion_panel",
+        "content_form": "tests_covid_19_sub_form",
+        "container": "anc_test",
+        "relevance": {
+          "rules-engine": {
+            "ex-rules": {
+              "rules-file": "tests_expansion_panel_relevance_rules.yml"
+            }
+          }
+        }
+      },
+      {
+        "key": "accordion_toxo",
+        "openmrs_entity_parent": "",
+        "openmrs_entity": "",
+        "openmrs_entity_id": "",
+        "text": "{{anc_test.step2.accordion_toxo.text}}",
+        "accordion_info_text": "{{anc_test.step2.accordion_toxo.info.text}}",
+        "accordion_info_title": "{{anc_test.step2.accordion_toxo.text}}",
+        "type": "expansion_panel",
+        "content_form": "tests_toxo_sub_form",
+        "container": "anc_test",
+        "relevance": {
+          "rules-engine": {
+            "ex-rules": {
+              "rules-file": "tests_expansion_panel_relevance_rules.yml"
+            }
+          }
+        }
+      },
       {
         "key": "accordion_syphilis",
         "openmrs_entity_parent": "",