Merge pull request #757 from opencrvs/ocrvs-5994

Ocrvs 5994- certificate collector options fix
opencrvs · Oct 20, 2023 · b4eb19f · b4eb19f
2 parents 4161232 + cba30fd
commit b4eb19f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/src/api/content/client/client.json b/src/api/content/client/client.json
@@ -86,6 +86,7 @@
         "certificate.parent.details.label.nationality": "Nationality",
         "certificate.parent.details.label.number": "Number",
         "certificate.parent.details.label.typeOfID": "Type of ID",
+        "certificate.parent.details.label.age": "Age",
         "certificate.receipt.amount": "Amount paid:",
         "certificate.receipt.amountDue": "Fee",
         "certificate.receipt.birthService.after": "Birth registration after {target} days of date of birth",
@@ -374,12 +375,12 @@
         "constants.registrationNumber": "Reg no.",
         "constants.issueCertificate": "Issue Certificate",
         "constants.collectorDetails": "Collector Details",
-        "constants.issueToMother": "Issue to informant (Mother)",
-        "constants.issueToFather": "Issue to informant (Father)",
-        "constants.issueToGroom": "Issue to informant (Groom)",
-        "constants.issueToBride": "Issue to informant (Bride)",
+        "constants.issueToMother": "Issue to mother",
+        "constants.issueToFather": "Issue to father",
+        "constants.issueToGroom": "Issue to groom",
+        "constants.issueToBride": "Issue to bride",
         "constants.issueToSomeoneElse": "Issue to someone else",
-        "constants.issueToInformant": "Issue to informant",
+        "constants.issueToInformant": "Issue to informant ({informant})",
         "constants.issueConfirmationMessage": "Please confirm that the certificate has been issued to the informant or collector.",
         "constants.idCheckWithoutVerify": "Continue without proof of ID?",
         "constants.requestReason": "Reason for request",
@@ -447,7 +448,7 @@
         "constants.requireUpdatesLoading": "Checking your declarations",
         "constants.integrations": "Integrations",
         "constants.assignRecord": "Assign record",
-        "correction.certificate.corrector.idCheck": "Check proof of ID",
+        "correction.certificate.corrector.idCheck": "Verify their identity",
         "constants.noConnection": "No connection",
         "constants.totalFileSizeExceed": "Total size of documents exceeds {fileSize}. Please reduce file size of your uploads",
         "constants.skipToMainContent": "Skip to main content",
@@ -484,7 +485,7 @@
         "correction.corrector.idCheck": "Check proof of ID",
         "correction.corrector.idCheckVerify": "Yes",
         "correction.corrector.idCheckWithoutVerify": "No",
-        "correction.corrector.informant": "Informant",
+        "correction.corrector.informant": "Informant ({informant})",
         "correction.corrector.legalGuardian": "Legal guardian",
         "correction.corrector.me": "Me",
         "correction.corrector.mother": "Mother",
@@ -873,8 +874,9 @@
         "form.field.label.app.whoContDet.grandSon": "Grandson",
         "form.field.label.app.whoContDet.legalGuardian": "Legal guardian",
         "form.field.label.app.whoContDet.mother": "Mother",
-        "form.field.label.app.certifyRecordTo.mother": "Print and issue to informant (Mother)",
-        "form.field.label.app.certifyRecordTo.father": "Print and issue to informant (Father)",
+        "form.field.label.app.certifyRecordTo.informant": "Print and issue to informant ({informant})",
+        "form.field.label.app.certifyRecordTo.mother": "Print and issue to mother",
+        "form.field.label.app.certifyRecordTo.father": "Print and issue to father",
         "form.field.label.app.whoContDet.other": "Other",
         "form.field.label.app.whoContDet.sister": "Sister",
         "form.field.label.app.whoContDet.sonInLaw": "Son in law",
@@ -1380,9 +1382,9 @@
         "form.field.label.informantRelation.groomAndBride": "Groom & Bride",
         "form.field.label.informantRelation.groom": "Groom",
         "form.field.label.informantRelation.bride": "Bride",
-        "form.section.groom.name": "Groom",
+        "form.section.groom.name": "Print and issue to groom",
         "form.section.groom.title": "Groom's details",
-        "form.section.bride.name": "Bride",
+        "form.section.bride.name": "Print and issue to bride",
         "form.section.bride.title": "Bride's details",
         "form.section.groom.headOfGroomFamily": "Head of groom's family",
         "form.section.bride.headOfBrideFamily": "Head of bride's family",
@@ -2190,6 +2192,7 @@
         "certificate.parent.details.label.nationality": "Nationalité",
         "certificate.parent.details.label.number": "Numéro",
         "certificate.parent.details.label.typeOfID": "Type de carte d'identité",
+        "certificate.parent.details.label.age": "L'âge",
         "certificate.receipt.amount": "Montant payé :",
         "certificate.receipt.amountDue": "Droits d'inscription",
         "certificate.receipt.birthService.after": "Enregistrement de la naissance après {target} jours de la date de naissance",
@@ -2575,7 +2578,7 @@
         "verifyCertificate.toastMessage": "Après avoir vérifié le certificat, veuillez fermer la fenêtre du navigateur.",
         "verifyCertificate.sexFemale": "Femme",
         "verifyCertificate.sexMale": "Homme",
-        "correction.certificate.corrector.idCheck": "Vérifiez la preuve d'identité. Correspond-elle aux détails suivants ?",
+        "correction.certificate.corrector.idCheck": "Vérifier leur identité",
         "correction.certificate.corrector.idCheckVerify": "Oui",
         "correction.certificate.corrector.idCheckWithoutVerify": "Non",
         "correction.certificate.corrector.otherIdCheck": "Avez-vous vérifié leur preuve d'identification ?",
@@ -2973,8 +2976,9 @@
         "form.field.label.app.whoContDet.grandSon": "Petit-fils",
         "form.field.label.app.whoContDet.legalGuardian": "Tuteur légal",
         "form.field.label.app.whoContDet.mother": "Mère",
-        "form.field.label.app.certifyRecordTo.mother": "Imprimer et délivrer à l'informateur (Mère)",
-        "form.field.label.app.certifyRecordTo.father": "Imprimer et délivrer à l'informateur (Père)",
+        "form.field.label.app.certifyRecordTo.informant": "Imprimer et remettre à l'informateur ({informant})",
+        "form.field.label.app.certifyRecordTo.mother": "Imprimer et remettre à la mère",
+        "form.field.label.app.certifyRecordTo.father": "Imprimer et remettre au père",
         "form.field.label.app.whoContDet.other": "Autre",
         "form.field.label.app.whoContDet.sister": "Sœur",
         "form.field.label.app.whoContDet.sonInLaw": "Beau-fils ou belle-fille",
@@ -3480,9 +3484,9 @@
         "form.field.label.informantRelation.groomAndBride": "Le marié et la mariée",
         "form.field.label.informantRelation.groom": "Marié",
         "form.field.label.informantRelation.bride": "Mariée",
-        "form.section.groom.name": "Marié",
+        "form.section.groom.name": "Imprimer et envoyer au marié",
         "form.section.groom.title": "Détails du marié",
-        "form.section.bride.name": "Mariée",
+        "form.section.bride.name": "Imprimer et envoyer à la mariée",
         "form.section.bride.title": "Détails de la mariée",
         "form.section.groom.headOfGroomFamily": "Chef de la famille du marié",
         "form.section.bride.headOfBrideFamily": "Chef de la famille de la mariée",

diff --git a/src/api/content/client/descriptions.json b/src/api/content/client/descriptions.json
@@ -470,6 +470,7 @@
     "print.certificate.manualPaymentMethod": "The label for select option for manual payment method",
     "print.certificate.collector.mother": "The label for select value when mother is the collector of certificate",
     "certificate.parent.details.label.nationality": "Parent Nationality",
+    "certificate.parent.details.label.age": "Person age",
     "certificate.parent.details.label.number": "Parent number",
     "print.certificate.collector.other": "The label for select value when the collector of certificate is other person",
     "print.certificate.payment": "The title for payment section",

diff --git a/src/form/common/select-options.ts b/src/form/common/select-options.ts
@@ -174,10 +174,6 @@ export const birthInformantTypeOptions: ISelectOption[] = [
     value: informantTypes.SISTER,
     label: informantMessageDescriptors.SISTER
   },
-  {
-    value: informantTypes.OTHER_FAMILY_MEMBER,
-    label: informantMessageDescriptors.OTHER_FAMILY_MEMBER
-  },
   {
     value: informantTypes.LEGAL_GUARDIAN,
     label: informantMessageDescriptors.LEGAL_GUARDIAN