KHP3-3747: TB Follow up schema validation (#137)

palladiumkenya · Jul 19, 2023 · 19536f0 · 19536f0
1 parent 21a8b1e
commit 19536f0
Showing 1 changed file with 88 additions and 78 deletions.
diff --git a/configuration/ampathforms/TB_FollowUp.json b/configuration/ampathforms/TB_FollowUp.json
@@ -51,88 +51,98 @@
 					"isExpanded": "true",
 					"questions": [
 						{
-							"label": "Type:",
-							"type": "obs",
-							"id": "testType",
+							"label": "Sputum Results",
+							"type": "obsGroup",
 							"questionOptions": {
-								"concept": "159961AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"rendering": "select",
-								"answers": [
-									{
-										"concept": "161880AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Fluorescence Microscopy"
-									},
-									{
-										"concept": "160022AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "ZN Smear Microscopy"
+								"concept": "159960AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+								"rendering": "group"
+							},
+							"questions": [
+								{
+									"label": "Type:",
+									"type": "obs",
+									"id": "testType",
+									"questionOptions": {
+										"concept": "159961AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"rendering": "select",
+										"answers": [
+											{
+												"concept": "161880AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "Fluorescence Microscopy"
+											},
+											{
+												"concept": "160022AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "ZN Smear Microscopy"
+											}
+										]
 									}
-								]
-							}
-						},
-						{
-							"label": "Result:",
-							"type": "obs",
-							"id": "sputumResults",
-							"questionOptions": {
-								"concept": "307AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"rendering": "select",
-								"answers": [
-									{
-										"concept": "159985AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Scanty"
-									},
-									{
-										"concept": "1362AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "+"
-									},
-									{
-										"concept": "1363AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "++"
+								},
+								{
+									"label": "Result:",
+									"type": "obs",
+									"id": "sputumResults",
+									"questionOptions": {
+										"concept": "307AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"rendering": "select",
+										"answers": [
+											{
+												"concept": "159985AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "Scanty"
+											},
+											{
+												"concept": "1362AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "+"
+											},
+											{
+												"concept": "1363AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "++"
+											},
+											{
+												"concept": "1364AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "+++"
+											},
+											{
+												"concept": "664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+												"label": "Negative"
+											}
+										]
+									}
+								},
+								{
+									"label": "Serial No:",
+									"type": "obs",
+									"questionOptions": {
+										"rendering": "number",
+										"concept": "159968AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
 									},
-									{
-										"concept": "1364AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "+++"
+									"id": "serialNumber"
+								},
+								{
+									"label": "Quantity:",
+									"type": "obs",
+									"questionOptions": {
+										"rendering": "number",
+										"concept": "160023AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"max": "",
+										"min": "",
+										"showDate": ""
 									},
-									{
-										"concept": "664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-										"label": "Negative"
-									}
-								]
-							}
-						},
-						{
-							"label": "Serial No:",
-							"type": "obs",
-							"questionOptions": {
-								"rendering": "number",
-								"concept": "159968AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-							},
-							"id": "serialNumber"
-						},
-						{
-							"label": "Quantity:",
-							"type": "obs",
-							"questionOptions": {
-								"rendering": "number",
-								"concept": "160023AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"max": "",
-								"min": "",
-								"showDate": ""
-							},
-							"id": "quantity"
-						},
-						{
-							"label": "Date Done",
-							"type": "obs",
-							"id": "dateSputumResultsDate",
-							"questionOptions": {
-								"concept": "159964AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-								"rendering": "date"
-							},
-							"validators": [
+									"id": "quantity"
+								},
 								{
-									"type": "date",
-									"allowFutureDates": "false"
+									"label": "Date Done",
+									"type": "obs",
+									"id": "dateSputumResultsDate",
+									"questionOptions": {
+										"concept": "159964AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+										"rendering": "date"
+									},
+									"validators": [
+										{
+											"type": "date",
+											"allowFutureDates": "false"
+										}
+									]
 								}
 							]
 						}
@@ -294,7 +304,7 @@
 						},
 						{
 							"label": "Return Visit date",
-							"type": "date",
+							"type": "obs",
 							"questionOptions": {
 								"rendering": "date",
 								"concept": "5096AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"