Merge branch 'develop' of https://github.com/CDC-HIS/openmrs-esm-ethi…

…ohri into develop
CDC-HIS · Jul 25, 2024 · 841ad5c · 841ad5c
2 parents df2a795 + 5389402
commit 841ad5c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/forms/followup.json b/src/forms/followup.json
@@ -3759,7 +3759,7 @@
 								"showDate": ""
 							},
 							"hide": {
-								"hideWhenExpression": "age > 5"
+								"hideWhenExpression": "age >= 5"
 							},
 							"id": "childHeight"
 						},

diff --git a/src/forms/intake-b.json b/src/forms/intake-b.json
@@ -1299,7 +1299,13 @@
 				"hide": {
 				  "hideWhenExpression": "lifelongARTTI !== '1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'"
 				},
-				"validators": []
+				"validators": [
+					{
+					  "type": "js_expression",
+					  "failsWhenExpression": "/^(\\d{4}|\\d{5}|\\d{6}|\\d{7}|\\d{8}|\\d{9})$/.test(myValue)",
+					  "message": "Months on ART should not be more than three digits long"
+					}
+				]
 			  },
 			  {
 				"label": "Still on Treatment",