From 6d1fce0e399b2715ec346f307b838c8cb8f2ee44 Mon Sep 17 00:00:00 2001 From: Caillou <6117264+JeSuisUnCaillou@users.noreply.github.com> Date: Wed, 15 Jan 2025 11:48:28 +0100 Subject: [PATCH] display id of habilitation next to the date --- .../shared/_header_badge.erb | 5 +++- .../instruction/authorizations/index.html.erb | 25 +++++++++++-------- config/locales/fr.yml | 3 ++- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/app/views/authorization_request_forms/shared/_header_badge.erb b/app/views/authorization_request_forms/shared/_header_badge.erb index 3c56bcb69..488d246f5 100644 --- a/app/views/authorization_request_forms/shared/_header_badge.erb +++ b/app/views/authorization_request_forms/shared/_header_badge.erb @@ -10,7 +10,10 @@ <% if @authorization.present? %>
  • - <%= t("authorization.badge", date: @authorization.created_at.strftime('%d/%m/%Y')) %> + <%= t("authorization.id_badge", id: @authorization.id) %> +
  • +
  • + <%= t("authorization.date_badge", date: @authorization.created_at.strftime('%d/%m/%Y')) %>
  • <% elsif @authorization_request.persisted? %>
  • diff --git a/app/views/instruction/authorizations/index.html.erb b/app/views/instruction/authorizations/index.html.erb index 36978b70f..c2b9d8cf4 100644 --- a/app/views/instruction/authorizations/index.html.erb +++ b/app/views/instruction/authorizations/index.html.erb @@ -4,19 +4,24 @@ <% @authorizations.each do |authorization| %>
  • -
    - - N°<%= authorization.id %> - - - - <%= t("authorization.badge", date: authorization.created_at.strftime('%d/%m/%Y')) %> - +
      +
    • + + <%= t("authorization.id_badge", id: authorization.id) %> + +
    • +
    • + + <%= t("authorization.date_badge", date: authorization.created_at.strftime('%d/%m/%Y')) %> + +
    • <% if authorization.definition.stage.exists? %> - <%= authorization_stage_badge(authorization, css_class: "fr-my-1w fr-ml-1w") %> +
    • + <%= authorization_stage_badge(authorization) %> +
    • <% end %> -
    +
    <%= link_to t('.show_cta'), authorization_request_authorization_path(@authorization_request, authorization), class: "fr-btn" %> diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 198962f9a..276b72d82 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -19,7 +19,8 @@ fr: france_connect_eidas: niveau-eidas authorization: - badge: habilitation du %{date} + id_badge: habilitation N°%{id} + date_badge: du %{date} malware_scan: badge_class: