diff --git a/src/api/content/client/client.json b/src/api/content/client/client.json index af01f42d1..3596b7389 100644 --- a/src/api/content/client/client.json +++ b/src/api/content/client/client.json @@ -504,6 +504,10 @@ "correction.certificate.corrector.idCheckVerify": "Verified", "correction.certificate.corrector.idCheckWithoutVerify": "Identity does not match", "correction.certificate.corrector.otherIdCheck": "Check proof of ID", + "correction.correctionForApprovalDialog.actions.cancel": "Cancel", + "correction.correctionForApprovalDialog.actions.send": "Confirm", + "correction.correctionForApprovalDialog.description": "The Registrar will be notified of this correction request and a record of this request will be recorded", + "correction.correctionForApprovalDialog.title": "Send record correction for approval ?", "correction.corrector.anotherAgent": "Another registration agent or field agent", "correction.corrector.birth.note": "Note: In the case that the child is now of legal age (18) then only they should be able to request a change to their birth record.", "correction.corrector.bride": "Bride", @@ -544,12 +548,15 @@ "correction.summary.idCheck": "ID check", "correction.summary.idCheckForCorrection": "Correct without proof of ID?", "correction.summary.item": "Item", + "correction.summary.office": "Office", "correction.summary.original": "Original", "correction.summary.proofOfPayment": "Proof of payment", "correction.summary.proofOfPaymentRequired": "Proof of payment is required", "correction.summary.reasonForRequest": "Reason for request", "correction.summary.requestedBy": "Requested by", + "correction.summary.requestedOn": "Requested on", "correction.summary.required": "Required for correction", + "correction.summary.submitter": "Submitter", "correction.summary.supportingDocuments": "Supporting documents", "correction.summary.title": "Correction summary", "correction.summary.totalPaymentLabel": "Total {currency}", @@ -1767,12 +1774,16 @@ "register.form.modal.desc.deleteDeclarationConfirm": "Are you certain you want to delete this draft declaration form? Please note, this action cant be undone.", "register.form.modal.desc.exitWithoutSavingDeclarationConfirm": "You have unsaved changes on your declaration form. Are you sure you want to exit without saving?", "register.form.modal.desc.exitWithoutSavingModalForCorrection": "Are you sure you want to exit? Any corrections you have made will not be saved.", + "register.form.modal.desc.saveCorrectionConfirm": "The declarant will be notified of this correction and a record of this decision will be recorded", + "register.form.modal.desc.saveCorrectionReject": "The declarant will be notified of this decision and a record of this decision will be recorded", "register.form.modal.desc.saveDeclarationConfirm": "All inputted data will be kept secure for future editing. Are you ready to save any changes to this declaration form?", "register.form.modal.desc.validateConfirmation": "This declaration will be sent for approval prior to registration.", "register.form.modal.submitDescription": "By clicking “Submit” you confirm that the informant has read and reviewed the information and understands that this information will be shared with Civil Registration authorities.", "register.form.modal.title.deleteDeclarationConfirm": "Delete draft?", "register.form.modal.title.exitWithoutSavingDeclarationConfirm": "Exit without saving changes?", "register.form.modal.title.exitWithoutSavingModalForCorrection": "Exit correct record?", + "register.form.modal.title.saveCorrectionConfirm": "Approve correction?", + "register.form.modal.title.saveCorrectionReject": "Reject correction?", "register.form.modal.title.saveDeclarationConfirm": "Save & exit?", "register.form.modal.title.submitConfirmation": "{completeDeclaration, select, true {Send for review?} other {Send for review?}}", "register.form.modal.title.validateConfirmation": "Send for approval?", @@ -1852,6 +1863,7 @@ "review.rejection.form.commentInstruction": "", "review.rejection.form.commentLabel": "Comments", "review.rejection.form.instruction": "Please describe the updates required to this record for follow up action.", + "review.rejection.form.reasonLabel": "Reason", "review.rejection.form.reasons": "Reason(s) for rejection:", "review.rejection.form.reasons.duplicate": "Duplicate declaration", "review.rejection.form.reasons.markDuplicate": "Mark as a duplicate", @@ -1990,6 +2002,7 @@ "user.profile.audit.description.validated": "Sent for approval", "user.profile.audit.description.waiting_validation": "Sent declaration for external system validation", "user.profile.audit.list.noDataFound": "No audits to display", + "user.profile.auditList.approvedCorrectionAuditAction": "Approved correction request", "user.profile.auditList.archived": "Archived", "user.profile.auditList.assigned": "Assigned", "user.profile.auditList.corrected": "Corrected record", @@ -2005,6 +2018,8 @@ "user.profile.auditList.reInstatedToInProgress": "Reinstated to in progress", "user.profile.auditList.reInstatedToInReview": "Reinstated to ready for review", "user.profile.auditList.reInstatedToUpdate": "Reinstated to requires updates", + "user.profile.auditList.rejectedCorrectedAuditAction": "Rejected correction request", + "user.profile.auditList.requestedCorrectionAuditAction": "Requested correction", "user.profile.auditList.retrieved": "Retrieved", "user.profile.auditList.sentForApproval": "Sent for approval", "user.profile.auditList.showMore": "Show next {pageSize} of {totalItems}", @@ -2620,6 +2635,10 @@ "correction.certificate.corrector.idCheckVerify": "Vérifié", "correction.certificate.corrector.idCheckWithoutVerify": "L'identité ne correspond pas", "correction.certificate.corrector.otherIdCheck": "Avez-vous vérifié leur preuve d'identification ?", + "correction.correctionForApprovalDialog.actions.cancel": "Annuler", + "correction.correctionForApprovalDialog.actions.send": "Confirmer", + "correction.correctionForApprovalDialog.description": "Le greffier sera informé de cette demande de correction et un enregistrement de cette demande sera effectué", + "correction.correctionForApprovalDialog.title": "Envoyer la correction de l'enregistrement pour approbation ?", "correction.corrector.anotherAgent": "Un autre agent d'enregistrement ou un agent de terrain", "correction.corrector.birth.note": "Note : Si l'enfant a atteint l'âge légal (18 ans), il est le seul à pouvoir demander une modification de son acte de naissance.", "correction.corrector.bride": "Mariée", @@ -2660,12 +2679,15 @@ "correction.summary.idCheck": "Contrôle d'identité", "correction.summary.idCheckForCorrection": "Correct sans pièce d'identité ?", "correction.summary.item": "Point", + "correction.summary.office": "Bureau", "correction.summary.original": "Original", "correction.summary.proofOfPayment": "Preuve de paiement", "correction.summary.proofOfPaymentRequired": "Une preuve de paiement est requise", "correction.summary.reasonForRequest": "Raison de la demande", "correction.summary.requestedBy": "Demandée par", + "correction.summary.requestedOn": "Demandé le", "correction.summary.required": "Nécessaire pour la correction", + "correction.summary.submitter": "Déposant", "correction.summary.supportingDocuments": "Documents à l'appui", "correction.summary.title": "Résumé de la correction", "correction.summary.totalPaymentLabel": "Total {currency}", @@ -3883,12 +3905,16 @@ "register.form.modal.desc.deleteDeclarationConfirm": "Êtes-vous certain de vouloir supprimer ce projet de formulaire de déclaration? Veuillez noter que cette action ne peut pas être annulée.", "register.form.modal.desc.exitWithoutSavingDeclarationConfirm": "Vous avez des modifications non enregistrées sur votre formulaire de déclaration. Voulez-vous vraiment quitter sans enregistrer ?", "register.form.modal.desc.exitWithoutSavingModalForCorrection": "Êtes-vous sûr de vouloir quitter ? Les corrections que vous avez apportées ne seront pas sauvegardées.", + "register.form.modal.desc.saveCorrectionConfirm": "Le déclarant sera informé de cette correction et un procès-verbal de cette décision sera enregistré", + "register.form.modal.desc.saveCorrectionReject": "Cette décision sera notifiée au déclarant et un procès-verbal de cette décision sera enregistré", "register.form.modal.desc.saveDeclarationConfirm": "Toutes les données saisies seront conservées en toute sécurité pour de futures modifications. Êtes-vous prêt à enregistrer les modifications apportées à ce formulaire de déclaration?", "register.form.modal.desc.validateConfirmation": "Cette déclaration sera envoyée pour approbation avant l'enregistrement.", "register.form.modal.submitDescription": "En cliquant sur Soumettre, vous confirmez que l'informateur a lu et revu les informations et qu'il comprend que ces informations seront partagées avec les autorités de l'état civil.", "register.form.modal.title.deleteDeclarationConfirm": "Supprimer le brouillon?", "register.form.modal.title.exitWithoutSavingDeclarationConfirm": "Quitter sans enregistrer les modifications?", "register.form.modal.title.exitWithoutSavingModalForCorrection": "Quitter l'enregistrement correct ?", + "register.form.modal.title.saveCorrectionConfirm": "Approuver la correction ?", + "register.form.modal.title.saveCorrectionReject": "Rejeter la correction ?", "register.form.modal.title.saveDeclarationConfirm": "Enregistrer et quitter?", "register.form.modal.title.submitConfirmation": "{completeDeclaration, select, true {Envoyer une déclaration pour examen ?} other {Envoyer une déclaration incomplète ?}}", "register.form.modal.title.validateConfirmation": "Envoyer pour approbation ?", @@ -3968,6 +3994,7 @@ "review.rejection.form.commentInstruction": "Veuillez fournir des instructions spécifiques sur ce qui doit être mis à jour par le travailleur de la santé pour rectifier correctement la déclaration", "review.rejection.form.commentLabel": "Commentaires ou instructions à l'intention de l'agent de santé pour rectifier la déclaration", "review.rejection.form.instruction": "Veuillez décrire les mises à jour nécessaires à cet enregistrement pour le suivi de l'action.", + "review.rejection.form.reasonLabel": "Raison", "review.rejection.form.reasons": "Raison(s) du rejet :", "review.rejection.form.reasons.duplicate": "Déclaration en double", "review.rejection.form.reasons.markDuplicate": "Marquer comme duplicata", @@ -4106,6 +4133,7 @@ "user.profile.audit.description.validated": "Déclaration envoyée pour approbation", "user.profile.audit.description.waiting_validation": "Déclaration envoyée pour la validation du système externe", "user.profile.audit.list.noDataFound": "Aucun audit à afficher", + "user.profile.auditList.approvedCorrectionAuditAction": "Demande de correction approuvée", "user.profile.auditList.archived": "Archivé", "user.profile.auditList.assigned": "Assigné", "user.profile.auditList.corrected": "dossier corrigé", @@ -4121,6 +4149,8 @@ "user.profile.auditList.reInstatedToInProgress": "Réintégré dans les travaux en cours", "user.profile.auditList.reInstatedToInReview": "Réintégré à en révision", "user.profile.auditList.reInstatedToUpdate": "Réintégré pour demander des mises à jour", + "user.profile.auditList.rejectedCorrectedAuditAction": "Demande de correction rejetée", + "user.profile.auditList.requestedCorrectionAuditAction": "Correction demandée", "user.profile.auditList.retrieved": "Récupéré", "user.profile.auditList.sentForApproval": "Envoyé pour approbation", "user.profile.auditList.showMore": "Afficher le prochain {pageSize} de {totalItems", diff --git a/src/data-seeding/certificates/source/BirthCertificate.svg b/src/data-seeding/certificates/source/BirthCertificate.svg index 7bfb0afa4..e90887958 100644 --- a/src/data-seeding/certificates/source/BirthCertificate.svg +++ b/src/data-seeding/certificates/source/BirthCertificate.svg @@ -13,7 +13,7 @@ - This event was registered at {{location registrar.officeId 'name'}}, {{location registrar.districtId 'name'}}, {{location registrar.stateId 'name'}} + This event was registered at {{registrationLocation}} {{eventDate}} @@ -31,7 +31,7 @@ {{#ifCond placeOfBirth '===' 'HEALTH_FACILITY' }} {{placeOfBirth}} {{else}} -{{location districtPlaceofbirthId 'name'}}{{internationalDistrictPlaceofbirth}}, {{location statePlaceofbirthId 'name'}}{{internationalStatePlaceofbirth}}, {{countryPlaceofbirth}} +{{districtPlaceofbirth}}{{internationalDistrictPlaceofbirth}}, {{statePlaceofbirth}}{{internationalStatePlaceofbirth}}, {{countryPlaceofbirth}} {{/ifCond}} @@ -95,4 +95,4 @@ - + \ No newline at end of file diff --git a/src/data-seeding/certificates/source/DeathCertificate.svg b/src/data-seeding/certificates/source/DeathCertificate.svg index fc9677790..b13ee0b7d 100644 --- a/src/data-seeding/certificates/source/DeathCertificate.svg +++ b/src/data-seeding/certificates/source/DeathCertificate.svg @@ -13,7 +13,7 @@ - This event was registered at {{location registrar.officeId 'name'}}, {{location registrar.districtId 'name'}}, {{location registrar.stateId 'name'}} + This event was registered at {{registrationLocation}} {{eventDate}} @@ -31,7 +31,7 @@ {{#ifCond placeOfBirth '===' 'HEALTH_FACILITY' }} {{placeOfDeath}} {{else}} -{{location districtPlaceofdeathId 'name'}}{{internationalDistrictPlaceofdeath}}, {{location statePlaceofdeathId 'name'}}{{internationalStatePlaceofdeath}}, {{countryPlaceofdeath}} +{{districtPlaceofdeath}}{{internationalDistrictPlaceofdeath}}, {{statePlaceofdeath}}{{internationalStatePlaceofdeath}}, {{countryPlaceofdeath}} {{/ifCond}} @@ -91,4 +91,4 @@ - + \ No newline at end of file diff --git a/src/data-seeding/certificates/source/MarriageCertificate.svg b/src/data-seeding/certificates/source/MarriageCertificate.svg index 3d98382e0..edf8e9808 100644 --- a/src/data-seeding/certificates/source/MarriageCertificate.svg +++ b/src/data-seeding/certificates/source/MarriageCertificate.svg @@ -9,7 +9,7 @@ This event was registered at - {{location registrar.officeId 'name'}}, {{location registrar.districtId 'name'}}, {{location registrar.stateId 'name'}} + {{registrationLocation}} {{groomFirstName}} {{groomFamilyName}} &{{brideFirstName}} {{brideFamilyName}} @@ -26,9 +26,8 @@ Place of Marriage - - {{location districtPlaceofmarriageId 'name'}}{{internationalDistrictPlaceofmarriage}}, {{location statePlaceofmarriageId 'name'}}{{internationalStatePlaceofmarriage}}, {{countryPlaceofmarriage}} + {{districtPlaceofmarriage}}{{internationalDistrictPlaceofmarriage}}, {{statePlaceofmarriage}}{{internationalStatePlaceofmarriage}}, {{countryPlaceofmarriage}} diff --git a/src/data-seeding/certificates/source/test/UsingAddressHandlebars.svg b/src/data-seeding/certificates/source/test/UsingAddressHandlebars.svg index 557957a07..6c42b5418 100644 --- a/src/data-seeding/certificates/source/test/UsingAddressHandlebars.svg +++ b/src/data-seeding/certificates/source/test/UsingAddressHandlebars.svg @@ -14,8 +14,8 @@ {{countryPrimaryInformant}} -{{location statePrimaryInformantId 'name'}}{{internationalStatePrimaryInformant}} -{{location districtPrimaryInformantId 'name'}}{{internationalDistrictPrimaryInformant}} +{{statePrimaryInformant}}{{internationalStatePrimaryInformant}} +{{districtPrimaryInformant}}{{internationalDistrictPrimaryInformant}} {{cityPrimaryInformant}}{{internationalCityPrimaryInformant}}{{addressLine1RuralOptionPrimaryInformant}} {{addressLine1UrbanOptionPrimaryInformant}}{{internationalAddressLine1PrimaryInformant}} {{addressLine2UrbanOptionPrimaryInformant}}{{internationalAddressLine2PrimaryInformant}} @@ -27,8 +27,8 @@ {{countryPlaceofbirth}}{{countryPlaceofdeath}}{{countryPlaceofmarriage}} -{{location statePlaceofbirthId 'name'}}{{internationalStatePlaceofbirth}}{{location statePlaceofdeathId 'name'}}{{internationalStatePlaceofdeath}}{{location statePlaceofmarriageId 'name'}}{{internationalStatePlaceofmarriage}} -{{location districtPlaceofbirthId 'name'}}{{internationalDistrictPlaceofbirth}}{{location districtPlaceofdeathId 'name'}}{{internationalDistrictPlaceofdeath}}{{location districtPlaceofmarriageId 'name'}}{{internationalDistrictPlaceofmarriage}} +{{statePlaceofbirth}}{{internationalStatePlaceofbirth}}{{statePlaceofdeath}}{{internationalStatePlaceofdeath}}{{statePlaceofmarriage}}{{internationalStatePlaceofmarriage}} +{{districtPlaceofbirth}}{{internationalDistrictPlaceofbirth}}{{districtPlaceofdeath}}{{internationalDistrictPlaceofdeath}}{{districtPlaceofmarriage}}{{internationalDistrictPlaceofmarriage}} {{cityPlaceofbirth}}{{internationalCityPlaceofbirth}}{{cityPlaceofdeath}}{{internationalCityPlaceofdeath}}{{cityPlaceofmarriage}}{{internationalCityPlaceofmarriage}}{{addressLine1RuralOptionPlaceofbirth}}{{addressLine1RuralOptionPlaceofdeath}}{{addressLine1RuralOptionPlaceofmarriage}} {{addressLine1UrbanOptionPlaceofbirth}}{{internationalAddressLine1Placeofbirth}}{{addressLine1UrbanOptionPlaceofdeath}}{{internationalAddressLine1Placeofdeath}}{{addressLine1UrbanOptionPlaceofmarriage}}{{internationalAddressLine1Placeofmarriage}} {{addressLine2UrbanOptionPlaceofbirth}}{{internationalAddressLine2Placeofbirth}}{{addressLine2UrbanOptionPlaceofdeath}}{{internationalAddressLine2Placeofdeath}}{{addressLine2UrbanOptionPlaceofmarriage}}{{internationalAddressLine2Placeofmarriage}} @@ -40,8 +40,8 @@ {{countryPrimaryMother}}{{countryPrimaryBride}} -{{location statePrimaryMotherId 'name'}}{{internationalStatePrimaryMother}}{{location statePrimaryBrideId 'name'}}{{internationalStatePrimaryBride}} -{{location districtPrimaryMotherId 'name'}}{{internationalDistrictPrimaryMother}}{{location districtPrimaryBrideId 'name'}}{{internationalDistrictPrimaryBride}} +{{statePrimaryMother}}{{internationalStatePrimaryMother}}{{statePrimaryBride}}{{internationalStatePrimaryBride}} +{{districtPrimaryMother}}{{internationalDistrictPrimaryMother}}{{districtPrimaryBride}}{{internationalDistrictPrimaryBride}} {{cityPrimaryMother}}{{internationalCityPrimaryMother}}{{addressLine1RuralOptionPrimaryMother}}{{cityPrimaryBride}}{{internationalCityPrimaryBride}}{{addressLine1RuralOptionPrimaryBride}} {{addressLine1UrbanOptionPrimaryMother}}{{internationalAddressLine1PrimaryMother}}{{addressLine1UrbanOptionPrimaryBride}}{{internationalAddressLine1PrimaryBride}} {{addressLine2UrbanOptionPrimaryMother}}{{internationalAddressLine2PrimaryMother}}{{addressLine2UrbanOptionPrimaryBride}}{{internationalAddressLine2PrimaryBride}} @@ -53,8 +53,8 @@ {{countryPrimaryFather}}{{countryPrimaryGroom}} -{{location statePrimaryFatherId 'name'}}{{internationalStatePrimaryFather}}{{location statePrimaryGroomId 'name'}}{{internationalStatePrimaryGroom}} -{{location districtPrimaryFatherId 'name'}}{{internationalDistrictPrimaryFather}}{{location districtPrimaryGroomId 'name'}}{{internationalDistrictPrimaryGroom}} +{{statePrimaryFather}}{{internationalStatePrimaryFather}}{{statePrimaryGroom}}{{internationalStatePrimaryGroom}} +{{districtPrimaryFather}}{{internationalDistrictPrimaryFather}}{{districtPrimaryGroom}}{{internationalDistrictPrimaryGroom}} {{cityPrimaryFather}}{{internationalCityPrimaryFather}}{{addressLine1RuralOptionPrimaryFather}}{{cityPrimaryGroom}}{{internationalCityPrimaryGroom}}{{addressLine1RuralOptionPrimaryGroom}} {{addressLine1UrbanOptionPrimaryFather}}{{internationalAddressLine1PrimaryFather}}{{addressLine1UrbanOptionPrimaryGroom}}{{internationalAddressLine1PrimaryGroom}} {{addressLine2UrbanOptionPrimaryFather}}{{internationalAddressLine2PrimaryFather}}{{addressLine2UrbanOptionPrimaryGroom}}{{internationalAddressLine2PrimaryGroom}} @@ -88,4 +88,4 @@ - + \ No newline at end of file diff --git a/src/form/birth/certificate-handlebars.ts b/src/form/birth/certificate-handlebars.ts index b49985254..f2ad26458 100644 --- a/src/form/birth/certificate-handlebars.ts +++ b/src/form/birth/certificate-handlebars.ts @@ -17,11 +17,11 @@ export const certificateHandlebars = { certificateDate: 'certificateDate', registrar: 'registrar', registrationAgent: 'registrationAgent', - registrarName: 'registrarName', // @deprecated use registrar.name instead - role: 'role', // @deprecated use registrar.role instead - registrarSignature: 'registrarSignature', // @deprecated use registrar.signature instead + registrarName: 'registrarName', + role: 'role', + registrarSignature: 'registrarSignature', registrationDate: 'registrationDate', - registrationLocation: 'registrationLocation', // @deprecated use registrar.office/state/district instead + registrationLocation: 'registrationLocation', contactEmail: 'contactEmail', contactPhoneNumber: 'contactPhoneNumber', mosipAid: 'mosipAid', @@ -62,10 +62,8 @@ export const certificateHandlebars = { fatherOccupation: 'fatherOccupation', fatherEducationalAttainment: 'fatherEducationalAttainment', countryPlaceofbirth: 'countryPlaceofbirth', - statePlaceofbirth: 'statePlaceofbirth', // @deprecated use statePlaceofbirthId instead - statePlaceofbirthId: 'statePlaceofbirthId', - districtPlaceofbirth: 'districtPlaceofbirth', // @deprecated use districtPlaceofbirthId instead - districtPlaceofbirthId: 'districtPlaceofbirthId', + statePlaceofbirth: 'statePlaceofbirth', + districtPlaceofbirth: 'districtPlaceofbirth', cityPlaceofbirth: 'cityPlaceofbirth', addressLine3UrbanOptionPlaceofbirth: 'addressLine3UrbanOptionPlaceofbirth', addressLine2UrbanOptionPlaceofbirth: 'addressLine2UrbanOptionPlaceofbirth', @@ -83,10 +81,8 @@ export const certificateHandlebars = { 'internationalAddressLine3Placeofbirth', internationalPostalCodePlaceofbirth: 'internationalPostalCodePlaceofbirth', countryPrimaryInformant: 'countryPrimaryInformant', - statePrimaryInformant: 'statePrimaryInformant', // @deprecated use statePrimaryInformantId instead - statePrimaryInformantId: 'statePrimaryInformantId', - districtPrimaryInformant: 'districtPrimaryInformant', // @deprecated use districtPrimaryInformantId instead - districtPrimaryInformantId: 'districtPrimaryInformantId', + statePrimaryInformant: 'statePrimaryInformant', + districtPrimaryInformant: 'districtPrimaryInformant', cityPrimaryInformant: 'cityPrimaryInformant', addressLine3UrbanOptionPrimaryInformant: 'addressLine3UrbanOptionPrimaryInformant', @@ -110,10 +106,8 @@ export const certificateHandlebars = { internationalPostalCodePrimaryInformant: 'internationalPostalCodePrimaryInformant', countryPrimaryMother: 'countryPrimaryMother', - statePrimaryMother: 'statePrimaryMother', // @deprecated use statePrimaryMotherId instead - statePrimaryMotherId: 'statePrimaryMotherId', - districtPrimaryMother: 'districtPrimaryMother', // @deprecated use districtPrimaryMotherId instead - districtPrimaryMotherId: 'districtPrimaryMotherId', + statePrimaryMother: 'statePrimaryMother', + districtPrimaryMother: 'districtPrimaryMother', cityPrimaryMother: 'cityPrimaryMother', addressLine3UrbanOptionPrimaryMother: 'addressLine3UrbanOptionPrimaryMother', addressLine2UrbanOptionPrimaryMother: 'addressLine2UrbanOptionPrimaryMother', @@ -132,10 +126,8 @@ export const certificateHandlebars = { internationalPostalCodePrimaryMother: 'internationalPostalCodePrimaryMother', fatherReasonNotApplying: 'fatherReasonNotApplying', countryPrimaryFather: 'countryPrimaryFather', - statePrimaryFather: 'statePrimaryFather', // @deprecated use statePrimaryFatherId instead - statePrimaryFatherId: 'statePrimaryFatherId', - districtPrimaryFather: 'districtPrimaryFather', // @deprecated use districtPrimaryFatherId instead - districtPrimaryFatherId: 'districtPrimaryFatherId', + statePrimaryFather: 'statePrimaryFather', + districtPrimaryFather: 'districtPrimaryFather', cityPrimaryFather: 'cityPrimaryFather', addressLine3UrbanOptionPrimaryFather: 'addressLine3UrbanOptionPrimaryFather', addressLine2UrbanOptionPrimaryFather: 'addressLine2UrbanOptionPrimaryFather', diff --git a/src/form/death/certficate-handlebars.ts b/src/form/death/certficate-handlebars.ts index 970bbfb4e..5b5463c20 100644 --- a/src/form/death/certficate-handlebars.ts +++ b/src/form/death/certficate-handlebars.ts @@ -17,11 +17,11 @@ export const certificateHandlebars = { certificateDate: 'certificateDate', registrar: 'registrar', registrationAgent: 'registrationAgent', - registrarName: 'registrarName', // @deprecated use registrar.name instead - role: 'role', // @deprecated use registrar.role instead - registrarSignature: 'registrarSignature', // @deprecated use registrar.signature instead + registrarName: 'registrarName', + role: 'role', + registrarSignature: 'registrarSignature', registrationDate: 'registrationDate', - registrationLocation: 'registrationLocation', // @deprecated use registrar.office/state/district instead + registrationLocation: 'registrationLocation', contactEmail: 'contactEmail', contactPhoneNumber: 'contactPhoneNumber', eventDate: 'eventDate', @@ -33,10 +33,8 @@ export const certificateHandlebars = { deceasedNID: 'deceasedNID', deceasedMaritalStatus: 'deceasedMaritalStatus', countryPrimaryDeceased: 'countryPrimaryDeceased', - statePrimaryDeceased: 'statePrimaryDeceased', // @deprecated use statePrimaryDeceasedId instead - statePrimaryDeceasedId: 'statePrimaryDeceasedId', - districtPrimaryDeceased: 'districtPrimaryDeceased', // @deprecated use districtPrimaryDeceasedId instead - districtPrimaryDeceasedId: 'districtPrimaryDeceasedId', + statePrimaryDeceased: 'statePrimaryDeceased', + districtPrimaryDeceased: 'districtPrimaryDeceased', cityPrimaryDeceased: 'cityPrimaryDeceased', addressLine3UrbanOptionPrimaryDeceased: 'addressLine3UrbanOptionPrimaryDeceased', @@ -64,10 +62,8 @@ export const certificateHandlebars = { deathDescription: 'deathDescription', placeOfDeath: 'placeOfDeath', countryPlaceofdeath: 'countryPlaceofdeath', - statePlaceofdeath: 'statePlaceofdeath', // @deprecated use statePlaceofdeathId instead - statePlaceofdeathId: 'statePlaceofdeathId', - districtPlaceofdeath: 'districtPlaceofdeath', // @deprecated use districtPlaceofdeathId instead - districtPlaceofdeathId: 'districtPlaceofdeathId', + statePlaceofdeath: 'statePlaceofdeath', + districtPlaceofdeath: 'districtPlaceofdeath', cityPlaceofdeath: 'cityPlaceofdeath', addressLine3UrbanOptionPlaceofdeath: 'addressLine3UrbanOptionPlaceofdeath', addressLine2UrbanOptionPlaceofdeath: 'addressLine2UrbanOptionPlaceofdeath', @@ -91,10 +87,8 @@ export const certificateHandlebars = { informantNationality: 'informantNationality', informantNID: 'informantNID', countryPrimaryInformant: 'countryPrimaryInformant', - statePrimaryInformant: 'statePrimaryInformant', // @deprecated use statePrimaryInformantId instead - statePrimaryInformantId: 'statePrimaryInformantId', - districtPrimaryInformant: 'districtPrimaryInformant', // @deprecated use districtPrimaryInformantId instead - districtPrimaryInformantId: 'districtPrimaryInformantId', + statePrimaryInformant: 'statePrimaryInformant', + districtPrimaryInformant: 'districtPrimaryInformant', cityPrimaryInformant: 'cityPrimaryInformant', addressLine3UrbanOptionPrimaryInformant: 'addressLine3UrbanOptionPrimaryInformant', @@ -126,10 +120,8 @@ export const certificateHandlebars = { spouseOccupation: 'spouseOccupation', spouseEducationalAttainment: 'spouseEducationalAttainment', countryPrimarySpouse: 'countryPrimarySpouse', - statePrimarySpouse: 'statePrimarySpouse', // @deprecated use statePrimarySpouseId instead - statePrimarySpouseId: 'statePrimarySpouseId', - districtPrimarySpouse: 'districtPrimarySpouse', // @deprecated use districtPrimarySpouseId instead - districtPrimarySpouseId: 'districtPrimarySpouseId', + statePrimarySpouse: 'statePrimarySpouse', + districtPrimarySpouse: 'districtPrimarySpouse', cityPrimarySpouse: 'cityPrimarySpouse', addressLine3UrbanOptionPrimarySpouse: 'addressLine3UrbanOptionPrimarySpouse', addressLine2UrbanOptionPrimarySpouse: 'addressLine2UrbanOptionPrimarySpouse', @@ -164,10 +156,8 @@ export const certificateHandlebars = { fatherOccupation: 'fatherOccupation', fatherEducationalAttainment: 'fatherEducationalAttainment', countryPrimaryMother: 'countryPrimaryMother', - statePrimaryMother: 'statePrimaryMother', // @deprecated use statePrimaryMotherId instead - statePrimaryMotherId: 'statePrimaryMotherId', - districtPrimaryMother: 'districtPrimaryMother', // @deprecated use districtPrimaryMotherId instead - districtPrimaryMotherId: 'districtPrimaryMotherId', + statePrimaryMother: 'statePrimaryMother', + districtPrimaryMother: 'districtPrimaryMother', cityPrimaryMother: 'cityPrimaryMother', addressLine3UrbanOptionPrimaryMother: 'addressLine3UrbanOptionPrimaryMother', addressLine2UrbanOptionPrimaryMother: 'addressLine2UrbanOptionPrimaryMother', @@ -186,10 +176,8 @@ export const certificateHandlebars = { internationalPostalCodePrimaryMother: 'internationalPostalCodePrimaryMother', fatherReasonNotApplying: 'fatherReasonNotApplying', countryPrimaryFather: 'countryPrimaryFather', - statePrimaryFather: 'statePrimaryFather', // @deprecated use statePrimaryFatherId instead - statePrimaryFatherId: 'statePrimaryFatherId', - districtPrimaryFather: 'districtPrimaryFather', // @deprecated use districtPrimaryFatherId instead - districtPrimaryFatherId: 'districtPrimaryFatherId', + statePrimaryFather: 'statePrimaryFather', + districtPrimaryFather: 'districtPrimaryFather', cityPrimaryFather: 'cityPrimaryFather', addressLine3UrbanOptionPrimaryFather: 'addressLine3UrbanOptionPrimaryFather', addressLine2UrbanOptionPrimaryFather: 'addressLine2UrbanOptionPrimaryFather', diff --git a/src/form/marriage/certificate-handlebars.ts b/src/form/marriage/certificate-handlebars.ts index 7719151b8..09a483892 100644 --- a/src/form/marriage/certificate-handlebars.ts +++ b/src/form/marriage/certificate-handlebars.ts @@ -17,11 +17,11 @@ export const certificateHandlebars = { certificateDate: 'certificateDate', registrar: 'registrar', registrationAgent: 'registrationAgent', - registrarName: 'registrarName', // @deprecated use registrar.name instead - role: 'role', // @deprecated use registrar.role instead - registrarSignature: 'registrarSignature', // @deprecated use registrar.signature instead + registrarName: 'registrarName', + role: 'role', + registrarSignature: 'registrarSignature', registrationDate: 'registrationDate', - registrationLocation: 'registrationLocation', // @deprecated use registrar.office/state/district instead + registrationLocation: 'registrationLocation', contactEmail: 'contactEmail', contactPhoneNumber: 'contactPhoneNumber', eventDate: 'eventDate', @@ -32,10 +32,8 @@ export const certificateHandlebars = { informantNationality: 'informantNationality', informantNID: 'informantNID', countryPrimaryInformant: 'countryPrimaryInformant', - statePrimaryInformant: 'statePrimaryInformant', // @deprecated use statePrimaryInformantId instead - statePrimaryInformantId: 'statePrimaryInformantId', - districtPrimaryInformant: 'districtPrimaryInformant', // @deprecated use districtPrimaryInformantId instead - districtPrimaryInformantId: 'districtPrimaryInformantId', + statePrimaryInformant: 'statePrimaryInformant', + districtPrimaryInformant: 'districtPrimaryInformant', cityPrimaryInformant: 'cityPrimaryInformant', addressLine3UrbanOptionPrimaryInformant: 'addressLine3UrbanOptionPrimaryInformant', @@ -69,10 +67,8 @@ export const certificateHandlebars = { groomNID: 'groomNID', groomMarriedLastNameEng: 'groomMarriedLastNameEng', countryPrimaryGroom: 'countryPrimaryGroom', - statePrimaryGroom: 'statePrimaryGroom', // @deprecated use statePrimaryGroomId instead - statePrimaryGroomId: 'statePrimaryGroomId', - districtPrimaryGroom: 'districtPrimaryGroom', // @deprecated use districtPrimaryGroomId instead - districtPrimaryGroomId: 'districtPrimaryGroomId', + statePrimaryGroom: 'statePrimaryGroom', + districtPrimaryGroom: 'districtPrimaryGroom', cityPrimaryGroom: 'cityPrimaryGroom', addressLine3UrbanOptionPrimaryGroom: 'addressLine3UrbanOptionPrimaryGroom', addressLine2UrbanOptionPrimaryGroom: 'addressLine2UrbanOptionPrimaryGroom', @@ -96,10 +92,8 @@ export const certificateHandlebars = { brideNID: 'brideNID', brideMarriedLastNameEng: 'brideMarriedLastNameEng', countryPrimaryBride: 'countryPrimaryBride', - statePrimaryBride: 'statePrimaryBride', // @deprecated use statePrimaryBrideId instead - statePrimaryBrideId: 'statePrimaryBrideId', - districtPrimaryBride: 'districtPrimaryBride', // @deprecated use districtPrimaryBrideId instead - districtPrimaryBrideId: 'districtPrimaryBrideId', + statePrimaryBride: 'statePrimaryBride', + districtPrimaryBride: 'districtPrimaryBride', cityPrimaryBride: 'cityPrimaryBride', addressLine3UrbanOptionPrimaryBride: 'addressLine3UrbanOptionPrimaryBride', addressLine2UrbanOptionPrimaryBride: 'addressLine2UrbanOptionPrimaryBride', @@ -118,10 +112,8 @@ export const certificateHandlebars = { internationalPostalCodePrimaryBride: 'internationalPostalCodePrimaryBride', typeOfMarriage: 'typeOfMarriage', countryPlaceofmarriage: 'countryPlaceofmarriage', - statePlaceofmarriage: 'statePlaceofmarriage', // @deprecated use statePlaceofmarriageId instead - statePlaceofmarriageId: 'statePlaceofmarriageId', - districtPlaceofmarriage: 'districtPlaceofmarriage', // @deprecated use districtPlaceofmarriageId instead - districtPlaceofmarriageId: 'districtPlaceofmarriageId', + statePlaceofmarriage: 'statePlaceofmarriage', + districtPlaceofmarriage: 'districtPlaceofmarriage', cityPlaceofmarriage: 'cityPlaceofmarriage', addressLine3UrbanOptionPlaceofmarriage: 'addressLine3UrbanOptionPlaceofmarriage',