misc

opencrvs · Nov 13, 2024 · 71e94f8 · 71e94f8
1 parent 9fbaa34
commit 71e94f8
Show file tree

Hide file tree

Showing 13 changed files with 70 additions and 18 deletions.
diff --git a/src/api/certificates/source/Farajaland-birth-certificate-v2.svg b/src/api/certificates/source/Farajaland-birth-certificate-v2.svg
diff --git a/src/api/certificates/source/Farajaland-death-certificate-v2.svg b/src/api/certificates/source/Farajaland-death-certificate-v2.svg
diff --git a/src/api/certificates/source/birth-certificate-certified-copy.svg b/src/api/certificates/source/birth-certificate-certified-copy.svg
diff --git a/src/api/certificates/source/birth-certificate.svg b/src/api/certificates/source/birth-certificate.svg
diff --git a/src/api/certificates/source/death-certificate-certified-copy.svg b/src/api/certificates/source/death-certificate-certified-copy.svg
diff --git a/src/api/certificates/source/death-certificate.svg b/src/api/certificates/source/death-certificate.svg
diff --git a/src/api/certificates/source/marriage-certificate-certified-copy.svg b/src/api/certificates/source/marriage-certificate-certified-copy.svg
diff --git a/src/form/birth/certificate-handlebars.ts b/src/form/birth/certificate-handlebars.ts
@@ -58,6 +58,9 @@ export const certificateHandlebars = {
   childFamilyName: 'childFamilyName',
   childGender: 'childGender',
   eventDate: 'eventDate',
+  ageOfFatherInYears: 'ageOfFatherInYears',
+  ageOfMotherInYears: 'ageOfMotherInYears',
+  ageOfInformantInYears: 'ageOfInformantInYears',
   informantFirstName: 'informantFirstName',
   informantFamilyName: 'informantFamilyName',
   informantBirthDate: 'informantBirthDate',

diff --git a/src/form/birth/index.ts b/src/form/birth/index.ts
@@ -256,7 +256,8 @@ export const birthForm: ISerializedForm = {
               exactDateOfBirthUnknownConditional.concat(
                 hideIfInformantMotherOrFather
               ),
-              ageOfIndividualValidators
+              ageOfIndividualValidators,
+              certificateHandlebars.ageOfInformantInYears
             ),
             getNationality(
               certificateHandlebars.informantNationality,
@@ -328,7 +329,8 @@ export const birthForm: ISerializedForm = {
               exactDateOfBirthUnknownConditional.concat(
                 detailsExistConditional
               ),
-              ageOfParentsConditionals
+              ageOfParentsConditionals,
+              certificateHandlebars.ageOfMotherInYears
             ),
             getNationality(
               certificateHandlebars.motherNationality,
@@ -406,7 +408,8 @@ export const birthForm: ISerializedForm = {
               exactDateOfBirthUnknownConditional.concat(
                 detailsExistConditional
               ),
-              ageOfParentsConditionals
+              ageOfParentsConditionals,
+              certificateHandlebars.ageOfFatherInYears
             ),
             getNationality(
               certificateHandlebars.fatherNationality,

diff --git a/src/form/death/certficate-handlebars.ts b/src/form/death/certficate-handlebars.ts
@@ -42,6 +42,8 @@ export const certificateHandlebars = {
   districtPrimaryDeceasedId: 'districtPrimaryDeceasedId',
   cityPrimaryDeceased: 'cityPrimaryDeceased',
   ageOfDeceasedInYears: 'ageOfDeceasedInYears',
+  ageOfInformantInYears: 'ageOfInformantInYears',
+  ageOfSpouseInYears: 'ageOfSpouseInYears',
   addressLine3PrimaryDeceased: 'addressLine3PrimaryDeceased',
   addressLine2PrimaryDeceased: 'addressLine2PrimaryDeceased',
   addressLine1PrimaryDeceased: 'addressLine1PrimaryDeceased',

diff --git a/src/form/death/index.ts b/src/form/death/index.ts
@@ -284,7 +284,8 @@ export const deathForm = {
             getAgeOfIndividualInYears(
               formMessageDescriptors.ageOfInformant,
               exactDateOfBirthUnknownConditional.concat(hideIfInformantSpouse),
-              ageOfIndividualValidators
+              ageOfIndividualValidators,
+              certificateHandlebars.ageOfInformantInYears
             ),
             getNationality(
               certificateHandlebars.informantNationality,
@@ -346,7 +347,8 @@ export const deathForm = {
             getAgeOfIndividualInYears(
               formMessageDescriptors.ageOfSpouse,
               exactDateOfBirthUnknownConditional.concat(detailsExist),
-              ageOfIndividualValidators
+              ageOfIndividualValidators,
+              certificateHandlebars.ageOfSpouseInYears
             ),
             getNationality(
               certificateHandlebars.spouseNationality,

diff --git a/src/form/marriage/certificate-handlebars.ts b/src/form/marriage/certificate-handlebars.ts
@@ -34,6 +34,9 @@ export const certificateHandlebars = {
   informantPassport: 'informantPassport',
   informantAlienId: 'informantAlienId',
   informantRefugeeId: 'informantRefugeeId',
+  ageOfInformantInYears: 'ageOfInformantInYears',
+  ageOfGroomInYears: 'ageOfGroomInYears',
+  ageOfBrideInYears: 'ageOfBrideInYears',
   countryPrimaryInformant: 'countryPrimaryInformant',
   statePrimaryInformant: 'statePrimaryInformant', // @deprecated use statePrimaryInformantId instead
   statePrimaryInformantId: 'statePrimaryInformantId',

diff --git a/src/form/marriage/index.ts b/src/form/marriage/index.ts
@@ -135,7 +135,8 @@ export const marriageForm: ISerializedForm = {
               exactDateOfBirthUnknownConditional.concat(
                 hideIfInformantBrideOrGroom
               ),
-              ageOfIndividualValidators
+              ageOfIndividualValidators,
+              certificateHandlebars.ageOfInformantInYears
             ),
             getNationality(
               certificateHandlebars.informantNationality,
@@ -196,7 +197,8 @@ export const marriageForm: ISerializedForm = {
             getAgeOfIndividualInYears(
               formMessageDescriptors.ageOfGroom,
               exactDateOfBirthUnknownConditional,
-              brideOrGroomAgeValidators
+              brideOrGroomAgeValidators,
+              certificateHandlebars.ageOfGroomInYears
             ),
             getNationality(certificateHandlebars.groomNationality, []), // Required field
             getIDType('marriage', 'groom', [], true),
@@ -242,7 +244,8 @@ export const marriageForm: ISerializedForm = {
             getAgeOfIndividualInYears(
               formMessageDescriptors.ageOfBride,
               exactDateOfBirthUnknownConditional,
-              brideOrGroomAgeValidators
+              brideOrGroomAgeValidators,
+              certificateHandlebars.ageOfBrideInYears
             ),
             getNationality(certificateHandlebars.brideNationality, []), // Required field
             getIDType('marriage', 'bride', [], true),