From 62c988a1a8cb337b55440781db4ace0a64da06d7 Mon Sep 17 00:00:00 2001 From: joycarpediem Date: Sun, 21 Jan 2024 00:10:48 +0100 Subject: [PATCH 1/4] #1024 changed number of min values --- backend/source/forms/1701172125596.prod.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/source/forms/1701172125596.prod.json b/backend/source/forms/1701172125596.prod.json index bfedfc8d5..557ff0a08 100644 --- a/backend/source/forms/1701172125596.prod.json +++ b/backend/source/forms/1701172125596.prod.json @@ -160,12 +160,12 @@ "options": [ { "id": 1701329110965, - "name": "School (select school from list of schools)", + "name": "School", "order": 1 }, { "id": 1701329110966, - "name": "Healthcare facility (select healthcare facility from list of HCFs)", + "name": "Healthcare facility", "order": 2 }, { @@ -288,8 +288,8 @@ "meta": false, "options": null, "rule": { - "max": 100, - "min": 1 + "max": 99, + "min": 0 }, "fn": null }, @@ -303,8 +303,8 @@ "meta": false, "options": null, "rule": { - "max": 100, - "min": 1 + "max": 99, + "min": 0 }, "fn": null }, From 526e9ff5d877396150b7dee91a3ef3a0f7d439fc Mon Sep 17 00:00:00 2001 From: joycarpediem Date: Sun, 21 Jan 2024 00:24:16 +0100 Subject: [PATCH 2/4] #1024 update prefill value --- backend/source/forms/1701172125596.prod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/source/forms/1701172125596.prod.json b/backend/source/forms/1701172125596.prod.json index 557ff0a08..e6ebc7edf 100644 --- a/backend/source/forms/1701172125596.prod.json +++ b/backend/source/forms/1701172125596.prod.json @@ -97,7 +97,7 @@ }, { "id": 1701358601048, - "answer": ["G1 Jerrycan or other closed container"] + "answer": ["G0 No handwashing facility"] }, { "id": 1701359046016, From a712a22049b68e6f8654e007b536d46dc50e6d1f Mon Sep 17 00:00:00 2001 From: joycarpediem Date: Sun, 21 Jan 2024 06:22:15 +0100 Subject: [PATCH 3/4] #1024 Changed option colour --- backend/source/forms/1701172125596.prod.json | 130 +++++++++---------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/backend/source/forms/1701172125596.prod.json b/backend/source/forms/1701172125596.prod.json index e6ebc7edf..1c704ca4b 100644 --- a/backend/source/forms/1701172125596.prod.json +++ b/backend/source/forms/1701172125596.prod.json @@ -262,19 +262,19 @@ "id": 1701331266939, "name": "G0 All institution toilets are NON-functional", "order": 1, - "color": "#ffc7ce" + "color": "#DB3B3B" }, { "id": 1701331266940, "name": "G1 Some institution toilets are non-functional ", "order": 2, - "color": "#ffeb9c" + "color": "#ffa57d" }, { "id": 1701331278390, "name": "G3 All toilets in the institution are functional", "order": 3, - "color": "#c6efce" + "color": "#38A15A" } ] }, @@ -323,19 +323,19 @@ "id": 1701331313074, "name": "G0 All institution toilets are NOT flyproof", "order": 1, - "color": "#ffc7ce" + "color": "#DB3B3B" }, { "id": 1701331313076, "name": "G1 Some institution toilets are NOT flyproof", "order": 2, - "color": "#ffeb9c" + "color": "#ffa57d" }, { "id": 1701331313075, "name": "G3 All functional toilets are flyproof", "order": 3, - "color": "#c6efce" + "color": "#38A15A" } ] }, @@ -354,19 +354,19 @@ "id": 17013313130741, "name": "G0 All institution toilets are NOT clean", "order": 1, - "color": "#ffc7ce" + "color": "#DB3B3B" }, { "id": 17013313130761, "name": "G1 Some institution toilets are NOT clean", "order": 2, - "color": "#ffeb9c" + "color": "#ffa57d" }, { "id": 17013313130751, "name": "G3 All functional toilets are clean", "order": 3, - "color": "#c6efce" + "color": "#38A15A" } ] }, @@ -385,19 +385,19 @@ "id": 17013313130749, "name": "G0 All institution toilet slabs are NOT durable", "order": 1, - "color": "#ffc7ce" + "color": "#DB3B3B" }, { "id": 17013313130769, "name": "G1 Some institution toilet slabs are NOT durable", "order": 2, - "color": "#ffeb9c" + "color": "#ffa57d" }, { "id": 17013313130759, "name": "G3 All institution functional toilet slabs are durable", "order": 3, - "color": "#c6efce" + "color": "#38A15A" } ] }, @@ -416,19 +416,19 @@ "id": 17013313130748, "name": "G0 All institution toilet pits are NOT durable", "order": 1, - "color": "#ffc7ce" + "color": "#DB3B3B" }, { "id": 17013313130768, "name": "G1 Some institution toilet pits are NOT durable", "order": 2, - "color": "#ffeb9c" + "color": "#ffa57d" }, { "id": 17013313130758, "name": "G3 All institution functional toilet pits are durable", "order": 3, - "color": "#c6efce" + "color": "#38A15A" } ] }, @@ -447,19 +447,19 @@ "id": 1701332463584, "name": "G0 Visible surface outflows from containment", "order": 1, - "color": "#ffc7ce" + "color": "#DB3B3B" }, { "id": 1701332463585, "name": "G1 Evidence of previous surface outflows from containment", "order": 2, - "color": "#ffeb9c" + "color": "#ffa57d" }, { "id": 1701332482749, "name": "G3 Safely managed containment in all institutions: no surface outflows", "order": 3, - "color": "#c6efce" + "color": "#38A15A" } ] }, @@ -478,37 +478,37 @@ "id": 1701332582354, "name": "G0 No toilets, or no containment/collection systems", "order": 1, - "color": "#ffc7ce" + "color": "#DB3B3B" }, { "id": 1701332582355, "name": "G0 Unsafe containment: open containers", "order": 2, - "color": "#ffc7ce" + "color": "#DB3B3B" }, { "id": 1701332605264, "name": "G1 Risk of unsafe services: never emptied (intention to empty when full)", "order": 3, - "color": "#ffeb9c" + "color": "#ffa57d" }, { "id": 1701332605265, "name": "G3 Never emptied, not yet full (first toilets: no intention to empty)", "order": 3, - "color": "#c6efce" + "color": "#38A15A" }, { "id": 1701332605266, "name": "G3 Never emptied, previous pits or tanks replaced when full", "order": 3, - "color": "#c6efce" + "color": "#38A15A" }, { "id": 1701332605267, "name": "G3 Safely managed: sewer connection to LICENSED and FUNCTIONAL treatment site", "order": 3, - "color": "#c6efce" + "color": "#38A15A" } ] }, @@ -527,79 +527,79 @@ "id": 1701334491522, "name": "G0 Unsafe disposal: to open pit, open space, open drain or water body (within 500m)", "order": 1, - "color": "#ffc7ce" + "color": "#DB3B3B" }, { "id": 1701334492574, "name": "G0 Unsafe disposal: to open space, open drain or water body (MORE than 500m)", "order": 2, - "color": "#ffc7ce" + "color": "#DB3B3B" }, { "id": 1701334493522, "name": "G0 Unsafe treatment or disposal: emptied by UNLICENSED service provider to off-site location", "order": 3, - "color": "#ffc7ce" + "color": "#DB3B3B" }, { "id": 1701334494489, "name": "G0 Unsafe treatment or disposal: closed container removed by UNLICENSED service provider to off-site location", "order": 4, - "color": "#ffc7ce" + "color": "#DB3B3B" }, { "id": 1701334496165, "name": "G0 Unsafe treatment or disposal: sewer connection to open discharge", "order": 5, - "color": "#ffc7ce" + "color": "#DB3B3B" }, { "id": 1701332496165, "name": "G0 Unsafe services: other unsafely managed services", "order": 6, - "color": "#ffc7ce" + "color": "#DB3B3B" }, { "id": 1701334548218, "name": "G1 Unsafe storage: stored for less than 2 years before use of stored waste", "order": 7, - "color": "#ffeb9c" + "color": "#ffa57d" }, { "id": 1701334550089, "name": "G1 Unsafe treatment or disposal: sewer connection to UNLICENSED or NON-FUNCTIONAL treatment site", "order": 8, - "color": "#ffeb9c" + "color": "#ffa57d" }, { "id": 1701334551055, "name": "G3 Safely managed: emptied to covered pit", "order": 9, - "color": "#c6efce" + "color": "#38A15A" }, { "id": 1701334586422, "name": "G3 Safely managed: stored for MORE than 2 years before use of stored waste", "order": 10, - "color": "#c6efce" + "color": "#38A15A" }, { "id": 1701334595239, "name": "G3 Safely managed: emptied by LICENSED service provider to off-site location", "order": 11, - "color": "#c6efce" + "color": "#38A15A" }, { "id": 1701334626772, "name": "G3 Safely managed: closed container removed by LICENSED service provider to off-site location", "order": 13, - "color": "#c6efce" + "color": "#38A15A" }, { "id": 1701334641373, "name": "G3 Safely managed: other safely managed services", "order": 14, - "color": "#c6efce" + "color": "#38A15A" } ] }, @@ -618,37 +618,37 @@ "id": 1701334867481, "name": "G0 No handwashing facility", "order": 1, - "color": "#ffc7ce" + "color": "#DB3B3B" }, { "id": 1701334867482, "name": "G1 Handwashing facility by toilet", "order": 2, - "color": "#c6efce" + "color": "#38A15A" }, { "id": 1701334902650, "name": "G1 Handwashing facility in kitchen", "order": 3, - "color": "#c6efce" + "color": "#38A15A" }, { "id": 1701334913417, "name": "G1 Portable handwashing facility (basin, jug, jerrycan, container)", "order": 4, - "color": "#c6efce" + "color": "#38A15A" }, { "id": 1701334921833, "name": "G1 Two handwashing facilities", "order": 5, - "color": "#c6efce" + "color": "#38A15A" }, { "id": 1701334930550, "name": "G1 More than two handwashing facilities", "order": 6, - "color": "#c6efce" + "color": "#38A15A" } ] }, @@ -667,19 +667,19 @@ "id": 1701334998750, "name": "G0 No water available", "order": 1, - "color": "#ffc7ce" + "color": "#DB3B3B" }, { "id": 1701334998751, "name": "G1 Water available", "order": 2, - "color": "#c6efce" + "color": "#38A15A" }, { "id": 1701335022266, "name": "G1 Water container empty (evidence of washing)", "order": 3, - "color": "#c6efce" + "color": "#38A15A" } ] }, @@ -698,25 +698,25 @@ "id": 1701335571049, "name": "G0 No soap or other cleanser available", "order": 1, - "color": "#ffc7ce" + "color": "#DB3B3B" }, { "id": 1701335571050, "name": "G0 Ash, mud or sand available", "order": 2, - "color": "#ffc7ce" + "color": "#DB3B3B" }, { "id": 1701335595072, "name": "G0+ Soap available, NOT at handwashing facility", "order": 3, - "color": "#ffeb9c" + "color": "#ffa57d" }, { "id": 1701335713812, "name": "G1 Solid, liquid or powder soap available", "order": 4, - "color": "#c6efce" + "color": "#38A15A" } ] }, @@ -735,43 +735,43 @@ "id": 1701358615411, "name": "G0 No handwashing facility", "order": 1, - "color": "#ffc7ce" + "color": "#DB3B3B" }, { "id": 1701358615412, "name": "G1 Jerrycan or other closed container", "order": 2, - "color": "#ffeb9c" + "color": "#ffa57d" }, { "id": 1701358722331, "name": "G1 Portable basin or other open container", "order": 3, - "color": "#ffeb9c" + "color": "#ffa57d" }, { "id": 1701358730369, "name": "G1 Other temporary handwashing facility", "order": 4, - "color": "#ffeb9c" + "color": "#ffa57d" }, { "id": 1701358760052, "name": "G3 Other permanent handwashing station", "order": 7, - "color": "#c6efce" + "color": "#38A15A" }, { "id": 1701358738247, "name": "G3 Piped water tap with basin", "order": 5, - "color": "#c6efce" + "color": "#38A15A" }, { "id": 1701358750298, "name": "G3 Market handwashing station with adequate water storage", "order": 6, - "color": "#c6efce" + "color": "#38A15A" } ] }, @@ -790,31 +790,31 @@ "id": 1701359132626, "name": "G0 Hands enter the water container (during collection and use)", "order": 1, - "color": "#ffc7ce" + "color": "#DB3B3B" }, { "id": 1701359132627, "name": "G1 Water collected by hand (using ladle, cup, other)", "order": 2, - "color": "#ffeb9c" + "color": "#ffa57d" }, { "id": 1701359173371, "name": "G3 Closed water storage container with tap", "order": 3, - "color": "#c6efce" + "color": "#38A15A" }, { "id": 1701359182211, "name": "G3 Piped water tap", "order": 4, - "color": "#c6efce" + "color": "#38A15A" }, { "id": 1701359190662, "name": "G3 Other hands-free operation", "order": 5, - "color": "#c6efce" + "color": "#38A15A" } ] }, @@ -833,19 +833,19 @@ "id": 1701359238005, "name": "G0 No collection or disposal of washing water", "order": 1, - "color": "#ffc7ce" + "color": "#DB3B3B" }, { "id": 1701359238006, "name": "G1 Collection of washing water without drainage or disposal", "order": 2, - "color": "#ffeb9c" + "color": "#ffa57d" }, { "id": 1701359351504, "name": "G3 Safe collection and disposal of washing water", "order": 3, - "color": "#c6efce" + "color": "#38A15A" } ] } From 5b9236d2aaefdbd1e9cff393adab8cba62937b45 Mon Sep 17 00:00:00 2001 From: navins94 Date: Sun, 21 Jan 2024 13:41:10 +0530 Subject: [PATCH 4/4] [#1024] Update institution form --- backend/source/forms/1701172125596.prod.json | 78 ++++++++++++++++++-- 1 file changed, 72 insertions(+), 6 deletions(-) diff --git a/backend/source/forms/1701172125596.prod.json b/backend/source/forms/1701172125596.prod.json index 1c704ca4b..ae57ce2d2 100644 --- a/backend/source/forms/1701172125596.prod.json +++ b/backend/source/forms/1701172125596.prod.json @@ -108,6 +108,10 @@ { "id": 1701359231461, "answer": ["G0 No collection or disposal of washing water"] + }, + { + "id": 1702282914707, + "answer": ["G0 High risk of groundwater contamination"] } ] } @@ -603,10 +607,53 @@ } ] }, + { + "id": 1702282796765, + "question": "COMMUNITY LEVEL ASSESSMENT: Low risk of groundwater contamination", + "order": 14, + "type": "option", + "tooltip": null, + "required": true, + "meta": false, + "options": [ + { + "id": 1702282914707, + "name": "G0 High risk of groundwater contamination", + "order": 1, + "color": "#DB3B3B" + }, + { + "id": 1702282914708, + "name": "G2 Low risk of groundwater contamination", + "order": 2, + "color": "#38A15A" + } + ], + "fn": null + }, + { + "id": 1702283955461, + "question": "Outcome result - Safely managed and usable institutional toilets", + "order": 15, + "type": "autofield", + "tooltip": null, + "required": true, + "meta": false, + "options": null, + "fn": { + "fnColor": { + "G0 Institutional sanitation services UNSAFELY managed": "#FD3F31", + "G1 Inadequate institutional sanitation services": "#FDC74B", + "G3 Use of safely managed institutional sanitation services": "#4088F4" + }, + "fnString": "function(){ return (#1701329515408.includes(\"G0\") && #1701331306965.includes(\"G0\") && #1701331373050.includes(\"G0\") && #1701331438759.includes(\"G0\") && #1701331908015.includes(\"G0\") && #1701332234354.includes(\"G0\") && #1701332496414.includes(\"G0\") && #1701334423738.includes(\"G0\")) ? \"G0 Institutional sanitation services UNSAFELY managed\" : ((#1701329515408.includes(\"G3\") && #1701331306965.includes(\"G3\") && #1701331373050.includes(\"G3\") && #1701331438759.includes(\"G3\") && #1701331908015.includes(\"G3\") && #1701332234354.includes(\"G3\") && #1701332496414.includes(\"G3\") && #1701334423738.includes(\"G3\")) ? \"G3 Use of safely managed institutional sanitation services\" : \"G1 Inadequate institutional sanitation services\") }", + "multiline": false + } + }, { "id": 1701334833791, "question": "Handwashing facility observed in institution", - "order": 14, + "order": 16, "type": "option", "required": true, "meta": false, @@ -655,7 +702,7 @@ { "id": 1701334972999, "question": "Water available at institutional HWF", - "order": 15, + "order": 17, "type": "option", "required": true, "meta": false, @@ -686,7 +733,7 @@ { "id": 1701335557029, "question": "Soap available at institutional HWF", - "order": 16, + "order": 18, "type": "option", "required": true, "meta": false, @@ -723,7 +770,7 @@ { "id": 1701358601048, "question": "Institutional handwashing facility type", - "order": 17, + "order": 19, "type": "option", "required": true, "meta": false, @@ -778,7 +825,7 @@ { "id": 1701359046016, "question": "Hands-free operation of institutional handwashing facility", - "order": 18, + "order": 20, "type": "option", "required": true, "meta": false, @@ -821,7 +868,7 @@ { "id": 1701359231461, "question": "Adequate drainage of washing water", - "order": 19, + "order": 21, "type": "option", "required": true, "meta": false, @@ -848,6 +895,25 @@ "color": "#38A15A" } ] + }, + { + "id": 1701358131461, + "question": "Outcome result - Permanent handwashing stations in institution", + "order": 22, + "type": "autofield", + "tooltip": null, + "required": true, + "meta": false, + "options": null, + "fn": { + "fnColor": { + "G0 No or inadequate handwashing services": "#FD3F31", + "G1 Non-durable handwashing services": "#FDC74B", + "G3 Permanent handwashing services": "#4088F4" + }, + "fnString": "function(){ return (#1701334833791.includes(\"G0\") && #1701334972999.includes(\"G0\") && #1701335557029.includes(\"G0\") && #1701358601048.includes(\"G0\") && #1701359046016.includes(\"G0\") && #1701359231461.includes(\"G0\")) ? \"G0 No or inadequate handwashing services\" : ((#1701358601048.includes(\"G3\") && #1701359046016.includes(\"G3\") && #1701359231461.includes(\"G3\")) ? \"G3 Permanent handwashing services\" : \"G1 Non-durable handwashing services\") }", + "multiline": false + } } ] }