Skip to content

Commit

Permalink
Merge pull request #176 from d-tree-org/mnj-23-child-hv-malaria-preve…
Browse files Browse the repository at this point in the history 
…ntion

Child Home Visit Malaria Prevention Module
  • Loading branch information
@devcolonel
devcolonel authored Nov 1, 2023
2 parents 1d86020 + 00bee1f commit 62026b3
Show file tree
Hide file tree
Showing 5 changed files with 172 additions and 29 deletions.
4 changes: 2 additions & 2 deletions opensrp-chw/src/main/res/values-sw/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@

<string name="malnutrition_screening_subtitle">MUAC: %s Anemia: %s</string>
<string name="malnutrition_screening">Kuchunguza utapia mlo na upungufu wa damu</string>

<string name="good">Nzuri</string>
<string name="poor">Mbaya</string>
<string name="child_hv_complementary_feeding"> Ushauri kuhusu kumlisha mtoto vyakula vya nyongeza </string>

</resources>
3 changes: 2 additions & 1 deletion opensrp-chw/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,7 @@

<string name="malnutrition_screening_subtitle">MUAC: %s Anemia: %s</string>
<string name="malnutrition_screening">Malnutrition/Anemia screening</string>

<string name="good">Good</string>
<string name="poor">Poor</string>
<string name="child_hv_complementary_feeding"> Complementary Feeding Counseling </string>
</resources>
89 changes: 80 additions & 9 deletions opensrp-chw/src/nacp/assets/json.form-sw/child_hv_malaria_prevention.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
"No"
],
"openmrs_choice_ids": {
"Yes": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"No": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
"Yes": "Yes",
"No": "No"
},
"v_required": {
"value": "true",
Expand All @@ -81,7 +81,7 @@
"openmrs_entity_id": "",
"openmrs_data_type": "select one",
"type": "spinner",
"hint": "Je, mtoto alilala kwenye chandarua chenye dawa inayodumu kwa muda mrefu (LLIN) jana usiku??",
"hint": "Je, mama pamoja na mtoto walilala ndani ya chandarua jana usiku?",
"values": [
"Ndiyo",
"Hapana"
Expand All @@ -91,8 +91,8 @@
"No"
],
"openmrs_choice_ids": {
"Yes": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"No": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
"Yes": "Yes",
"No": "No"
},
"v_required": {
"value": "true",
Expand Down Expand Up @@ -130,15 +130,18 @@
"hint": "Hali ya chandarua (LLIN)",
"values": [
"Nzuri",
"Imetoboka",
"Mbaya"
],
"keys": [
"Okay",
"Bad"
"Good",
"Normal with a few holes",
"Poor"
],
"openmrs_choice_ids": {
"Okay": "159405AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"Bad": "159407AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
"Good": "Good",
"Normal with a few holes": "Normal with a few holes",
"Poor": "Poor"
},
"v_required": {
"value": "true",
Expand All @@ -150,6 +153,74 @@
"ex": "equalTo(., \"Yes\")"
}
}
},
{
"key": "normal_llin_condition",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "",
"type": "toaster_notes",
"toaster_type": "info",
"text": "Mshauri mama/baba au mlezi kuishona sehemu ambazo zimechanika",
"text_color": "#000000",
"relevance": {
"step1:llin_condition_1m5yr": {
"type": "string",
"ex": "equalTo(., \"Normal with a few holes\")"
}
}
},
{
"key": "poor_llin_condition",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "",
"type": "toaster_notes",
"toaster_type": "info",
"text": "Mshauri mama/baba au mlezi kununua chandarua nyingine",
"text_color": "#000000",
"relevance": {
"step1:llin_condition_1m5yr": {
"type": "string",
"ex": "equalTo(., \"Poor\")"
}
}
},
{
"key": "spacer",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "",
"type": "spacer",
"spacer_height": "15dp"
},
{
"key": "health_facility_testing_treatment_malaria",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "",
"type": "toaster_notes",
"toaster_type": "info",
"text": "Mpeleke mtoto kwenye kituo cha kutolea huduma za afya mara tu unapo hisi ana dalili za Malaria.",
"text_color": "#000000"
},
{
"key": "spacer",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "",
"type": "spacer",
"spacer_height": "15dp"
},
{
"key": "kk_play_and_communication_flipbook_reference",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "",
"type": "toaster_notes",
"toaster_type": "info",
"text": "Fungua kitendea kazi namba 7 kwenye bango kitita ili kuendelea na majadiliano",
"text_color": "#000000"
}
]
}
Expand Down
95 changes: 83 additions & 12 deletions opensrp-chw/src/nacp/assets/json.form/child_hv_malaria_prevention.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
"No"
],
"openmrs_choice_ids": {
"Yes": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"No": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
"Yes": "Yes",
"No": "No"
},
"v_required": {
"value": "true",
Expand All @@ -81,7 +81,7 @@
"openmrs_entity_id": "",
"openmrs_data_type": "select one",
"type": "spinner",
"hint": "Did the child sleep under the LLIN last night?",
"hint": "Did she and her child sleep under the LLIN last night?",
"values": [
"Yes",
"No"
Expand All @@ -91,8 +91,8 @@
"No"
],
"openmrs_choice_ids": {
"Yes": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"No": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
"Yes": "Yes",
"No": "No"
},
"v_required": {
"value": "true",
Expand Down Expand Up @@ -127,18 +127,21 @@
"openmrs_entity_id": "",
"openmrs_data_type": "select one",
"type": "spinner",
"hint": "LLIN condition",
"hint": "Ask the guardian about the condition of the LLIN",
"values": [
"Okay",
"Bad"
"Good",
"Normal with a few holes",
"Poor"
],
"keys": [
"Okay",
"Bad"
"Good",
"Normal with a few holes",
"Poor"
],
"openmrs_choice_ids": {
"Okay": "159405AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"Bad": "159407AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
"Good": "Good",
"Normal with a few holes": "Normal with a few holes",
"Poor": "Poor"
},
"v_required": {
"value": "true",
Expand All @@ -150,6 +153,74 @@
"ex": "equalTo(., \"Yes\")"
}
}
},
{
"key": "normal_llin_condition",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "",
"type": "toaster_notes",
"toaster_type": "info",
"text": "Advice the mother/father or caregiver to stitch the holes on the LLIN",
"text_color": "#000000",
"relevance": {
"step1:llin_condition_1m5yr": {
"type": "string",
"ex": "equalTo(., \"Normal with a few holes\")"
}
}
},
{
"key": "poor_llin_condition",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "",
"type": "toaster_notes",
"toaster_type": "info",
"text": "Advice the mother/father or caregiver to purchase a new LLIN",
"text_color": "#000000",
"relevance": {
"step1:llin_condition_1m5yr": {
"type": "string",
"ex": "equalTo(., \"Poor\")"
}
}
},
{
"key": "spacer",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "",
"type": "spacer",
"spacer_height": "15dp"
},
{
"key": "health_facility_testing_treatment_malaria",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "",
"type": "toaster_notes",
"toaster_type": "info",
"text": "Take the child to the hospital soon if you feel she/he is having Malaria symptoms.",
"text_color": "#000000"
},
{
"key": "spacer",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "",
"type": "spacer",
"spacer_height": "15dp"
},
{
"key": "kk_play_and_communication_flipbook_reference",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "",
"type": "toaster_notes",
"toaster_type": "info",
"text": "Please refer to Topic 7 in Bango Kitita to continue with the discussion",
"text_color": "#000000"
}
]
}
Expand Down
10 changes: 5 additions & 5 deletions opensrp-chw/src/nacp/java/org/smartregister/chw/interactor/ChildHomeVisitInteractorFlv.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ public String evaluateSubTitle() {
}

if (!TextUtils.isEmpty(llinCondition1m5yr)) {
if ("Okay".equals(llinCondition1m5yr)) {
llinCondition1m5yr = context.getString(R.string.okay);
} else if ("Bad".equals(llinCondition1m5yr)) {
llinCondition1m5yr = context.getString(R.string.bad);
if ("Good".equals(llinCondition1m5yr)) {
llinCondition1m5yr = context.getString(R.string.good);
} else if ("Poor".equals(llinCondition1m5yr)) {
llinCondition1m5yr = context.getString(R.string.poor);
}
}

Expand Down Expand Up @@ -127,7 +127,7 @@ public BaseAncHomeVisitAction.Status evaluateStatusOnPayload() {
return BaseAncHomeVisitAction.Status.PENDING;
}

if (famllin1m5yr.equalsIgnoreCase(context.getString(R.string.yes)) && llin2days1m5yr.equalsIgnoreCase(context.getString(R.string.yes)) && llinCondition1m5yr.equalsIgnoreCase(context.getString(R.string.okay))) {
if (famllin1m5yr.equalsIgnoreCase(context.getString(R.string.yes)) && llin2days1m5yr.equalsIgnoreCase(context.getString(R.string.yes)) && llinCondition1m5yr.equalsIgnoreCase(context.getString(R.string.good))) {
return BaseAncHomeVisitAction.Status.COMPLETED;
} else {
return BaseAncHomeVisitAction.Status.PARTIALLY_COMPLETED;
Expand Down

0 comments on commit 62026b3

Please sign in to comment.