From d0d8bfdd1fc31567d974b22d1cae4527be324635 Mon Sep 17 00:00:00 2001 From: Marc Abbyad Date: Wed, 23 May 2018 15:38:14 -0400 Subject: [PATCH] Updated delivery form in Standard Related to #3825 and #4115 --- standard/app_settings.json | 9 +++++++-- standard/translations/messages-en.properties | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/standard/app_settings.json b/standard/app_settings.json index 8443cd6d26..fbb0462849 100644 --- a/standard/app_settings.json +++ b/standard/app_settings.json @@ -543,6 +543,11 @@ "property": "delivery_code", "rule": "regex('^(F|f|S|s|Ns|NS|ns|nS)$')", "translation_key": "messages.d.validation.delivery_code" + }, + { + "property": "days_since_birth", + "rule": "lenMin(1) ? (integer && between(0,365)) : optional", + "translation_key": "messages.d.validation.days_since_birth" } ] }, @@ -3702,10 +3707,10 @@ } }, "position": 2, - "type": "string", + "type": "integer", "length": [ 1, - 20 + 3 ], "required": false } diff --git a/standard/translations/messages-en.properties b/standard/translations/messages-en.properties index 0411186046..d8b5e62bec 100644 --- a/standard/translations/messages-en.properties +++ b/standard/translations/messages-en.properties @@ -26,4 +26,6 @@ messages.schedule.postnatal.week_6 = Please see that {{patient_name}} ({{patient messages.schedule.postnatal.week_6_overdue = Did {{patient_name}} ({{patient_id}}) go to their week-6 postnatal visit? Let us know with 'M {{patient_id}}'. Thanks! report.delivery.delivery_code_label = Delivery Code -report.delivery.pregnancy_outcome_label = Pregnancy Outcome \ No newline at end of file +report.delivery.pregnancy_outcome_label = Pregnancy Outcome + +messages.d.validation.days_since_birth = The delivery report for {{patient_id}} is incorrect. Please ensure that the days since delivery is a number of days between 0 and 365, or left blank. \ No newline at end of file