Fix prep initial validations (#170)

Co-authored-by: Makombe <makombe>
palladiumkenya · Sep 5, 2023 · 56c7e95 · 56c7e95
1 parent d22f182
commit 56c7e95
Showing 1 changed file with 140 additions and 115 deletions.
diff --git a/configuration/ampathforms/PrEP_Initial.json b/configuration/ampathforms/PrEP_Initial.json
@@ -48,110 +48,108 @@
 		  },
 		  {
 			"label": "HIV Positive Partner Profile",
+			"type": "obsGroup",
 			"isExpanded": "true",
+			"questionOptions": {
+			  "rendering": "group",
+			  "concept": "141814AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+			},
+			"id": "hivPositivePartner",
+			"validators": [],
 			"questions": [
-			  {
-				"label": "HIV Positive Partner Profile",
-				"type": "obsGroup",
-				"questionOptions": {
-				  "concept": "141814AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-				  "rendering": "group"
-				},
-				"questions": [],
-				"id": "__rMxMvsIDH"
-			  },
-			  {
-				"label": "HIV+ partner CCC Number",
-				"type": "obs",
-				"id": "partners-ccc",
-				"questionOptions": {
-				  "concept": "162053AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-				  "rendering": "number"
+				{
+					"label": "HIV+ partner CCC Number",
+					"type": "obs",
+					"id": "partners-ccc",
+					"questionOptions": {
+					  "concept": "162053AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+					  "rendering": "number"
+					},
+					"validators": [
+					  {
+						"type": "js_expression",
+						"failsWhenExpression": "(myValue).length > 10 || (myValue).length < 10",
+						"message": "CCC Number digits should not be more or less than 10"
+					  }
+					]
 				},
-				"validators": [
-				  {
-					"type": "js_expression",
-					"failsWhenExpression": "(myValue).length > 10 || (myValue).length < 10",
-					"message": "CCC Number digits should not be more or less than 10"
-				  }
-				]
-			  },
-			  {
-				"label": "CCC number/Enrollment status unknown",
-				"type": "obs",
-				"id": "ccc-enrollment-status",
-				"questionOptions": {
-				  "concept": "159812AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-				  "rendering": "checkbox",
-				  "answers": [
-					{
-					  "concept": "1067AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-					  "label": "CCC number/Enrollment status unknown"
+				{
+					"label": "CCC number/Enrollment status unknown",
+					"type": "obs",
+					"id": "ccc-enrollment-status",
+					"questionOptions": {
+					  "concept": "159812AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+					  "rendering": "checkbox",
+					  "answers": [
+						{
+						  "concept": "1067AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+						  "label": "CCC number/Enrollment status unknown"
+						}
+					  ]
 					}
-				  ]
-				}
-			  },
-			  {
-				"label": "HIV+ partners ART start date",
-				"type": "obs",
-				"id": "artStartDate",
-				"questionOptions": {
-				  "concept": "159599AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-				  "rendering": "date"
-				},
-				"validators": [
+				  },
 				  {
-					"type": "date",
-					"allowFutureDates": "false"
-				  }
-				]
-			  },
-			  {
-				"label": "Year(s)",
-				"type": "obs",
-				"id": "years",
-				"questionOptions": {
-				  "concept": "164393AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-				  "rendering": "number"
-				}
-			  },
-			  {
-				"label": "Month(s)",
-				"type": "obs",
-				"id": "months",
-				"questionOptions": {
-				  "concept": "4978edd0-75ab-40a9-9c07-d4bbeb43fed5",
-				  "rendering": "number"
-				}
-			  },
-			  {
-				"label": "Sex without a condom with a HIV+ partner in the past 30 days",
-				"type": "obs",
-				"id": "sex-without-condom",
-				"questionOptions": {
-				  "concept": "6cb0434b-baa2-4862-aec8-9c468a7340ba",
-				  "rendering": "radio",
-				  "answers": [
-					{
-					  "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-					  "label": "No"
+					"label": "HIV+ partners ART start date",
+					"type": "obs",
+					"id": "artStartDate",
+					"questionOptions": {
+					  "concept": "159599AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+					  "rendering": "date"
 					},
-					{
-					  "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-					  "label": "Yes"
+					"validators": [
+					  {
+						"type": "date",
+						"allowFutureDates": "false"
+					  }
+					]
+				  },
+				  {
+					"label": "Time known to be HIV- serodiscordant (Year(s)",
+					"type": "obs",
+					"id": "years",
+					"questionOptions": {
+					  "concept": "164393AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+					  "rendering": "number"
 					}
-				  ]
-				}
-			  },
-			  {
-				"label": "Number of living children with HIV+ partner",
-				"type": "obs",
-				"id": "number-of-children",
-				"questionOptions": {
-				  "concept": "1825AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-				  "rendering": "number"
-				}
-			  }
+				  },
+				  {
+					"label": "Month(s)",
+					"type": "obs",
+					"id": "months",
+					"questionOptions": {
+					  "concept": "4978edd0-75ab-40a9-9c07-d4bbeb43fed5",
+					  "rendering": "number"
+					}
+				  },
+				  {
+					"label": "Sex without a condom with a HIV+ partner in the past 30 days",
+					"type": "obs",
+					"id": "sex-without-condom",
+					"questionOptions": {
+					  "concept": "6cb0434b-baa2-4862-aec8-9c468a7340ba",
+					  "rendering": "radio",
+					  "answers": [
+						{
+							"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+							"label": "Yes"
+						},
+						{
+						  "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+						  "label": "No"
+						}
+
+					  ]
+					}
+				  },
+				  {
+					"label": "Number of living children with HIV+ partner",
+					"type": "obs",
+					"id": "number-of-children",
+					"questionOptions": {
+					  "concept": "1825AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+					  "rendering": "number"
+					}
+				  }
 			]
 		  },
 		  {
@@ -168,22 +166,23 @@
 				  "rendering": "radio",
 				  "answers": [
 					{
-					  "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-					  "label": "No"
+						"concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+						"label": "Yes"
 					},
 					{
-					  "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-					  "label": "Yes"
+					  "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+					  "label": "No"
 					}
+
 				  ]
 				}
 			  },
 			  {
 				"label": "Select all that apply",
 				"type": "obs",
-				"id": "STIOptions",
+				"id": "STIOptionsFemale",
 				"questionOptions": {
-				  "concept": "",
+				  "concept": "b39992a0-7d5b-4b72-b551-9e0970ae49fa",
 				  "rendering": "checkbox",
 				  "answers": [
 					{
@@ -206,6 +205,32 @@
 					  "concept": "130644AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 					  "label": "Pelvic Inflammatory Disease(PID)"
 					},
+					{
+					  "concept": "148895AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+					  "label": "Anal Discharge(AD)"
+					},
+					{
+					  "concept": "5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+					  "label": "Other(O)"
+					}
+				  ]
+				},
+				"hide": {
+				  "hideWhenExpression": "STIscrEEned !=='1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || sex !=='F'"
+				}
+			  },
+			  {
+				"label": "Select all that apply",
+				"type": "obs",
+				"id": "STIOptionsMale",
+				"questionOptions": {
+				  "concept": "b39992a0-7d5b-4b72-b551-9e0970ae49fa",
+				  "rendering": "checkbox",
+				  "answers": [
+					{
+					  "concept": "1107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+					  "label": "None"
+					},
 					{
 					  "concept": "123529AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 					  "label": "Urethral Discharge(UD)"
@@ -221,7 +246,7 @@
 				  ]
 				},
 				"hide": {
-				  "hideWhenExpression": "STIscrEEned !=='1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+				  "hideWhenExpression": "STIscrEEned !=='1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || sex !== 'M'"
 				}
 			  },
 			  {
@@ -341,7 +366,7 @@
 			"isExpanded": "true",
 			"questions": [
 			  {
-				"label": "Menopause (Status)",
+				"label": "Menopausal (Status)",
 				"type": "obs",
 				"id": "menoPausE",
 				"questionOptions": {
@@ -384,13 +409,13 @@
 				  "concept": "5272AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 				  "rendering": "radio",
 				  "answers": [
-					{
-					  "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-					  "label": "No"
-					},
 					{
 					  "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
 					  "label": "Yes"
+					},
+					{
+					  "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+					  "label": "No"
 					}
 				  ]
 				},
@@ -413,7 +438,7 @@
 				  }
 				],
 				"hide": {
-				  "hideWhenExpression": "menoPausE ==='134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || sex !== 'F'"
+				  "hideWhenExpression": "menoPausE ==='134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || sex !== 'F' || PrEgnancyStatus !=='1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
 				}
 			  },
 			  {
@@ -435,7 +460,7 @@
 				  ]
 				},
 				"hide": {
-				  "hideWhenExpression": "menoPausE ==='134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || sex !== 'F'"
+				  "hideWhenExpression": "menoPausE ==='134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || sex !== 'F' || PrEgnancyStatus !=='1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
 				}
 			  },
 			  {
@@ -457,7 +482,7 @@
 				  ]
 				},
 				"hide": {
-				  "hideWhenExpression": "menoPausE ==='134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || sex !== 'F'"
+				  "hideWhenExpression": "menoPausE ==='134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || sex !== 'F' || PrEgnancyStatus ==='1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
 				}
 			  },
 			  {
@@ -505,11 +530,11 @@
 				  ]
 				},
 				"hide": {
-				  "hideWhenExpression": "menoPausE ==='134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+				  "hideWhenExpression": "menoPausE ==='134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || PrEgnancyStatus ==='1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
 				}
 			  },
 			  {
-				"label": "Select FP Method",
+				"label": "Family Planning Method",
 				"type": "obs",
 				"id": "FPMethods",
 				"questionOptions": {
@@ -563,7 +588,7 @@
 				  ]
 				},
 				"hide": {
-				  "hideWhenExpression": "menoPausE ==='134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || FamilyPlanningStatus === '160652AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+				  "hideWhenExpression": "menoPausE ==='134346AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || FamilyPlanningStatus === '160652AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' || PrEgnancyStatus ==='1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
 				}
 			  }
 			]