From 7b93f0262448e146c83fa7410ecef4638687320d Mon Sep 17 00:00:00 2001 From: Jonah Kisioh Date: Tue, 16 Jul 2024 10:59:17 +0300 Subject: [PATCH] change option text on G3-3.2 --- backend/source/forms/1699353915355.prod.json | 14 +++++++++----- backend/source/forms/1699354006503.prod.json | 2 +- frontend/src/setupProxy.js | 8 ++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/backend/source/forms/1699353915355.prod.json b/backend/source/forms/1699353915355.prod.json index 5f9e802dd..d48ee453a 100644 --- a/backend/source/forms/1699353915355.prod.json +++ b/backend/source/forms/1699353915355.prod.json @@ -6619,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 } }, @@ -6809,6 +6809,10 @@ "meta": false, "options": null, "dependency": [ + { + "id": 1710829091, + "options": ["yes_animals_kept_in_household_compound"] + }, { "id": 16994260598422, "options": ["yes"] @@ -6819,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 } }, @@ -7016,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 } }, @@ -7249,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, @@ -7365,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(\"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\"", "multiline": false } } diff --git a/backend/source/forms/1699354006503.prod.json b/backend/source/forms/1699354006503.prod.json index a3f810f31..8e603d412 100644 --- a/backend/source/forms/1699354006503.prod.json +++ b/backend/source/forms/1699354006503.prod.json @@ -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" } diff --git a/frontend/src/setupProxy.js b/frontend/src/setupProxy.js index b00eb5c53..83e6e9594 100644 --- a/frontend/src/setupProxy.js +++ b/frontend/src/setupProxy.js @@ -4,14 +4,14 @@ module.exports = function (app) { app.use( ["/api/**", "/static-files/**"], createProxyMiddleware({ - target: "http://127.0.0.1:8000", + target: "http://localhost:8000", changeOrigin: true, }) ); app.use( ["/config.js"], createProxyMiddleware({ - target: "http://127.0.0.1:8000", + target: "http://localhost:8000", changeOrigin: true, secure: false, pathRewrite: { @@ -22,7 +22,7 @@ module.exports = function (app) { app.use( ["/app"], createProxyMiddleware({ - target: "http://127.0.0.1:3000", + target: "http://localhost:3000", changeOrigin: true, pathRewrite: { "^/app": "/apk/rtmis.apk", @@ -32,7 +32,7 @@ module.exports = function (app) { app.use( ["/master-data"], createProxyMiddleware({ - target: "http://127.0.0.1:3000", + target: "http://localhost:3000", changeOrigin: true, pathRewrite: { "^/master-data": "/master_data/kenya-administration.csv",