From ec1cd989abf77575e421bac5f89f9fde556b2c74 Mon Sep 17 00:00:00 2001 From: Paul Chavard Date: Wed, 25 Mar 2020 10:58:26 +0100 Subject: [PATCH] Show the reason on deleted dossiers --- app/helpers/dossier_helper.rb | 12 ++++++++++++ .../procedures/deleted_dossiers.html.haml | 9 +++++++-- config/locales/models/deleted_dossier/fr.yml | 11 +++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 config/locales/models/deleted_dossier/fr.yml diff --git a/app/helpers/dossier_helper.rb b/app/helpers/dossier_helper.rb index 072ac65a4..1341eeaaa 100644 --- a/app/helpers/dossier_helper.rb +++ b/app/helpers/dossier_helper.rb @@ -89,6 +89,18 @@ module DossierHelper content_tag(:span, status_text, class: "label #{status_class} ") end + def deletion_reason_badge(reason) + if reason.present? + status_text = I18n.t(reason, scope: [:activerecord, :attributes, :deleted_dossier, :reason]) + status_class = reason.tr('_', '-') + else + status_text = I18n.t(:unknown, scope: [:activerecord, :attributes, :deleted_dossier, :reason]) + status_class = 'unknown' + end + + content_tag(:span, status_text, class: "label #{status_class} ") + end + private def dinum_instance? diff --git a/app/views/instructeurs/procedures/deleted_dossiers.html.haml b/app/views/instructeurs/procedures/deleted_dossiers.html.haml index 1abef38d9..bca8319cc 100644 --- a/app/views/instructeurs/procedures/deleted_dossiers.html.haml +++ b/app/views/instructeurs/procedures/deleted_dossiers.html.haml @@ -53,16 +53,21 @@ %th.notification-col %th.number-col N° dossier %th.status-col Etat + %th.status-col Raison de suppression %th.status-col Date de suppression %tbody - @deleted_dossiers.each do |deleted_dossier| %tr %td.folder-col %span.icon.folder - %td.number-col= deleted_dossier.dossier_id + %td.number-col + = deleted_dossier.dossier_id %td.status-col = status_badge(deleted_dossier.state) - %td.date-col.deleted-cell= l(deleted_dossier.deleted_at, format: '%d/%m/%y') + %td.reason-col + = deletion_reason_badge(deleted_dossier.reason) + %td.date-col.deleted-cell + = l(deleted_dossier.deleted_at, format: '%d/%m/%y') = paginate @deleted_dossiers - else Aucun dossier supprimé diff --git a/config/locales/models/deleted_dossier/fr.yml b/config/locales/models/deleted_dossier/fr.yml new file mode 100644 index 000000000..5b4dd95e1 --- /dev/null +++ b/config/locales/models/deleted_dossier/fr.yml @@ -0,0 +1,11 @@ +fr: + activerecord: + attributes: + deleted_dossier: + reason: + user_request: Demande d’usager + manager_request: Demande d’administration + user_removed: Suppression d'un compte usager + expired: Expiration + unknown: Inconnue +