Merge pull request #1124 from opencrvs/ocrvs-10824

Remove review form config (signature and comment fields) from ActionType.VALIDATE and ActionType.REGISTER

Author: cibelius

src/form/tennis-club-membership.ts

@@ -828,7 +828,14 @@ export const tennisClubMembershipEvent = defineConfig({
           'This is shown as the action name anywhere the user can trigger the action from',
         id: 'event.tennis-club-membership.action.validate.label'
       },
-      review: TENNIS_CLUB_DECLARATION_REVIEW
+      review: {
+        title: {
+          defaultMessage: 'Validate',
+          description: 'Title of the form to show in review page',
+          id: 'event.birth.action.validate.form.review.title'
+        },
+        fields: []
+      }
     },
     {
       type: ActionType.REGISTER,
@@ -838,7 +845,14 @@ export const tennisClubMembershipEvent = defineConfig({
           'This is shown as the action name anywhere the user can trigger the action from',
         id: 'event.tennis-club-membership.action.register.label'
       },
-      review: TENNIS_CLUB_DECLARATION_REVIEW
+      review: {
+        title: {
+          defaultMessage: 'Register',
+          description: 'Title of the form to show in review page',
+          id: 'event.birth.action.register.form.review.title'
+        },
+        fields: []
+      }
     },
     {
       type: ActionType.PRINT_CERTIFICATE,

src/form/v2/birth/index.ts

@@ -198,7 +198,14 @@ export const birthEvent = defineConfig({
           'This is shown as the action name anywhere the user can trigger the action from',
         id: 'event.birth.action.validate.label'
       },
-      review: BIRTH_DECLARATION_REVIEW,
+      review: {
+        title: {
+          defaultMessage: 'Validate',
+          description: 'Title of the form to show in review page',
+          id: 'event.birth.action.validate.form.review.title'
+        },
+        fields: []
+      },
       deduplication: {
         id: 'birth-deduplication',
         label: {
@@ -218,7 +225,14 @@ export const birthEvent = defineConfig({
           'This is shown as the action name anywhere the user can trigger the action from',
         id: 'event.birth.action.register.label'
       },
-      review: BIRTH_DECLARATION_REVIEW,
+      review: {
+        title: {
+          defaultMessage: 'Register',
+          description: 'Title of the form to show in review page',
+          id: 'event.birth.action.register.form.review.title'
+        },
+        fields: []
+      },
       deduplication: {
         id: 'birth-deduplication',
         label: {

src/form/v2/death/index.ts

@@ -201,7 +201,14 @@ export const deathEvent = defineConfig({
           'This is shown as the action name anywhere the user can trigger the action from',
         id: 'event.death.action.validate.label'
       },
-      review: DEATH_DECLARATION_REVIEW,
+      review: {
+        title: {
+          defaultMessage: 'Validate',
+          description: 'Title of the form to show in review page',
+          id: 'event.birth.action.validate.form.review.title'
+        },
+        fields: []
+      },
       deduplication: {
         id: 'death-deduplication',
         label: {
@@ -221,7 +228,14 @@ export const deathEvent = defineConfig({
           'This is shown as the action name anywhere the user can trigger the action from',
         id: 'event.death.action.register.label'
       },
-      review: DEATH_DECLARATION_REVIEW,
+      review: {
+        title: {
+          defaultMessage: 'Register',
+          description: 'Title of the form to show in review page',
+          id: 'event.birth.action.register.form.review.title'
+        },
+        fields: []
+      },
       deduplication: {
         id: 'death-deduplication',
         label: {

src/translations/client.csv

@@ -352,6 +352,7 @@ constants.phoneNumber,Phone label,Phone number,Numéro de téléphone
 constants.policeOfficer,The description for Police Officer type,Police Officer,Agent de police
 constants.reason,Label for Reason the declaration was rejected,Reason,Raison
 constants.record,Label for header table header Record,Record,Dossier
+constants.audit,Label for the audit header,Audit,Audit
 constants.refresh,label for refresh,refresh,Rafraîchir
 constants.registered,A label for registered,Registered,Enregistré
 constants.registered.status,A label for registered,Registered,Enregistré
@@ -795,7 +796,7 @@ errors.somethingWentWrong,Error toast message for general errors,Something went
 event.action.declare.form.section.person.field.age.error,Error message for invalid age,Age must be between 12 and 120,L'auteur doit avoir entre 12 et 120 ans
 event.action.notAvailableForEvent,Shown when user tries to perform an action that is not available for the event,The action you're trying to perform is not available for this event anymore,L'action que vous essayez d'effectuer n'est plus disponible pour cet événement
 event.action.outbox-retry.label,Label for retry button for outbox,Retry,Réessayer
-event.action.review-correction.label,Label for review correction button in dropdown menu,Review,Revoir
+event.action.review-correction.label,Label for review correction button in dropdown menu,Review correction request,Revoir la demande de correction
 event.birth.action.archive.label,Label for archive record button in dropdown menu,Archive,Aarchiver
 event.birth.action.certificate.form.section.collectPayment.data.label,Title for the data section,Payment details,Détails du paiement
 event.birth.action.certificate.form.section.collectPayment.fee.label,Title for the data entry,Fee,Frais
@@ -854,12 +855,13 @@ event.birth.action.declare.form.section.person.field.nid.label,This is the label
 event.birth.action.declare.form.section.person.field.occupation.label,This is the label for the field,Occupation,Profession
 event.birth.action.declare.form.section.person.field.passport.label,This is the label for the field,ID Number,Numéro d'identification
 event.birth.action.declare.label,This is shown as the action name anywhere the user can trigger the action from,Declare,Declare
+event.birth.action.reject.label,This is the label for the reject action,Reject,Rejeter
 event.birth.action.delete.label,Label for delete button in dropdown menu,Delete,Supprimer
 event.birth.action.form.section.collector.other.field.name.label,This is the label for the name field of OTHER collector,Collector's name,Nom du collecteur
 event.birth.action.mark-as-duplicate.label,Label for review potential duplicate button in dropdown menu,Review,Revoir
-event.birth.action.register.label,Label for review record button in dropdown menu,Review,Revoir
+event.birth.action.register.label,Label for review record button in dropdown menu,Register,Enregistrer
 event.birth.action.request-correction.label,This is shown as the action name anywhere the user can trigger the action from,Correct record,Enregistrement correct
-event.birth.action.validate.label,This is shown as the action name anywhere the user can trigger the action from,Review,Revoir
+event.birth.action.validate.label,This is shown as the action name anywhere the user can trigger the action from,Validate,Valider
 event.birth.label,This is what this event is referred as in the system,Birth,Naissance
 event.birth.summary.child.dob.empty,Label for date of birth not available,No date of birth,Pas de date de naissance
 event.birth.summary.child.placeOfBirth.empty,Label for place of birth not available,No place of birth,Pas de lieu de naissance
@@ -1109,6 +1111,8 @@ event.tennis-club-membership.summary.field.recommender.firstname.empty,Shown whe
 event.tennis-club-membership.summary.field.recommender.firstname.label,Label for the recommender's first name field,Recommender's First Name,Recommender's First Name
 event.tennis-club-membership.summary.field.recommender.id.empty,Shown when the recommender id is missing in summary,Recommender's id missing,Recommender's id missing
 event.tennis-club-membership.summary.field.recommender.id.label,Label for the recommender's ID field,Recommender's ID,Recommender's ID
+events.overview.tabs.record,Title of the Record tab,Record,Enregistrement
+events.overview.tabs.audit,Title of the Audit tab,Audit,Audit
 events.history.status,Events status history,"{status, select, CREATE {Declaration started} NOTIFY {Sent incomplete} VALIDATE {Sent for approval} DRAFT {Draft} DECLARE {Sent for review} REGISTER {Registered} PRINT_CERTIFICATE {Certified} REJECT {Rejected} ARCHIVE {Archived} DUPLICATE_DETECTED {Flagged as potential duplicate} MARKED_AS_DUPLICATE {Marked as a duplicate} MARK_AS_NOT_DUPLICATE {Marked not a duplicate} CORRECTED {Record corrected} REQUEST_CORRECTION {Correction requested} APPROVE_CORRECTION {Correction approved} REJECT_CORRECTION {Correction rejected} READ {Viewed} ASSIGN {Assigned} UNASSIGN {Unassigned} UPDATE {Updated} other {Unknown}}","{status, select, CREATE {Déclaration commencée} NOTIFY {Envoyé incomplet} VALIDATE {Envoyé pour approbation} DRAFT {Brouillon} DECLARE {Envoyé pour révision} REGISTER {Enregistré} PRINT_CERTIFICATE {Certifié} REJECT {Rejeté} ARCHIVE {Archivé} DUPLICATE_DETECTED {Marqué comme doublon} MARKED_AS_DUPLICATE {Marqué comme doublon} MARK_AS_NOT_DUPLICATE {Marqué comme non en doublon} CORRECTED {Enregistrement corrigé} REQUEST_CORRECTION {Correction demandée} APPROVE_CORRECTION {Correction approuvée} REJECT_CORRECTION {Correction refusée} READ {Consulté} ASSIGN {Attribué} UNASSIGN {Désattribué} UPDATE {Mis à jour} other {Inconnu}}"
 events.outbox.processingAction,Message in outbox when processing action,"{action, select, DECLARE {Sending} REGISTER {Registering} VALIDATE {Sending for approval} NOTIFY {Sending} REJECT {Sending for updates} ARCHIVE {Archiving} PRINT_CERTIFICATE {Certifying} REQUEST_CORRECTION {Requesting correction} APPROVE_CORRECTION {Approving correction} REJECT_CORRECTION {Rejecting correction} ASSIGN {Assigning} UNASSIGN {Unassigning} other {processing action}}","{action, select, DECLARE {Envoi} REGISTER {Enregistrement} VALIDATE {Envoi pour approbation} NOTIFY {Envoi} REJECT {Envoi pour mise à jour} ARCHIVE {Archivage} PRINT_CERTIFICATE {Certification} REQUEST_CORRECTION {Demande de correction} APPROVE_CORRECTION {Approbation de la correction} REJECT_CORRECTION {Rejet de la correction} ASSIGN {Attribution} UNASSIGN {Désattribution} other {action en cours}}"
 events.outbox.waitingForAction,Message in outbox when waiting for action,"Waiting to {action, select, DECLARE {send} CREATE {send} REGISTER {register} VALIDATE {send for approval} NOTIFY {send} REJECT {send for updates} ARCHIVE {archive} PRINT_CERTIFICATE {certify} REQUEST_CORRECTION {request correction} APPROVE_CORRECTION {approve correction} REJECT_CORRECTION {reject correction} ASSIGN {assign} UNASSIGN {unassign} other {action}}","En attente de {action, select, DECLARE {l'envoi} CREATE {l'envoi} REGISTER {l'enregistrement} VALIDATE {l'envoi pour approbation} NOTIFY {l'envoi} REJECT {l'envoi pour mise à jour} ARCHIVE {l'archivage} PRINT_CERTIFICATE {la certification} REQUEST_CORRECTION {la demande de correction} APPROVE_CORRECTION {l'approbation de la correction} REJECT_CORRECTION {le rejet de la correction} ASSIGN {l'attribution} UNASSIGN {la désattribution} other {l'action}}"
@@ -1737,7 +1741,7 @@ printAction.title,The title for print action,Print certificate,Imprimer le certi
 record-corrected.summary.section.title,Corrections section title,Correction(s),Correction(s)
 record.certificate.collectedInAdvance,Table column header showing collector info in record audit,Printed in advance by,Imprimé à l'avance par
 record.certificate.collector,Table column header showing collector info in record audit,Printed on collection,Contrôle d'identité
-recordAudit.archive.confirmation.body,Confirmation body for archiving a declaration,This will archive the record and remove it from your workspace,"Cela supprimera la déclaration de la file d'attente et changera son statut en archive. Pour annuler ce changement, vous devrez rechercher la déclaration."
+recordAudit.archive.confirmation.body,Confirmation body for archiving a declaration,This will remove the declaration from the workqueue and change the status to Archive. To revert this change you will need to search for the declaration.,"Cela supprimera la déclaration de la file d'attente et changera son statut en Archivé. Pour annuler ce changement, vous devrez rechercher la déclaration."
 recordAudit.archive.confirmation.title,Confirmation title for archiving a declaration,Archive declaration?,Archiver la déclaration ?
 recordAudit.archive.status,Archived status,Archived,Archivé
 recordAudit.contact,Contact for record audit,Contact,Contact
@@ -1948,7 +1952,7 @@ review.register.confirmModal.cancel,The label for modal cancel button when regis
 review.register.confirmModal.confirm,The label for modal confirm button when registering,Register,Enregistrer
 review.register.confirmModal.description,The description for review action modal when registering,‎,
 review.register.confirmModal.title,The title for review action modal when registering,Register the {event}?,Enregistrer cet {event}?
-review.register.description.complete,The description for registration action when form is complete,"By clicking register, you confirm that the information entered is correct and the event can be registered.","En cliquant sur enregistrer, vous confirmez que les informations saisies sont correctes et que l'événement peut être enregistré."
+review.register.description.complete,The description for registration action when form is complete,"By clicking 'Confirm', you confirm that the information entered is correct and the event can be registered.","En cliquant sur enregistrer, vous confirmez que les informations saisies sont correctes et que l'événement peut être enregistré."
 review.register.reject,The label for reject button of review action,Reject,Rejeter
 review.register.title,The title shown when reviewing a record to register,Register event,Enregistrer l'événement
 review.rej.form.reasons.missSupDoc,Label for rejection option missing supporting doc,Missing supporting documents,Documents justificatifs manquants
@@ -1972,7 +1976,7 @@ review.validate.confirmModal.cancel,The label for modal cancel button when valid
 review.validate.confirmModal.confirm,The label for modal confirm button when validating,Confirm,Confirmer
 review.validate.confirmModal.description,The description for review action modal when validating,This declaration will be sent for approval prior to registration.,Cette déclaration sera envoyée pour approbation avant l'enregistrement.
 review.validate.confirmModal.title,The title for review action modal when validating,Send for approval?,Envoyer pour approbation ?
-review.validate.description.complete,The description for validate action when form is complete,The informant will receive an email with a registration number that they can use to collect the certificate,L'informateur recevra un e-mail avec un numéro d'enregistrement qu'il pourra utiliser pour récupérer le certificat.
+review.validate.description.complete,The description for validate action when form is complete,The informant will receive an email with a registration number that they can use to collect the certificate.,L'informateur recevra un e-mail avec un numéro d'enregistrement qu'il pourra utiliser pour récupérer le certificat.
 review.validate.description.incomplete,The description for validate action when form is complete,Please add mandatory information before sending for approval,Veuillez ajouter les informations obligatoires avant d'envoyer pour approbation.
 review.validate.reject,The label for reject button of review action,Reject,Rejeter
 review.validate.title,The title shown when reviewing a record to validate,Send for approval,Envoyer pour approbation
@@ -2159,6 +2163,7 @@ user.profile.roleType,Title for roleType field,Role,Rôle/Type
 user.profile.sectionTitle.audit,Title for audit section,History,Historique
 user.profile.startDate,Title for startDate field,Start date,Date de début
 user.profile.userName,Title for userName field,Username,Nom d'utilisateur
+user.avatar,Aria label for user avatar button,User avatar,Avatar utilisateur
 userRole.communityLeader,Name for user role Community Leader,Community Leader,Leader communautaire
 userRole.fieldAgent,Name for user role Field Agent,Field Agent,Agent de terrain
 userRole.healthcareWorker,Name for user role Healthcare Worker,Healthcare Worker,Personnel de santé