Merge branch 'release-v1.3.4' of github.com:opencrvs/opencrvs-farajal…

…and into release-v1.4.1

CHANGELOG.md

@@ -54,7 +54,7 @@ In the next OpenCRVS release v1.5.0, there will be two significant changes:
 
 See [Releases](https://github.com/opencrvs/opencrvs-farajaland/releases) for release notes of older releases.
 
-## [1.3.3](https://github.com/opencrvs/opencrvs-farajaland/compare/v1.3.2...v1.3.3) (TBD)
+## [1.3.3](https://github.com/opencrvs/opencrvs-farajaland/compare/v1.3.2...v1.3.3)
 
 ### Breaking changes
 
@@ -117,4 +117,14 @@ See [Releases](https://github.com/opencrvs/opencrvs-farajaland/releases) for rel
 
 ### Bug fixes
 
+## [1.3.4](https://github.com/opencrvs/opencrvs-farajaland/compare/v1.3.3...v1.3.4) (TBD)
+
+## Breaking changes
+
+## New features
+
+## Bug fixes
+
+- Fix typo in certificate handlebar names
+
 See [Releases](https://github.com/opencrvs/opencrvs-farajaland/releases) for release notes of older releases.

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",

src/form/birth/certificate-handlebars.ts

@@ -67,7 +67,7 @@ export const certificateHandlebars = {
   informantNationality: 'informantNationality',
   informantNationalId: 'informantNationalId',
   informantPassport: 'informantPassport',
-  informantAliedId: 'informantAliedId',
+  informantAlienId: 'informantAlienId',
   informantRefugeeId: 'informantRefugeeId',
   motherReasonNotApplying: 'motherReasonNotApplying',
   motherBirthDate: 'motherBirthDate',
@@ -76,7 +76,7 @@ export const certificateHandlebars = {
   motherNationality: 'motherNationality',
   motherNationalId: 'motherNationalId',
   motherPassport: 'motherPassport',
-  motherAliedId: 'motherAliedId',
+  motherAlienId: 'motherAlienId',
   motherRefugeeId: 'motherRefugeeId',
   motherMaritalStatus: 'motherMaritalStatus',
   motherOccupation: 'motherOccupation',
@@ -87,7 +87,7 @@ export const certificateHandlebars = {
   fatherNationality: 'fatherNationality',
   fatherNationalId: 'fatherNationalId',
   fatherPassport: 'fatherPassport',
-  fatherAliedId: 'fatherAliedId',
+  fatherAlienId: 'fatherAlienId',
   fatherRefugeeId: 'fatherRefugeeId',
   fatherMaritalStatus: 'fatherMaritalStatus',
   fatherOccupation: 'fatherOccupation',

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,

src/form/death/certficate-handlebars.ts

@@ -32,7 +32,7 @@ export const certificateHandlebars = {
   deceasedNationality: 'deceasedNationality',
   deceasedNationalId: 'deceasedNationalId',
   deceasedPassport: 'deceasedPassport',
-  deceasedAliedId: 'deceasedAliedId',
+  deceasedAlienId: 'deceasedAlienId',
   deceasedRefugeeId: 'deceasedRefugeeId',
   deceasedMaritalStatus: 'deceasedMaritalStatus',
   countryPrimaryDeceased: 'countryPrimaryDeceased',
@@ -99,7 +99,7 @@ export const certificateHandlebars = {
   informantNationality: 'informantNationality',
   informantNationalId: 'informantNationalId',
   informantPassport: 'informantPassport',
-  informantAliedId: 'informantAliedId',
+  informantAlienId: 'informantAlienId',
   informantRefugeeId: 'informantRefugeeId',
   countryPrimaryInformant: 'countryPrimaryInformant',
   statePrimaryInformant: 'statePrimaryInformant', // @deprecated use statePrimaryInformantId instead
@@ -135,7 +135,7 @@ export const certificateHandlebars = {
   spouseNationality: 'spouseNationality',
   spouseNationalId: 'spouseNationalId',
   spousePassport: 'spousePassport',
-  spouseAliedId: 'spouseAliedId',
+  spouseAlienId: 'spouseAlienId',
   spouseRefugeeId: 'spouseRefugeeId',
   spouseOccupation: 'spouseOccupation',
   spouseEducationalAttainment: 'spouseEducationalAttainment',
@@ -167,7 +167,7 @@ export const certificateHandlebars = {
   motherNationality: 'motherNationality',
   motherNationalId: 'motherNationalId',
   motherPassport: 'motherPassport',
-  motherAliedId: 'motherAliedId',
+  motherAlienId: 'motherAlienId',
   motherRefugeeId: 'motherRefugeeId',
   motherMaritalStatus: 'motherMaritalStatus',
   motherOccupation: 'motherOccupation',
@@ -178,7 +178,7 @@ export const certificateHandlebars = {
   fatherNationality: 'fatherNationality',
   fatherNationalId: 'fatherNationalId',
   fatherPassport: 'fatherPassport',
-  fatherAliedId: 'fatherAliedId',
+  fatherAlienId: 'fatherAlienId',
   fatherRefugeeId: 'fatherRefugeeId',
   fatherMaritalStatus: 'fatherMaritalStatus',
   fatherOccupation: 'fatherOccupation',

src/form/marriage/certificate-handlebars.ts

@@ -32,7 +32,7 @@ export const certificateHandlebars = {
   informantNationality: 'informantNationality',
   informantNationalId: 'informantNationalId',
   informantPassport: 'informantPassport',
-  informantAliedId: 'informantAliedId',
+  informantAlienId: 'informantAlienId',
   informantRefugeeId: 'informantRefugeeId',
   countryPrimaryInformant: 'countryPrimaryInformant',
   statePrimaryInformant: 'statePrimaryInformant', // @deprecated use statePrimaryInformantId instead
@@ -71,7 +71,7 @@ export const certificateHandlebars = {
   groomNationality: 'groomNationality',
   groomNationalId: 'groomNationalId',
   groomPassport: 'groomPassport',
-  groomAliedId: 'groomAliedId',
+  groomAlienId: 'groomAlienId',
   groomRefugeeId: 'groomRefugeeId',
   groomMarriedLastNameEng: 'groomMarriedLastNameEng',
   countryPrimaryGroom: 'countryPrimaryGroom',
@@ -101,7 +101,7 @@ export const certificateHandlebars = {
   brideNationality: 'brideNationality',
   brideNationalId: 'brideNationalId',
   bridePassport: 'bridePassport',
-  brideAliedId: 'brideAliedId',
+  brideAlienId: 'brideAlienId',
   brideRefugeeId: 'brideRefugeeId',
   brideMarriedLastNameEng: 'brideMarriedLastNameEng',
   countryPrimaryBride: 'countryPrimaryBride',