Merge pull request #636 from opensrp/feature/update_version

dubdabasoduba · web-flow · commit 49d25fea23f5 · 2021-09-16T13:17:25.000+03:00
Update versions
diff --git a/.github/ISSUE_TEMPLATE/anc_new_feature_request.yml b/.github/ISSUE_TEMPLATE/anc_new_feature_request.yml
@@ -0,0 +1,51 @@
+---
+name: 'OpenSRP web new Feature request.'
+description: 'Use this to request for a new feature that is not available in the current application.'
+title: '[New Feature Request] '
+labels: ['New Feature Request']
+assignees: '[]'
+---
+body:
+  - type: markdown
+  - type: textarea
+      id: project
+      attributes:
+        label: Project Details
+        description: What project requires this feature?
+        placeholder: ZEIR or WHO ANC
+      validations:
+        required: true
+  - type: textarea
+      id: use_case
+      attributes:
+        label: Feature Use Case
+        description: Give a detailed use case of how this feature is to be used?
+        placeholder: Needed to dispaly what teams practitioners are assigned to
+      validations:
+        required: true
+  - type: textarea
+      id: acceptance_criteria
+      attributes:
+        label: Acceptance criteria
+        description: What is the acceptance criteria for this feature?
+        placeholder: Team assignments should be shown on the user details page.
+      validations:
+        required: true
+  - type: input
+      id: project_contact
+      attributes:
+        label: Project Contact
+        description: Who is project contact person?
+        placeholder: Benjamin
+      validations:
+        required: true
+  - type: textarea
+      id: extra_info
+      attributes:
+        label: Relevant Information
+        description: Please share any other relevant information about the feature request or project.
+        placeholder:
+      validations:
+        required: false
+
+---
diff --git a/opensrp-anc/build.gradle b/opensrp-anc/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.3'
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.3'
-        classpath 'com.google.gms:google-services:4.3.9'
+        classpath 'com.google.gms:google-services:4.3.10'
     }
 }
 
@@ -152,7 +152,7 @@ tasks.withType(Test) {
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation('org.smartregister:opensrp-client-native-form:2.0.10-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-native-form:2.1.7-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.android.support', module: 'recyclerview-v7'
         exclude group: 'com.android.support', module: 'appcompat-v7'
@@ -163,7 +163,7 @@ dependencies {
         exclude group: 'org.yaml', module: 'snakeyaml'
         exclude group: 'io.ona.rdt-capture', module: 'lib'
     }
-    implementation('org.smartregister:opensrp-client-core:4.3.16000-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-core:4.3.17-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.github.bmelnychuk', module: 'atv'
         exclude group: 'com.google.guava', module: 'guava'
diff --git a/opensrp-anc/src/main/assets/json.form/anc_quick_check.json b/opensrp-anc/src/main/assets/json.form/anc_quick_check.json
@@ -2,10 +2,10 @@
   "validate_on_submit": true,
   "display_scroll_bars": true,
   "count": "1",
-  "encounter_type": "Quick Check",
+  "encounter_type": "Quick Check -- Training",
   "entity_id": "",
   "relational_id": "",
-  "form_version": "0.0.1",
+  "form_version": "0.0.6",
   "metadata": {
     "start": {
       "openmrs_entity_parent": "",
@@ -119,7 +119,7 @@
             "openmrs_entity": "concept",
             "openmrs_entity_id": ""
           },
-	  {
+          {
             "key": "changes_in_bp_down",
             "text": "{{anc_quick_check.step1.specific_complaint.options.changes_in_bp_down.text}}",
             "value": false,
@@ -151,7 +151,7 @@
             "openmrs_entity": "concept",
             "openmrs_entity_id": "143264AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
           },
-	  {
+          {
             "key": "diarrhea",
             "text": "{{anc_quick_check.step1.specific_complaint.options.diarrhea.text}}",
             "value": false,
@@ -423,7 +423,7 @@
             "openmrs_entity": "concept",
             "openmrs_entity_id": "123074AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
           },
-	  {
+          {
             "key": "vomiting",
             "text": "{{anc_quick_check.step1.specific_complaint.options.vomiting.text}}",
             "value": false,
diff --git a/opensrp-anc/src/main/assets/json.form/anc_register.json b/opensrp-anc/src/main/assets/json.form/anc_register.json
@@ -350,12 +350,12 @@
           "err": "{{anc_register.step1.alt_phone_number.v_numeric.err}}"
         }
       },
-            {
+      {
         "key": "cohabitants",
         "openmrs_entity_parent": "",
         "openmrs_entity": "concept",
         "openmrs_entity_id": "159635AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-        "label":"{{anc_register.step1.cohabitants.label}}",
+        "label": "{{anc_register.step1.cohabitants.label}}",
         "label_info_text": "{{anc_register.step1.cohabitants.label_info_text}}",
         "type": "check_box",
         "exclusive": [
@@ -371,7 +371,7 @@
             "openmrs_entity": "",
             "openmrs_entity_id": ""
           },
-             {
+          {
             "key": "siblings",
             "text": "{{anc_register.step1.cohabitants.options.siblings.text}}",
             "text_size": "18px",
@@ -380,7 +380,7 @@
             "openmrs_entity": "",
             "openmrs_entity_id": ""
           },
-             {
+          {
             "key": "extended_family",
             "text": "{{anc_register.step1.cohabitants.options.extended_family.text}}",
             "text_size": "18px",
@@ -389,7 +389,7 @@
             "openmrs_entity": "",
             "openmrs_entity_id": ""
           },
-             {
+          {
             "key": "partner",
             "text": "{{anc_register.step1.cohabitants.options.partner.text}}",
             "text_size": "18px",
@@ -398,7 +398,7 @@
             "openmrs_entity": "",
             "openmrs_entity_id": ""
           },
-             {
+          {
             "key": "friends",
             "text": "{{anc_register.step1.cohabitants.options.friends.text}}",
             "text_size": "18px",
@@ -407,7 +407,7 @@
             "openmrs_entity": "",
             "openmrs_entity_id": ""
           },
-             {
+          {
             "key": "no_one",
             "text": "{{anc_register.step1.cohabitants.options.no_one.text}}",
             "text_size": "18px",
diff --git a/opensrp-anc/src/main/java/org/smartregister/anc/library/activity/BaseHomeRegisterActivity.java b/opensrp-anc/src/main/java/org/smartregister/anc/library/activity/BaseHomeRegisterActivity.java
@@ -209,6 +209,7 @@ public void startFormActivity(JSONObject form) {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == AllConstants.BARCODE.BARCODE_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
             if (data != null) {
                 Barcode barcode = data.getParcelableExtra(AllConstants.BARCODE.BARCODE_KEY);
diff --git a/opensrp-anc/src/main/java/org/smartregister/anc/library/activity/ContactJsonFormActivity.java b/opensrp-anc/src/main/java/org/smartregister/anc/library/activity/ContactJsonFormActivity.java
@@ -15,6 +15,7 @@
 import com.vijay.jsonwizard.domain.Form;
 import com.vijay.jsonwizard.fragments.JsonWizardFormFragment;
 
+import org.apache.commons.lang3.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -126,7 +127,7 @@ protected void checkBoxWriteValue(String stepName, String parentKey, String chil
 
                         if (childKey.equals(anotherKeyAtIndex)) {
                             innerItem.put(JsonFormConstants.VALUE, value);
-                            if (!TextUtils.isEmpty(formName) && formName.equals(ConstantsUtils.JsonFormUtils.ANC_QUICK_CHECK)) {
+                            if (StringUtils.isNotBlank(formName) && formName.equals(ConstantsUtils.JsonFormUtils.ANC_QUICK_CHECK)) {
                                 quickCheckDangerSignsSelectionHandler(fields);
                             }
 
diff --git a/opensrp-anc/src/main/java/org/smartregister/anc/library/fragment/ContactWizardJsonFormFragment.java b/opensrp-anc/src/main/java/org/smartregister/anc/library/fragment/ContactWizardJsonFormFragment.java
@@ -297,19 +297,14 @@ public void displayQuickCheckBottomReferralButtons(boolean none, boolean other)
 
         Button finalReferButton = referButton;
         Button finalProceedButton = proceedButton;
-        getJsonApi().getAppExecutors().mainThread().execute(new Runnable() {
-            @Override
-            public void run() {
-                setQuickCheckButtonsVisible(none, other, buttonLayout, finalReferButton, finalProceedButton);
-                setQuickCheckButtonsInvisible(none, other, buttonLayout, finalReferButton, finalProceedButton);
-
-                if ((none && !other) && buttonLayout != null) {
-                    finalReferButton.setVisibility(View.GONE);
-                }
+        getJsonApi().getAppExecutors().mainThread().execute(() -> {
+            setQuickCheckButtonsVisible(none, other, buttonLayout, finalReferButton, finalProceedButton);
+            setQuickCheckButtonsInvisible(none, other, buttonLayout, finalReferButton, finalProceedButton);
+
+            if ((none && !other) && buttonLayout != null) {
+                finalReferButton.setVisibility(View.GONE);
             }
         });
-
-
     }
 
 
diff --git a/opensrp-anc/src/main/java/org/smartregister/anc/library/sync/BaseAncClientProcessorForJava.java b/opensrp-anc/src/main/java/org/smartregister/anc/library/sync/BaseAncClientProcessorForJava.java
@@ -118,56 +118,6 @@ private boolean unSync(ECSyncHelper ecSyncHelper, DetailsRepository detailsRepos
         return false;
     }
 
-    /*
-            private Integer parseInt(String string) {
-                try {
-                    return Integer.valueOf(string);
-                } catch (NumberFormatException e) {
-                    Log.e(TAG, e.toString(), e);
-                }
-                return null;
-            }
-
-            private ContentValues processCaseModel(EventClient eventClient, Table table) {
-                try {
-                    List<Column> columns = table.columns;
-                    ContentValues contentValues = new ContentValues();
-
-                    for (Column column : columns) {
-                        processCaseModel(eventClient.getEvent(), eventClient.getClient(), column, contentValues);
-                    }
-
-                    return contentValues;
-                } catch (Exception e) {
-                    Log.e(TAG, e.toString(), e);
-                }
-                return null;
-            }
-
-            private Date getDate(String eventDateStr) {
-                Date date = null;
-                if (StringUtils.isNotBlank(eventDateStr)) {
-                    try {
-                        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ");
-                        date = dateFormat.parse(eventDateStr);
-                    } catch (ParseException e) {
-                        try {
-                            DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
-                            date = dateFormat.parse(eventDateStr);
-                        } catch (ParseException pe) {
-                            try {
-                                date = DateUtil.parseDate(eventDateStr);
-                            } catch (ParseException pee) {
-                                Log.e(TAG, pee.toString(), pee);
-                            }
-                        }
-                    }
-                }
-                return date;
-            }
-
-        */
-
     public DetailsRepository getDetailsRepository() {
         return AncLibrary.getInstance().getDetailsRepository();
     }
diff --git a/opensrp-anc/src/main/java/org/smartregister/anc/library/util/ANCJsonFormUtils.java b/opensrp-anc/src/main/java/org/smartregister/anc/library/util/ANCJsonFormUtils.java
@@ -763,7 +763,6 @@ public static Map<String, String> processSiteCharacteristics(String jsonString)
                             StringUtils.isBlank(fields.getJSONObject(i).getString(ConstantsUtils.KeyUtils.VALUE)) ? "0" :
                                     fields.getJSONObject(i).getString(ConstantsUtils.KeyUtils.VALUE));
                 }
-
             }
 
             return settings;
@@ -777,7 +776,7 @@ public static String getAutoPopulatedSiteCharacteristicsEditFormString(Context c
                                                                            Map<String, String> characteristics) {
         try {
             JSONObject form = FormUtils.getInstance(context).getFormJson(ConstantsUtils.JsonFormUtils.ANC_SITE_CHARACTERISTICS);
-            Timber.d("Form is " + form.toString());
+            Timber.d("Form is %s", form.toString());
             if (form != null) {
                 form.put(ANCJsonFormUtils.ENCOUNTER_TYPE, ConstantsUtils.EventTypeUtils.SITE_CHARACTERISTICS);
 
diff --git a/opensrp-anc/src/main/res/layout/contact_card_item.xml b/opensrp-anc/src/main/res/layout/contact_card_item.xml
@@ -89,8 +89,5 @@
                 android:textSize="@dimen/contact_detail_text_size" />
 
         </LinearLayout>
-
-
     </RelativeLayout>
-
 </org.smartregister.anc.library.view.SquareCardView>
diff --git a/opensrp-anc/src/main/resources/anc_quick_check.properties b/opensrp-anc/src/main/resources/anc_quick_check.properties
@@ -25,7 +25,7 @@ anc_quick_check.step1.specific_complaint.options.other_skin_disorder.text = Othe
 anc_quick_check.step1.danger_signs.options.danger_none.text = None
 anc_quick_check.step1.specific_complaint.label = Health concern(s)
 anc_quick_check.step1.specific_complaint.options.leg_pain.text = Pain - Leg
-anc_quick_check.step1.title = Quick Check
+anc_quick_check.step1.title = Quick Check -- Training
 anc_quick_check.step1.specific_complaint.options.reduced_fetal_movement.text = Fetal movements - reduced/poor
 anc_quick_check.step1.danger_signs.options.danger_bleeding.text = Bleeding vaginally
 anc_quick_check.step1.specific_complaint.options.full_abdominal_pain.text = Pain - Abdominal
diff --git a/reference-app/build.gradle b/reference-app/build.gradle
@@ -25,7 +25,7 @@ jacoco {
 // This variables are used by the version code & name generators
 ext.versionMajor = 1
 ext.versionMinor = 6
-ext.versionPatch = 7
+ext.versionPatch = 8
 ext.versionClassifier = null
 ext.isSnapshot = false
 ext.minimumSdkVersion = androidMinSdkVersion
@@ -143,7 +143,7 @@ android {
             minifyEnabled false
             zipAlignEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rule.pro'
-            resValue "string", 'opensrp_url', '"https://anc.labs.smartregister.org/opensrp/"'
+            resValue "string", 'opensrp_url', '"https://ancs.dev.sid-indonesia.org/opensrp/"'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '250'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '100'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '1'
@@ -159,7 +159,7 @@ android {
         }
 
         debug {
-            resValue "string", 'opensrp_url', '"https://anc.labs.smartregister.org/opensrp/"'
+            resValue "string", 'opensrp_url', '"https://ancs.dev.sid-indonesia.org/opensrp/"'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '250'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '100'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
@@ -229,7 +229,7 @@ dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
     def powerMockVersion = '2.0.7'
     implementation project(":opensrp-anc")
-    implementation('org.smartregister:opensrp-client-native-form:2.0.10-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-native-form:2.1.7-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.android.support', module: 'recyclerview-v7'
         exclude group: 'com.android.support', module: 'appcompat-v7'
@@ -241,7 +241,7 @@ dependencies {
         exclude group: 'io.ona.rdt-capture', module: 'lib'
     }
 
-    implementation('org.smartregister:opensrp-client-core:4.3.16000-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-core:4.3.17-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.github.bmelnychuk', module: 'atv'
         exclude group: 'com.google.guava', module: 'guava'
diff --git a/reference-app/src/main/assets/app.properties b/reference-app/src/main/assets/app.properties
@@ -2,6 +2,6 @@ DRISHTI_BASE_URL=
 PORT=-1
 SHOULD_VERIFY_CERTIFICATE=false
 SYNC_DOWNLOAD_BATCH_SIZE=100
-CAN_SAVE_INITIAL_SITE_SETTING=false
+CAN_SAVE_INITIAL_SITE_SETTING=true
 MAX_CONTACT_SCHEDULE_DISPLAYED=5
 language.switching.enabled=true

Original file line number	Diff line number	Diff line change
`@@ -763,7 +763,6 @@ public static Map<String, String> processSiteCharacteristics(String jsonString)`
`763`	`763`	`StringUtils.isBlank(fields.getJSONObject(i).getString(ConstantsUtils.KeyUtils.VALUE)) ? "0" :`
`764`	`764`	`fields.getJSONObject(i).getString(ConstantsUtils.KeyUtils.VALUE));`
`765`	`765`	`}`
`766`		`-`
`767`	`766`	`}`
`768`	`767`
`769`	`768`	`return settings;`
`@@ -777,7 +776,7 @@ public static String getAutoPopulatedSiteCharacteristicsEditFormString(Context c`
`777`	`776`	`Map<String, String> characteristics) {`
`778`	`777`	`try {`
`779`	`778`	`JSONObject form = FormUtils.getInstance(context).getFormJson(ConstantsUtils.JsonFormUtils.ANC_SITE_CHARACTERISTICS);`
`780`		`- Timber.d("Form is " + form.toString());`
	`779`	`+ Timber.d("Form is %s", form.toString());`
`781`	`780`	`if (form != null) {`
`782`	`781`	`form.put(ANCJsonFormUtils.ENCOUNTER_TYPE, ConstantsUtils.EventTypeUtils.SITE_CHARACTERISTICS);`
`783`	`782`