Merge pull request #922 from opencrvs/ocrvs-6530

Fix regex of dob fields
opencrvs · Feb 29, 2024 · e75aea2 · e75aea2
2 parents f92d992 + 647dee2
commit e75aea2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/api/content/client/descriptions.json b/src/api/content/client/descriptions.json
@@ -721,6 +721,7 @@
     "home.header.placeHolderBrnDrn": "Search menu brn drn place holder",
     "home.header.placeHolderPhone": "Search menu phone no place holder",
     "home.header.placeHolderNationalId": "Search menu national ID place holder",
+    "home.header.placeHolderId": "Search menu ID place holder",
     "home.header.placeHolderEmail": "Search menu email place holder",
     "home.header.systemTitle": "System title",
     "home.header.settingsTitle": "settings title",

diff --git a/src/form/custom-fields.ts b/src/form/custom-fields.ts
@@ -74,8 +74,8 @@ export function getReasonForLateRegistration(
         }
   const expression: string =
     event === 'birth'
-      ? 'const pattern = /^\\d{4}-\\d{2}-\\d{2}$/; const today = new Date(); const eventDatePlusLateRegistrationTarget = new Date(values.childBirthDate); const lateRegistrationTarget = offlineCountryConfig && offlineCountryConfig.config.BIRTH.LATE_REGISTRATION_TARGET; eventDatePlusLateRegistrationTarget.setDate(eventDatePlusLateRegistrationTarget.getDate() + lateRegistrationTarget); !pattern.test(values.childBirthDate) || today < eventDatePlusLateRegistrationTarget;'
-      : 'const pattern = /^\\d{4}-\\d{2}-\\d{2}$/; const today = new Date(); const eventDatePlusLateRegistrationTarget = new Date(values.deathDate); const lateRegistrationTarget = offlineCountryConfig && offlineCountryConfig.config.DEATH.REGISTRATION_TARGET; eventDatePlusLateRegistrationTarget.setDate(eventDatePlusLateRegistrationTarget.getDate() + lateRegistrationTarget); !pattern.test(values.deathDate) || today < eventDatePlusLateRegistrationTarget;'
+      ? 'const pattern = /^\\d{4}-\\d{1,2}-\\d{1,2}$/; const today = new Date(); const eventDatePlusLateRegistrationTarget = new Date(values.childBirthDate); const lateRegistrationTarget = offlineCountryConfig && offlineCountryConfig.config.BIRTH.LATE_REGISTRATION_TARGET; eventDatePlusLateRegistrationTarget.setDate(eventDatePlusLateRegistrationTarget.getDate() + lateRegistrationTarget); !pattern.test(values.childBirthDate) || today < eventDatePlusLateRegistrationTarget;'
+      : 'const pattern = /^\\d{4}-\\d{1,2}-\\d{1,2}$/; const today = new Date(); const eventDatePlusLateRegistrationTarget = new Date(values.deathDate); const lateRegistrationTarget = offlineCountryConfig && offlineCountryConfig.config.DEATH.REGISTRATION_TARGET; eventDatePlusLateRegistrationTarget.setDate(eventDatePlusLateRegistrationTarget.getDate() + lateRegistrationTarget); !pattern.test(values.deathDate) || today < eventDatePlusLateRegistrationTarget;'
 
   return {
     name: fieldName,