Fix for - Viral load result received date should not be earlier than …

…Date VL requested
CDC-HIS · Jul 26, 2024 · 77b7cec · 77b7cec
1 parent fa5315d
commit 77b7cec
Showing 1 changed file with 54 additions and 43 deletions.
diff --git a/src/forms/followup.json b/src/forms/followup.json
@@ -8740,36 +8740,36 @@
 					  "id": "targeted"
 					  },
 					  {
-					  "label": "Date VL Requested",
-					  "type": "obs",
-					  "required": true,
-					  "questionOptions": {
-						"rendering": "date",
-						"concept": "163281AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-						"weeksList": "",
-						"conceptMappings": [
-						{
-						  "type": "CIEL",
-						  "value": "163281"
-						}
-						]
-					  },
-					  "validators": [
-						{
-						  "type": "date",
-						  "allowFutureDates": "false"
+						"label": "Date VL Requested",
+						"type": "obs",
+						"required": true,
+						"questionOptions": {
+						  "rendering": "date",
+						  "concept": "163281AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+						  "weeksList": "",
+						  "conceptMappings": [
+						  {
+							"type": "CIEL",
+							"value": "163281"
+						  }
+						  ]
+						},
+						"hide": {
+						  "hideWhenExpression": "viralLoadPerformed !== '1267AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+						},
+						"id": "dateViralLoadRequested",
+						"validators": [
+							{
+							  "type": "date",
+							  "allowFutureDates": "false"
+							},
+							{
+							  "type": "js_expression",
+							  "failsWhenExpression": "myValue > new Date(dateViralLoadResultReceived)",
+							  "message": "VL requested date should not be later than VL result received date"
+							}
+						  ]
 						},
-						{
-						  "type": "js_expression",
-						  "failsWhenExpression": "myValue < new Date(dateViralLoadResultReceived)",
-						  "message": "Date VL Requested should not be earlier than Viral Load Result Received date"
-						}
-					  ],
-					  "hide": {
-						"hideWhenExpression": "viralLoadPerformed !== '1267AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-					  },
-					  "id": "dateViralLoadRequested"
-					  },
 					  {
 					  "label": "Viral load received?",
 					  "type": "obs",
@@ -8887,20 +8887,31 @@
 					  ],
 					  "id": "vlReceived"
 					},
-					  {
-					  "label": "Date result received",
-					  "type": "obs",
-					  "required": true,
-					  "questionOptions": {
-						"rendering": "date",
-						"concept": "beeede36-cae4-4f6e-b4b9-e39e37353a82",
-						"weeksList": ""
-					  },
-					  "hide": {
-						"hideWhenExpression": "vlReceived !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
-					  },
-					  "id": "dateViralLoadResultReceived"
-					  },
+					{
+						"label": "Date result received",
+						"type": "obs",
+						"required": true,
+						"questionOptions": {
+						  "rendering": "date",
+						  "concept": "beeede36-cae4-4f6e-b4b9-e39e37353a82",
+						  "weeksList": ""
+						},
+						"hide": {
+						  "hideWhenExpression": "vlReceived !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
+						},
+						"id": "dateViralLoadResultReceived",
+						"validators": [
+							{
+							  "type": "date",
+							  "allowFutureDates": "false"
+							},
+							{
+							  "type": "js_expression",
+							  "failsWhenExpression": "myValue < new Date(dateViralLoadRequested)",
+							  "message": "VL result received date should not be earlier than VL requested date"
+							}
+						  ]
+						},
 					  {
 					  "label": "Viral load count",
 					  "type": "obs",