display approving instructor on authorizations

etalab · Jan 20, 2025 · 5186fc2 · 5186fc2
1 parent 7573b00
commit 5186fc2
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 17 deletions.
diff --git a/app/models/authorization.rb b/app/models/authorization.rb
@@ -22,6 +22,10 @@ class Authorization < ApplicationRecord
     inverse_of: :authorization,
     dependent: :destroy
 
+  has_many :authorization_request_event,
+    as: :entity,
+    dependent: :nullify
+
   scope :validated, -> { joins(:request).where(authorization_requests: { state: 'validated' }) }
 
   delegate :name, :kind, to: :request
@@ -64,6 +68,14 @@ def definition
     authorization_request_class.constantize.definition
   end
 
+  def approving_instructor
+    authorization_request_event
+      .where(name: 'approve')
+      .order(created_at: :desc)
+      .first
+      .try(:user)
+  end
+
   private
 
   def affect_snapshot_documents(request_as_validated)

diff --git a/app/views/authorization_request_forms/build/_header.html.erb b/app/views/authorization_request_forms/build/_header.html.erb
@@ -32,7 +32,12 @@
 
       <% if @authorization && policy([:instruction, @authorization_request]).show? %>
         <div class="fr-pb-2w fr-pl-1w">
-          Cette habilitation a été délivrée suite à la <%= link_to "demande N°#{@authorization_request.id}", instruction_authorization_request_authorizations_path(@authorization_request), class: 'fr-link' %>
+          Cette habilitation a été validée 
+          <% if @authorization.approving_instructor %>
+            par
+            <strong><%=@authorization.approving_instructor.email%></strong>
+          <% end %>
+          durant la <%= link_to "demande N°#{@authorization_request.id}", instruction_authorization_request_authorizations_path(@authorization_request), class: 'fr-link' %>
         </div>
       <% end %>
     </div>

diff --git a/app/views/instruction/authorizations/index.html.erb b/app/views/instruction/authorizations/index.html.erb
@@ -4,24 +4,32 @@
   <% @authorizations.each do |authorization| %>
     <li class="authorization-row fr-mb-4w fr-pb-2w">
       <div class="fr-grid-row fr-grid-row--middle">
-        <ul class="fr-badge-group fr-col">
-          <li>
-            <span class="fr-badge fr-badge--no-icon">
-              <%= t("authorization.id_badge", id: authorization.id) %>
-            </span>
-          </li>
-          <li>
-            <span class="fr-badge fr-badge--no-icon">
-              <%= t("authorization.date_badge", date: authorization.created_at.strftime('%d/%m/%Y')) %>
-            </span>
-          </li>
-
-          <% if authorization.definition.stage.exists? %>
+        <div class="fr-col">
+          <ul class="fr-badge-group">
+            <li>
+              <span class="fr-badge fr-badge--no-icon">
+                <%= t("authorization.id_badge", id: authorization.id) %>
+              </span>
+            </li>
             <li>
-              <%= authorization_stage_badge(authorization) %>
+              <span class="fr-badge fr-badge--no-icon">
+                <%= t("authorization.date_badge", date: authorization.created_at.strftime('%d/%m/%Y')) %>
+              </span>
             </li>
+
+            <% if authorization.definition.stage.exists? %>
+              <li>
+                <%= authorization_stage_badge(authorization) %>
+              </li>
+            <% end %>
+          </ul>
+
+          <% if authorization.approving_instructor.present? %>
+            <div>
+              Validé par <strong><%= authorization.approving_instructor.email %></strong>
+            </div>
           <% end %>
-        </ul>
+        </div>
 
         <div>
           <%= link_to t('.show_cta'), authorization_request_authorization_path(@authorization_request, authorization), class: "fr-btn" %>

diff --git a/features/instructeurs/historique_habilitation.feature b/features/instructeurs/historique_habilitation.feature
@@ -100,5 +100,5 @@ Fonctionnalité: Instruction: historique habilitation
     Et que je clique sur "Consulter"
     Et que je clique sur "Historique"
     Et que je clique sur "Consulter l'habilitation"
-    Alors la page contient "Cette habilitation a été délivrée suite à la demande N°"
+    Alors la page contient "Cette habilitation a été validée par"
     Et la page contient un lien vers "/instruction/demandes/\d+/habilitations"