diff --git a/src/api/certificates/source/Farajaland-birth-certificate-v2.svg b/src/api/certificates/source/Farajaland-birth-certificate-v2.svg index b645dc0a1..76002f2b1 100644 --- a/src/api/certificates/source/Farajaland-birth-certificate-v2.svg +++ b/src/api/certificates/source/Farajaland-birth-certificate-v2.svg @@ -73,7 +73,8 @@ {{location districtPlaceofbirthId 'name'}}{{internationalDistrictPlaceofbirth}}, {{location statePlaceofbirthId 'name'}}{{internationalStatePlaceofbirth}}, {{countryPlaceofbirth}} {{else}} - {{placeOfBirthFacility}} {{placeOfBirthState}}, {{placeOfBirthCountry}} + {{placeOfBirthFacility}} + {{placeOfBirthState}}, {{placeOfBirthCountry}} {{/ifCond}} diff --git a/src/api/certificates/source/Farajaland-death-certificate-v2.svg b/src/api/certificates/source/Farajaland-death-certificate-v2.svg index 994b425a3..83a49e588 100644 --- a/src/api/certificates/source/Farajaland-death-certificate-v2.svg +++ b/src/api/certificates/source/Farajaland-death-certificate-v2.svg @@ -56,7 +56,8 @@ {{location districtPlaceofdeathId 'name'}}{{internationalDistrictPlaceofdeath}}, {{location statePlaceofdeathId 'name'}}{{internationalStatePlaceofdeath}}, {{countryPlaceofdeath}} {{else}} - {{placeOfDeathFacility}} {{placeOfDeathState}}, {{placeOfDeathCountry}} + {{placeOfDeathFacility}} + {{placeOfDeathState}}, {{placeOfDeathCountry}} {{/ifCond}} diff --git a/src/api/certificates/source/birth-certificate-certified-copy.svg b/src/api/certificates/source/birth-certificate-certified-copy.svg index 4285b8b00..9b82151af 100644 --- a/src/api/certificates/source/birth-certificate-certified-copy.svg +++ b/src/api/certificates/source/birth-certificate-certified-copy.svg @@ -117,8 +117,13 @@ - {{ placeOfBirthFacility }}, {{ placeOfBirthDistrict }} - {{ placeOfBirthState }}, {{ placeOfBirthCountry }} + {{#ifCond placeOfBirthFacility '===' undefined }} + {{location districtPlaceofbirthId 'name'}}{{internationalDistrictPlaceofbirth}}, + {{location statePlaceofbirthId 'name'}}{{internationalStatePlaceofbirth}}, {{countryPlaceofbirth}} + {{else}} + {{ placeOfBirthFacility }} + {{ placeOfBirthDistrict }}, {{ placeOfBirthState }}, {{ placeOfBirthCountry }} + {{/ifCond}} @@ -145,7 +150,11 @@ + {{#ifCond ageOfMotherInYears '===' undefined }} {{motherBirthDate}} + {{else}} + {{ageOfMotherInYears}} years old + {{/ifCond}} @@ -208,7 +217,11 @@ + {{#ifCond ageOfFatherInYears '===' undefined }} {{fatherBirthDate}} + {{else}} + {{ageOfFatherInYears}} years old + {{/ifCond}} diff --git a/src/api/certificates/source/birth-certificate.svg b/src/api/certificates/source/birth-certificate.svg index 3e1d94798..e4284dbc7 100644 --- a/src/api/certificates/source/birth-certificate.svg +++ b/src/api/certificates/source/birth-certificate.svg @@ -146,7 +146,7 @@ {{location statePlaceofbirthId 'name'}}{{internationalStatePlaceofbirth}}, {{countryPlaceofbirth}} {{else}} {{placeOfBirthFacility}} - {{placeOfBirthState}}, {{placeOfBirthCountry}} + {{ placeOfBirthDistrict }}, {{placeOfBirthState}}, {{placeOfBirthCountry}} {{/ifCond}} diff --git a/src/api/certificates/source/death-certificate-certified-copy.svg b/src/api/certificates/source/death-certificate-certified-copy.svg index 2fe4400bc..d1d44ef13 100644 --- a/src/api/certificates/source/death-certificate-certified-copy.svg +++ b/src/api/certificates/source/death-certificate-certified-copy.svg @@ -61,7 +61,11 @@ + {{#ifCond ageOfDeceasedInYears '===' undefined }} {{deceasedBirthDate}} + {{else}} + {{ageOfDeceasedInYears}} years old + {{/ifCond}} @@ -126,7 +130,11 @@ - {{eventDate}} + {{#ifCond ageOfDeceasedInYears '===' undefined }} + {{deceasedBirthDate}} + {{else}} + {{ageOfDeceasedInYears}} years old + {{/ifCond}} @@ -138,8 +146,13 @@ - {{placeOfDeathFacility}} - {{placeOfDeathDistrict}}, {{placeOfDeathState}}, {{placeOfDeathCountry}} + {{#ifCond placeOfDeathFacility '===' undefined }} + {{location districtPlaceofdeathId 'name'}}{{internationalDistrictPlaceofdeath}}, + {{location statePlaceofdeathId 'name'}}{{internationalStatePlaceofdeath}}, {{countryPlaceofdeath}} + {{else}} + {{placeOfDeathFacility}} + {{placeOfDeathDistrict}}, {{placeOfDeathState}}, {{placeOfDeathCountry}} + {{/ifCond}} diff --git a/src/api/certificates/source/death-certificate.svg b/src/api/certificates/source/death-certificate.svg index 3d4cee3af..e5ae1b5d0 100644 --- a/src/api/certificates/source/death-certificate.svg +++ b/src/api/certificates/source/death-certificate.svg @@ -124,7 +124,7 @@ {{location statePlaceofdeathId 'name'}}{{internationalStatePlaceofdeath}}, {{countryPlaceofdeath}} {{else}} {{placeOfDeathFacility}} - {{placeOfDeathState}}, {{placeOfDeathCountry}} + {{placeOfDeathDistrict}}, {{placeOfDeathState}}, {{placeOfDeathCountry}} {{/ifCond}} diff --git a/src/api/certificates/source/marriage-certificate-certified-copy.svg b/src/api/certificates/source/marriage-certificate-certified-copy.svg index 6381bd9dd..622c951bc 100644 --- a/src/api/certificates/source/marriage-certificate-certified-copy.svg +++ b/src/api/certificates/source/marriage-certificate-certified-copy.svg @@ -66,7 +66,11 @@ + {{#ifCond ageOfGroomInYears '===' undefined }} {{groomBirthDate}} + {{else}} + {{ageOfGroomInYears}} years old + {{/ifCond}} @@ -133,7 +137,11 @@ + {{#ifCond ageOfGroomInYears '===' undefined }} {{brideBirthDate}} + {{else}} + {{ageOfBrideInYears}} years old + {{/ifCond}} @@ -185,7 +193,7 @@ - {{districtPlaceofmarriage}}, {{statePlaceofmarriage}}, {{countryPlaceofmarriage}} + {{location districtPlaceofmarriageId 'name'}}{{internationalDistrictPlaceofmarriage}}, {{location statePlaceofmarriageId 'name'}}{{internationalStatePlaceofmarriage}}, {{countryPlaceofmarriage}} diff --git a/src/form/birth/certificate-handlebars.ts b/src/form/birth/certificate-handlebars.ts index beb88b83d..da3e6ad78 100644 --- 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 index 404a38ce7..3a3906a0f 100644 --- 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 index 5e4040a2f..4556f7f76 100644 --- 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 index e88e55a62..21644fab2 100644 --- 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 index 164883946..1067cb049 100644 --- 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 index 1892e2dff..37bb7f1f5 100644 --- 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),