From 3a30cd09f383c1fee4de6b3bea0294c3222369d0 Mon Sep 17 00:00:00 2001 From: Qazi Abubakar Date: Mon, 30 Nov 2020 15:30:27 +0500 Subject: [PATCH 1/4] Overridden getDieataryFormatter method for DRC flavour Bumped up core library version --- opensrp-chw/build.gradle | 2 +- .../ChildMedicalHistoryActivityFlv.java | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/opensrp-chw/build.gradle b/opensrp-chw/build.gradle index 616cf4207e..4dd3a79cba 100644 --- a/opensrp-chw/build.gradle +++ b/opensrp-chw/build.gradle @@ -315,7 +315,7 @@ android { } dependencies { - implementation('org.smartregister:opensrp-client-chw-core:2.0.2-SNAPSHOT@aar') { + implementation('org.smartregister:opensrp-client-chw-core:2.0.3-SNAPSHOT@aar') { transitive = true exclude group: 'com.android.support', module: 'appcompat-v7' exclude group: 'androidx.legacy', module: 'legacy-support-v4' diff --git a/opensrp-chw/src/drc/java/org/smartregister/chw/activity/ChildMedicalHistoryActivityFlv.java b/opensrp-chw/src/drc/java/org/smartregister/chw/activity/ChildMedicalHistoryActivityFlv.java index 4604735a16..57eecbc98d 100644 --- a/opensrp-chw/src/drc/java/org/smartregister/chw/activity/ChildMedicalHistoryActivityFlv.java +++ b/opensrp-chw/src/drc/java/org/smartregister/chw/activity/ChildMedicalHistoryActivityFlv.java @@ -1,11 +1,38 @@ package org.smartregister.chw.activity; +import org.smartregister.chw.R; +import org.smartregister.chw.anc.util.NCUtils; import org.smartregister.chw.core.activity.DefaultChildMedicalHistoryActivityFlv; import org.smartregister.chw.core.utils.CoreChildUtils; import org.smartregister.chw.util.ChildUtilsFlv; public class ChildMedicalHistoryActivityFlv extends DefaultChildMedicalHistoryActivityFlv { + @Override + public VisitDetailsFormatter getDieataryFormatter() { + return (title, details, visitDate) -> { + String diet_diversity = NCUtils.getText(details); + String value = ""; + if ("chk_none_of_four_products".equalsIgnoreCase(diet_diversity)) { + value = context.getString(R.string.minimum_dietary_choice_0); + } else if ("chw_only_one_of_four_products".equalsIgnoreCase(diet_diversity)) { + value = context.getString(R.string.minimum_dietary_choice_1); + } else if ("chw_only_two_of_four_products".equalsIgnoreCase(diet_diversity)) { + value = context.getString(R.string.minimum_dietary_choice_2); + } else if ("chw_only_three_of_four_products".equalsIgnoreCase(diet_diversity)) { + value = context.getString(R.string.minimum_dietary_choice_3); + } else if ("chw_all_of_four_products".equalsIgnoreCase(diet_diversity)) { + value = context.getString(R.string.minimum_dietary_choice_4); + } + + return String.format("%s - %s %s", + value, + context.getString(org.smartregister.chw.core.R.string.done), + sdf.format(visitDate) + ); + }; + } + public CoreChildUtils.Flavor getChildUtils() { return new ChildUtilsFlv(); } From c53cbd22046de37b8cdcd684d1ddd1ef96c6289a Mon Sep 17 00:00:00 2001 From: Qazi Abubakar Date: Tue, 1 Dec 2020 11:15:07 +0500 Subject: [PATCH 2/4] Bumped up library version --- opensrp-chw/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensrp-chw/build.gradle b/opensrp-chw/build.gradle index 4dd3a79cba..69f6123090 100644 --- a/opensrp-chw/build.gradle +++ b/opensrp-chw/build.gradle @@ -315,7 +315,7 @@ android { } dependencies { - implementation('org.smartregister:opensrp-client-chw-core:2.0.3-SNAPSHOT@aar') { + implementation('org.smartregister:opensrp-client-chw-core:2.0.4-SNAPSHOT@aar') { transitive = true exclude group: 'com.android.support', module: 'appcompat-v7' exclude group: 'androidx.legacy', module: 'legacy-support-v4' From 8fbb70ce0059042b89b989fc83bc29dab8eb8265 Mon Sep 17 00:00:00 2001 From: Qazi Abubakar Date: Wed, 2 Dec 2020 14:18:55 +0500 Subject: [PATCH 3/4] Fixed translations and moved strings to main assets folder --- .../json.form-fr/child_hv_dietary_diversity.json | 10 +++++----- .../assets/json.form/child_hv_dietary_diversity.json | 10 +++++----- .../chw/activity/ChildMedicalHistoryActivityFlv.java | 10 +++++----- .../chw/interactor/ChildHomeVisitInteractorFlv.java | 10 +++++----- opensrp-chw/src/drc/res/values-fr/strings.xml | 6 ------ opensrp-chw/src/drc/res/values/strings.xml | 6 ------ opensrp-chw/src/main/res/values-fr/strings.xml | 5 +++++ opensrp-chw/src/main/res/values/strings.xml | 6 ++++++ 8 files changed, 31 insertions(+), 32 deletions(-) diff --git a/opensrp-chw/src/drc/assets/json.form-fr/child_hv_dietary_diversity.json b/opensrp-chw/src/drc/assets/json.form-fr/child_hv_dietary_diversity.json index 87458b387c..2d6baff9c4 100644 --- a/opensrp-chw/src/drc/assets/json.form-fr/child_hv_dietary_diversity.json +++ b/opensrp-chw/src/drc/assets/json.form-fr/child_hv_dietary_diversity.json @@ -64,35 +64,35 @@ "text": "0 - Aucun des 4 produits", "value": false, "openmrs_entity": "concept", - "openmrs_entity_id": "chk_no_animal_products" + "openmrs_entity_id": "chk_none_of_four_products" }, { "key": "chw_only_one_of_four_products", "text": "1 - Un seul type d'aliment", "value": false, "openmrs_entity": "concept", - "openmrs_entity_id": "chw_one_animal_product_or_fruit" + "openmrs_entity_id": "chw_only_one_of_four_products" }, { "key": "chw_only_two_of_four_products", "text": "2 - Deux types d'aliments différents", "value": false, "openmrs_entity": "concept", - "openmrs_entity_id": "chw_one_animal_product_or_fruit" + "openmrs_entity_id": "chw_only_two_of_four_products" }, { "key": "chw_only_three_of_four_products", "text": "3 - Trois types d'aliment différents", "value": false, "openmrs_entity": "concept", - "openmrs_entity_id": "chw_one_animal_product_or_fruit" + "openmrs_entity_id": "chw_only_three_of_four_products" }, { "key": "chw_all_of_four_products", "text": "4 - Quatre types d'aliment différents", "value": false, "openmrs_entity": "concept", - "openmrs_entity_id": "chw_one_animal_product_or_fruit" + "openmrs_entity_id": "chw_all_of_four_products" } ] } diff --git a/opensrp-chw/src/drc/assets/json.form/child_hv_dietary_diversity.json b/opensrp-chw/src/drc/assets/json.form/child_hv_dietary_diversity.json index 020a96278a..b870eb8ca2 100644 --- a/opensrp-chw/src/drc/assets/json.form/child_hv_dietary_diversity.json +++ b/opensrp-chw/src/drc/assets/json.form/child_hv_dietary_diversity.json @@ -64,35 +64,35 @@ "text": "0 - None of the 4 products", "value": false, "openmrs_entity": "concept", - "openmrs_entity_id": "chk_no_animal_products" + "openmrs_entity_id": "chk_none_of_four_products" }, { "key": "chw_only_one_of_four_products", "text": "1 - Only 1 of the 4 products", "value": false, "openmrs_entity": "concept", - "openmrs_entity_id": "chw_one_animal_product_or_fruit" + "openmrs_entity_id": "chw_only_one_of_four_products" }, { "key": "chw_only_two_of_four_products", "text": "2 - Only 2 of the 4 products", "value": false, "openmrs_entity": "concept", - "openmrs_entity_id": "chw_one_animal_product_or_fruit" + "openmrs_entity_id": "chw_only_two_of_four_products" }, { "key": "chw_only_three_of_four_products", "text": "3 - Only 3 of the 4 products", "value": false, "openmrs_entity": "concept", - "openmrs_entity_id": "chw_one_animal_product_or_fruit" + "openmrs_entity_id": "chw_only_three_of_four_products" }, { "key": "chw_all_of_four_products", "text": "4 - All 4 of the products", "value": false, "openmrs_entity": "concept", - "openmrs_entity_id": "chw_one_animal_product_or_fruit" + "openmrs_entity_id": "chw_all_of_four_products" } ] } diff --git a/opensrp-chw/src/drc/java/org/smartregister/chw/activity/ChildMedicalHistoryActivityFlv.java b/opensrp-chw/src/drc/java/org/smartregister/chw/activity/ChildMedicalHistoryActivityFlv.java index 57eecbc98d..52937d17b8 100644 --- a/opensrp-chw/src/drc/java/org/smartregister/chw/activity/ChildMedicalHistoryActivityFlv.java +++ b/opensrp-chw/src/drc/java/org/smartregister/chw/activity/ChildMedicalHistoryActivityFlv.java @@ -14,15 +14,15 @@ public VisitDetailsFormatter getDieataryFormatter() { String diet_diversity = NCUtils.getText(details); String value = ""; if ("chk_none_of_four_products".equalsIgnoreCase(diet_diversity)) { - value = context.getString(R.string.minimum_dietary_choice_0); + value = context.getString(R.string.drc_minimum_dietary_choice_0); } else if ("chw_only_one_of_four_products".equalsIgnoreCase(diet_diversity)) { - value = context.getString(R.string.minimum_dietary_choice_1); + value = context.getString(R.string.drc_minimum_dietary_choice_1); } else if ("chw_only_two_of_four_products".equalsIgnoreCase(diet_diversity)) { - value = context.getString(R.string.minimum_dietary_choice_2); + value = context.getString(R.string.drc_minimum_dietary_choice_2); } else if ("chw_only_three_of_four_products".equalsIgnoreCase(diet_diversity)) { - value = context.getString(R.string.minimum_dietary_choice_3); + value = context.getString(R.string.drc_minimum_dietary_choice_3); } else if ("chw_all_of_four_products".equalsIgnoreCase(diet_diversity)) { - value = context.getString(R.string.minimum_dietary_choice_4); + value = context.getString(R.string.drc_minimum_dietary_choice_4); } return String.format("%s - %s %s", diff --git a/opensrp-chw/src/drc/java/org/smartregister/chw/interactor/ChildHomeVisitInteractorFlv.java b/opensrp-chw/src/drc/java/org/smartregister/chw/interactor/ChildHomeVisitInteractorFlv.java index 7c7a138ab5..04b4eff464 100644 --- a/opensrp-chw/src/drc/java/org/smartregister/chw/interactor/ChildHomeVisitInteractorFlv.java +++ b/opensrp-chw/src/drc/java/org/smartregister/chw/interactor/ChildHomeVisitInteractorFlv.java @@ -59,15 +59,15 @@ public String evaluateSubTitle() { String value = ""; if ("chk_none_of_four_products".equalsIgnoreCase(diet_diversity)) { - value = context.getString(R.string.minimum_dietary_choice_0); + value = context.getString(R.string.drc_minimum_dietary_choice_0); } else if ("chw_only_one_of_four_products".equalsIgnoreCase(diet_diversity)) { - value = context.getString(R.string.minimum_dietary_choice_1); + value = context.getString(R.string.drc_minimum_dietary_choice_1); } else if ("chw_only_two_of_four_products".equalsIgnoreCase(diet_diversity)) { - value = context.getString(R.string.minimum_dietary_choice_2); + value = context.getString(R.string.drc_minimum_dietary_choice_2); } else if ("chw_only_three_of_four_products".equalsIgnoreCase(diet_diversity)) { - value = context.getString(R.string.minimum_dietary_choice_3); + value = context.getString(R.string.drc_minimum_dietary_choice_3); } else if ("chw_all_of_four_products".equalsIgnoreCase(diet_diversity)) { - value = context.getString(R.string.minimum_dietary_choice_4); + value = context.getString(R.string.drc_minimum_dietary_choice_4); } return value; } diff --git a/opensrp-chw/src/drc/res/values-fr/strings.xml b/opensrp-chw/src/drc/res/values-fr/strings.xml index 84dd7cc464..e00fab2e0d 100644 --- a/opensrp-chw/src/drc/res/values-fr/strings.xml +++ b/opensrp-chw/src/drc/res/values-fr/strings.xml @@ -3,12 +3,6 @@ Communautés Amies des Enfants Suivi en Temps Réel - RDC CFC-RTM - RDC - 0 - Aucun des 4 produits - 1 - Un seul type d\'aliment - 2 - Deux types d\'aliments différents - 3 - Trois types d\'aliment différents - 4 - Quatre types d\'aliment différents - Kit de livraison reçu Kit de livraison Rougeole 1/VAR1 diff --git a/opensrp-chw/src/drc/res/values/strings.xml b/opensrp-chw/src/drc/res/values/strings.xml index 2395b66e8b..af02c5356f 100644 --- a/opensrp-chw/src/drc/res/values/strings.xml +++ b/opensrp-chw/src/drc/res/values/strings.xml @@ -3,12 +3,6 @@ Communautés Amies des Enfants Suivi en Temps Réel - RDC CFC-RTM - RDC - 0 - None of the 4 products - 1 - Only 1 of the 4 products - 2 - Only 2 of the 4 products - 3 - Only 3 of the 4 products - 4 - All 4 of the products - Delivery kit received Delivery kit \ No newline at end of file diff --git a/opensrp-chw/src/main/res/values-fr/strings.xml b/opensrp-chw/src/main/res/values-fr/strings.xml index 87b5b9c8d4..0d2c046fad 100644 --- a/opensrp-chw/src/main/res/values-fr/strings.xml +++ b/opensrp-chw/src/main/res/values-fr/strings.xml @@ -342,4 +342,9 @@ Le kit a-t-il été utilisé? Kit Familiale + 0 - Aucun des 4 produits + 1 - Un seul type d\'aliment + 2 - Deux types d\'aliments différents + 3 - Trois types d\'aliment différents + 4 - Quatre types d\'aliment différents diff --git a/opensrp-chw/src/main/res/values/strings.xml b/opensrp-chw/src/main/res/values/strings.xml index fd34cbbdf8..04f42061c5 100644 --- a/opensrp-chw/src/main/res/values/strings.xml +++ b/opensrp-chw/src/main/res/values/strings.xml @@ -418,4 +418,10 @@ No kit received Has the kit been used? Family Kit + + 0 - None of the 4 products + 1 - Only 1 of the 4 products + 2 - Only 2 of the 4 products + 3 - Only 3 of the 4 products + 4 - All 4 of the products From b1203cd11721599997f7d75959c5e43b176fb950 Mon Sep 17 00:00:00 2001 From: Qazi Abubakar Date: Wed, 2 Dec 2020 19:24:48 +0500 Subject: [PATCH 4/4] bumped up library version to 2.0.5-SNAPSHOT --- opensrp-chw/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opensrp-chw/build.gradle b/opensrp-chw/build.gradle index 69f6123090..6b7e0d9453 100644 --- a/opensrp-chw/build.gradle +++ b/opensrp-chw/build.gradle @@ -315,7 +315,7 @@ android { } dependencies { - implementation('org.smartregister:opensrp-client-chw-core:2.0.4-SNAPSHOT@aar') { + implementation('org.smartregister:opensrp-client-chw-core:2.0.5-SNAPSHOT@aar') { transitive = true exclude group: 'com.android.support', module: 'appcompat-v7' exclude group: 'androidx.legacy', module: 'legacy-support-v4'