From 532748c3ccfca3193f1258027f38ba52e42686b7 Mon Sep 17 00:00:00 2001
From: Kote Cosmas <110154947+ckote@users.noreply.github.com>
Date: Thu, 8 Aug 2024 08:40:29 +0300
Subject: [PATCH] Validation to support showing/hiding of GBV and TB Screening
 questions (#682)

Co-authored-by: Nyaencha evans <enyaencha@gmail.com>
---
 .../HTS_Eligibility_Screening.json            | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/configuration/ampathforms/HTS_Eligibility_Screening.json b/configuration/ampathforms/HTS_Eligibility_Screening.json
index d2a8d14f..6805f789 100644
--- a/configuration/ampathforms/HTS_Eligibility_Screening.json
+++ b/configuration/ampathforms/HTS_Eligibility_Screening.json
@@ -1,7 +1,7 @@
 {
   "name": "HTS Eligibility Screening Form",
   "description": "Form used to screen clients prior to HIV testing",
-  "version": "1",
+  "version": "2.2",
   "published": true,
   "uuid": "04295648-7606-11e8-adc0-fa7ae01bbebc",
   "retired": false,
@@ -681,7 +681,7 @@
               }
             },
             {
-              "label": "Self Test Result:",
+              "label": "Self Test Result :",
               "type": "obs",
               "id": "testedResultsself",
               "questionOptions": {
@@ -1228,7 +1228,7 @@
                 ]
               },
               "hide": {
-                "hideWhenExpression": "testedResultsprovider === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || age > 9 || motHersHivstatus == '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || testHistory == '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "testedResultsprovider === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || age > 9 || motHersHivstatus == '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             },
             {
@@ -1274,7 +1274,7 @@
                 ]
               },
               "hide": {
-                "hideWhenExpression": "age > 9 || testedResultsprovider === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || motHersHivstatus == '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || testHistory == '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "age > 9 || testedResultsprovider === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || motHersHivstatus == '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             }
           ]
@@ -1303,7 +1303,7 @@
                 ]
               },
               "hide": {
-               "hideWhenExpression": "age < 9 || testedResultsprovider === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || motHersHivstatus == '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "age < 9 || testedResultsprovider === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || motHersHivstatus === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             },
             {
@@ -1326,7 +1326,7 @@
               },
               "validators": [],
               "hide": {
-                "hideWhenExpression": "isEmpty(experiencedGbv) || experiencedGbv !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || age < 9 || motHersHivstatus == '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || testHistory == '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' "
+                "hideWhenExpression": "isEmpty(experiencedGbv) || experiencedGbv !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || age < 9"
               }
             },
             {
@@ -1349,7 +1349,7 @@
               },
               "validators": [],
               "hide": {
-                "hideWhenExpression": "isEmpty(experiencedGbv) || experiencedGbv !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || age < 9 || motHersHivstatus == '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || testHistory == '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "isEmpty(experiencedGbv) || experiencedGbv !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || age < 9"
               }
             }
           ]
@@ -1373,7 +1373,7 @@
                 ]
               },
               "hide": {
-                "hideWhenExpression": "age < 15 || testedResultsprovider === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || motHersHivstatus == '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || testHistory == '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "age < 15 || testedResultsprovider === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || motHersHivstatus == '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             },
             {
@@ -1400,7 +1400,7 @@
               },
               "validators": [],
               "hide": {
-                "hideWhenExpression": "isEmpty(prepService) || !arrayContains(prepService, ['1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA']) || age < 15 || motHersHivstatus == '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || testHistory == '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "isEmpty(prepService) || !arrayContains(prepService, ['1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA']) || age < 15 || motHersHivstatus == '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             },
             {
@@ -1418,7 +1418,7 @@
                 ]
               },
               "hide": {
-                "hideWhenExpression": "testedResultsprovider === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || age < 9 || motHersHivstatus == '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || testHistory == '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "testedResultsprovider === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || age < 9 || motHersHivstatus == '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             },
             {
@@ -1463,7 +1463,7 @@
                 ]
               },
               "hide": {
-                "hideWhenExpression": "age < 9 || testedResultsprovider === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || motHersHivstatus == '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || testHistory == '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' "
+                "hideWhenExpression": "age < 9 || testedResultsprovider === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || motHersHivstatus == '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             },
             {
@@ -1519,7 +1519,7 @@
                 ]
               },
               "hide": {
-                 "hideWhenExpression": "testedResultsprovider === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || motHersHivstatus == '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "testedResultsprovider === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || motHersHivstatus == '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             },
             {
@@ -1696,7 +1696,7 @@
                 ]
               },
               "hide": {
-                "hideWhenExpression": "sex !== 'F' || age < 10 || testedResultsprovider === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || motHersHivstatus == '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || testHistory == '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "sex !== 'F' || age < 10 || testedResultsprovider === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || motHersHivstatus == '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             },
             {
@@ -1718,7 +1718,7 @@
                 ]
               },
               "hide": {
-                "hideWhenExpression": "sex !== 'F' || age < 10 || testedResultsprovider === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || motHersHivstatus == '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || testHistory == '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+                "hideWhenExpression": "sex !== 'F' || age < 10 || testedResultsprovider === '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || motHersHivstatus == '703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
               }
             }
           ]
@@ -1764,7 +1764,6 @@
             {
               "label": "Generated HIV Risk Category",
               "type": "obs",
-              "read-only": "true",
               "questionOptions": {
                 "rendering": "radio",
                 "concept": "167163AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",