Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/1526 overall outcome result #1538

Merged
merged 6 commits into from
Jul 16, 2024
Merged

Feature/1526 overall outcome result #1538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
19a5d34
Added dependency outcome result for clean milk containers when there …
jkisioh Jul 15, 2024
7b93f02
change option text on G3-3.2
jkisioh Jul 16, 2024
060cf88
Change Overall outcome result to return lowest G value
jkisioh Jul 16, 2024
c9e9262
Merge branch 'develop' into feature/1526-overall-outcome-result
ifirmawan Jul 16, 2024
a6f2852
[#1538] Update HH overall outcome to return lowest result
ifirmawan Jul 16, 2024
e95a52a
[#1538] Update init db to update HH & community forms
ifirmawan Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions backend/source/forms/1699353915355.prod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6577,6 +6577,10 @@
"meta": false,
"options": null,
"dependency": [
{
"id": 1710829091,
"options": ["yes_animals_kept_in_household_compound"]
},
{
"id": 16994260598422,
"options": ["yes"]
Expand All @@ -6588,7 +6592,7 @@
"G2 Clean and safely stored milk containers": "#93D371",
"G1 Milk containers not adequately washed, or not safely stored": "#FDC74B"
},
"fnString": "#clean_milk_containers#.includes(\"g0\") && #covered_container_storage#.includes(\"g0\") && #raised_container_storage#.includes(\"g0\") ? \"G0 Milk containers not clean and not safely stored\" : #clean_milk_containers#.includes(\"g2\") && #covered_container_storage#.includes(\"g2\") && #raised_container_storage#.includes(\"g2\") ? \"G2 Clean and safely stored milk containers\" : \"G1 Milk containers not adequately washed, or not safely stored\"",
"fnString": "#clean_milk_containers#.includes(\"g1\") && #covered_container_storage#.includes(\"g1\") && #raised_container_storage#.includes(\"g1\") ? \"G1 Milk containers not adequately washed, or not safely stored\" : #clean_milk_containers#.includes(\"g2\") && #covered_container_storage#.includes(\"g2\") && #raised_container_storage#.includes(\"g2\") ? \"G2 Clean and safely stored milk containers\" : \"G0 Milk containers not clean and not safely stored\"",
"multiline": false
}
},
Expand All @@ -6615,7 +6619,7 @@
"G2 Clean and safely stored food": "#93D371",
"G1 Food not adequately washed, or not safely stored": "#FDC74B"
},
"fnString": "#o_r_clean_and_safely_stored_food#.includes(\"G0\") && #o_r_clean_and_safely_stored_kitchen_utensils#.includes(\"G0\") && #o_r_clean_and_safely_stored_milk_containers#.includes(\"G0\") ? \"G0 Food not clean and not safely stored\" : #o_r_clean_and_safely_stored_food#.includes(\"G2\") && #o_r_clean_and_safely_stored_milk_containers#.includes(\"G2\") && #o_r_clean_and_safely_stored_kitchen_utensils#.includes(\"G2 Clean and safely stored food\") ? \"G2\" : \"G1 Food not adequately washed, or not safely stored\"",
"fnString": "(!#o_r_clean_and_safely_stored_food# || #o_r_clean_and_safely_stored_food#.includes(\"G1\")) && (!#o_r_clean_and_safely_stored_kitchen_utensils# || #o_r_clean_and_safely_stored_kitchen_utensils#.includes(\"G1\")) && (!#o_r_clean_and_safely_stored_milk_containers# || #o_r_clean_and_safely_stored_milk_containers#.includes(\"G1\")) ? \"G1 Food not adequately washed, or not safely stored\" : (!#o_r_clean_and_safely_stored_food#.includes(\"G2\") || #o_r_clean_and_safely_stored_food#.includes(\"G2\")) && (!#o_r_clean_and_safely_stored_milk_containers# || #o_r_clean_and_safely_stored_milk_containers#.includes(\"G2\")) && (!#o_r_clean_and_safely_stored_kitchen_utensils# || #o_r_clean_and_safely_stored_kitchen_utensils#.includes(\"G2\")) ? \"G2 Clean and safely stored food\" : \"G0 Food not clean and not safely stored\"",
"multiline": false
}
},
Expand Down Expand Up @@ -6805,6 +6809,10 @@
"meta": false,
"options": null,
"dependency": [
{
"id": 1710829091,
"options": ["yes_animals_kept_in_household_compound"]
},
{
"id": 16994260598422,
"options": ["yes"]
Expand All @@ -6815,7 +6823,7 @@
"G0 No safe management of animals and animal wastes": "#FD3F31",
"G2 Safe management of animals and animal wastes": "#93D371"
},
"fnString": "#monitor_G2#.includes(\"yes\") && #o_r_no_visible_animal_wastes_in_house_or_compound#.includes(\"G2\") && #o_r_safe_separation_of_animals_from_under5_children#.includes(\"G2\") && #o_r_safe_management_of_animal_wastes_in_compound#.includes(\"G2\") ? \"G2 Safe management of animals and animal wastes\" : \"G0 No safe management of animals and animal wastes\"",
"fnString": "#monitor_G2#.includes(\"yes\") && (!#o_r_no_visible_animal_wastes_in_house_or_compound# || #o_r_no_visible_animal_wastes_in_house_or_compound#.includes(\"G2\")) && (!#o_r_safe_separation_of_animals_from_under5_children# || #o_r_safe_separation_of_animals_from_under5_children#.includes(\"G2\")) && (!#o_r_safe_management_of_animal_wastes_in_compound# || #o_r_safe_management_of_animal_wastes_in_compound#.includes(\"G2\")) ? \"G2 Safe management of animals and animal wastes\" : \"G0 No safe management of animals and animal wastes\"",
"multiline": false
}
},
Expand Down Expand Up @@ -7012,7 +7020,7 @@
"G2 Inadequate personal hygiene": "#93D371",
"G3 Good personal hygiene": "#4088F4"
},
"fnString": "#monitor_G3#.includes(\"yes\") && #o_r_clean_face_and_hands#.includes(\"G1\") && #o_r_good_menstrual_health#.includes(\"G1\") ? \"G1 No personal hygiene\" : #o_r_clean_face_and_hands#.includes(\"G3\") && #o_r_good_menstrual_health#.includes(\"G3\") ? \"G3 Good personal hygiene\" : \"G2 Inadequate personal hygiene\"",
"fnString": "#monitor_G3#.includes(\"yes\") && (!#o_r_clean_face_and_hands# || #o_r_clean_face_and_hands#.includes(\"G1\")) && (!#o_r_good_menstrual_health# || #o_r_good_menstrual_health#.includes(\"G1\")) ? \"G1 No personal hygiene\" : (!#o_r_clean_face_and_hands# || #o_r_clean_face_and_hands#.includes(\"G3\")) && (!#o_r_good_menstrual_health# || #o_r_good_menstrual_health#.includes(\"G3\")) ? \"G3 Good personal hygiene\" : \"G2 Inadequate personal hygiene\"",
"multiline": false
}
},
Expand Down Expand Up @@ -7245,7 +7253,7 @@
"id": 1712657830,
"order": 23,
"name": "o_r_endemic",
"label": "G3-E2 OUTCOME RESULT - Endemic outcomes",
"label": "G3-E OUTCOME RESULT - Endemic outcomes",
"short_label": null,
"type": "autofield",
"tooltip": null,
Expand Down Expand Up @@ -7361,7 +7369,7 @@
"G2 SAFE AND SUSTAINABLE HOUSEHOLD": "#93D371",
"G3 CLEAN AND HEALTHY HOUSEHOLD": "#4088F4"
},
"fnString": "((!#overall_toilet_outcome# || #overall_toilet_outcome#.includes(\"G1\")) && (!#overall_hygiene_outcome# || #overall_hygiene_outcome#.includes(\"G1\")) && (!#overall_other_outcome# || #overall_other_outcome#.includes(\"G1\"))) ? \"G1 ODF HOUSEHOLD\" : ((!#overall_toilet_outcome# || #overall_toilet_outcome#.includes(\"G2\")) && (!#overall_hygiene_outcome# || #overall_hygiene_outcome#.includes(\"G2\")) && (!#overall_other_outcome# || #overall_other_outcome#.includes(\"G2\"))) ? \"G2 SAFE AND SUSTAINABLE HOUSEHOLD\" : ((!#overall_toilet_outcome# || #overall_toilet_outcome#.includes(\"G3\")) && (!#overall_hygiene_outcome# || #overall_hygiene_outcome#.includes(\"G3\")) && (!#overall_other_outcome# || #overall_other_outcome#.includes(\"G3\"))) ? \"G3 CLEAN AND HEALTHY HOUSEHOLD\" : \"G0 HOUSEHOLD WITH UNSAFELY MANAGED SERVICES\"",
"fnString": "((!#overall_toilet_outcome# || #overall_toilet_outcome#.includes(\"G0\")) || (!#overall_hygiene_outcome# || #overall_hygiene_outcome#.includes(\"G0\")) || (!#overall_other_outcome# || #overall_other_outcome#.includes(\"G0\"))) ? \"G0 HOUSEHOLD WITH UNSAFELY MANAGED SERVICES\" : ((!#overall_toilet_outcome# || #overall_toilet_outcome#.includes(\"G1\")) || (!#overall_hygiene_outcome# || #overall_hygiene_outcome#.includes(\"G1\")) || (!#overall_other_outcome# || #overall_other_outcome#.includes(\"G1\"))) ? \"G1 ODF HOUSEHOLD\" : ((!#overall_toilet_outcome# || #overall_toilet_outcome#.includes(\"G2\")) || (!#overall_hygiene_outcome# || #overall_hygiene_outcome#.includes(\"G2\")) || (!#overall_other_outcome# || #overall_other_outcome#.includes(\"G2\"))) ? \"G2 SAFE AND SUSTAINABLE HOUSEHOLD\" : \"G3 CLEAN AND HEALTHY HOUSEHOLD\"",
"multiline": false
}
}
Expand Down
2 changes: 1 addition & 1 deletion backend/source/forms/1699354006503.prod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1113,7 +1113,7 @@
},
{
"order": 3,
"label": "Clean compound with no visible solid wastes in communal areas",
"label": "No visible solid wastes in communal areas",
"value": "g3_clean_compound_with_no_visible_solid_wastes_communal_areas",
"color": "#38A15A"
}
Expand Down
Loading