From 1622691e4c329f6e02d70da33fc4bee8609bc493 Mon Sep 17 00:00:00 2001
From: kantush <sainingo>
Date: Fri, 6 Oct 2023 11:27:22 +0300
Subject: [PATCH 1/2] Validate ART Preparion Form

---
 programs/patient-program-config.json | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/programs/patient-program-config.json b/programs/patient-program-config.json
index b5f1f8a49..11387f409 100755
--- a/programs/patient-program-config.json
+++ b/programs/patient-program-config.json
@@ -125,6 +125,10 @@
           {
             "uuid": "37770eca-8a2f-48d6-b3c8-54af0fa989c2",
             "display": "MENTALHEALTHSCREENING"
+          },
+          {
+            "uuid": "61ad56ae-a2c3-4ddb-a351-8c8ae253378c",
+            "display": "ADULTARTPREPARATION"
           }
         ]
       },
@@ -277,7 +281,7 @@
       {
         "uuid": "18faa058-4eea-4339-a959-84b3e5cb30be",
         "name": "Pediatric HIV Initial Visit ",
-        "allowedIf": "age <= 14 && programLocation === intendedVisitLocationUuid && isFirstAMPATHHIVVisit",
+        "allowedIf": "age >= 14 && programLocation === intendedVisitLocationUuid && isFirstAMPATHHIVVisit",
         "message": "Patient has to be 14rs and below ,in the location he enrolled into the HIV Care and Treatment program and there must not be prior clinical encounter.",
         "encounterTypes": [
           {
@@ -331,6 +335,10 @@
           {
             "uuid": "37770eca-8a2f-48d6-b3c8-54af0fa989c2",
             "display": "MENTALHEALTHSCREENING"
+          },
+          {
+            "uuid": "bda00ff3-c811-4223-a602-3eb31c96d1f2",
+            "display": "PEDARTPREPARATION"
           }
         ]
       },
@@ -514,6 +522,10 @@
           {
             "uuid": "37770eca-8a2f-48d6-b3c8-54af0fa989c2",
             "display": "MENTALHEALTHSCREENING"
+          },
+          {
+            "uuid": "a400ea27-7052-4745-b51f-d9370aaef4dc",
+            "display": "YOUTHARTPREPARATION"
           }
         ]
       },

From 66538cc21f7b32aff9fcaf98f4fd63b9b8c84152 Mon Sep 17 00:00:00 2001
From: kantush <sainingo>
Date: Fri, 6 Oct 2023 11:46:58 +0300
Subject: [PATCH 2/2] Add validation in art prepartion form for Adult, Youth
 and Ped clients

---
 programs/patient-program-config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/programs/patient-program-config.json b/programs/patient-program-config.json
index 11387f409..f48107fe6 100755
--- a/programs/patient-program-config.json
+++ b/programs/patient-program-config.json
@@ -281,7 +281,7 @@
       {
         "uuid": "18faa058-4eea-4339-a959-84b3e5cb30be",
         "name": "Pediatric HIV Initial Visit ",
-        "allowedIf": "age >= 14 && programLocation === intendedVisitLocationUuid && isFirstAMPATHHIVVisit",
+        "allowedIf": "age <= 14 && programLocation === intendedVisitLocationUuid && isFirstAMPATHHIVVisit",
         "message": "Patient has to be 14rs and below ,in the location he enrolled into the HIV Care and Treatment program and there must not be prior clinical encounter.",
         "encounterTypes": [
           {