diff --git a/configuration/ampathforms/KVP_Contact.json b/configuration/ampathforms/KVP_Contact.json index fe84c666..5273e0d5 100644 --- a/configuration/ampathforms/KVP_Contact.json +++ b/configuration/ampathforms/KVP_Contact.json @@ -661,7 +661,7 @@ "id": "nameBeach", "required": "true", "questionOptions": { - "concept": "160632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "concept": "166491AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "rendering": "text" }, "hide": { @@ -754,7 +754,7 @@ ] }, "hide": { - "hideWhenExpression": " maleKeyPop !== '105AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && femaleKeyPop !== '105AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && maleKeyPop !== '160666AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && femaleKeyPop !== '160666AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" + "hideWhenExpression": " maleKeyPop !== '105AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && femaleKeyPop !== '105AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && maleKeyPop !== '642945a8-045a-4010-b3f3-bc50aaaab386' && femaleKeyPop !== '642945a8-045a-4010-b3f3-bc50aaaab386'" } }, { @@ -769,18 +769,13 @@ { "type": "number" }, - { - "type": "js_expression", - "failsWhenExpression": "moment(myValue).isBefore(moment(birthdate), 'day')", - "message": "Should not be less than the date of birth." - }, { "type": "date", "allowFutureDates": "false" } ], "hide": { - "hideWhenExpression": " maleKeyPop !== '105AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && femaleKeyPop !== '105AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && maleKeyPop !== '160666AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && femaleKeyPop !== '160666AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" + "hideWhenExpression": " maleKeyPop !== '105AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && femaleKeyPop !== '105AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && maleKeyPop !== '642945a8-045a-4010-b3f3-bc50aaaab386' && femaleKeyPop !== '642945a8-045a-4010-b3f3-bc50aaaab386'" } }, { @@ -791,7 +786,15 @@ "concept": "164393AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "rendering": "number" }, - "validators": [], + "validators": [ + { + "type": "number" + }, + { + "type": "date", + "allowFutureDates": "false" + } + ], "hide": { "hideWhenExpression": " maleKeyPop !== '162198AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' && femaleKeyPop !== '162198AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'" } @@ -805,6 +808,9 @@ "rendering": "date" }, "validators": [ + { + "type": "number" + }, { "type": "date", "allowFutureDates": "false"