Merge pull request #165 from etalab/features/entities-in-summary

Displays entities in summaries

app/views/authorization_request_forms/summary.html.erb

@@ -82,6 +82,8 @@
       <% end %>
     <% end %>
 
+    <%= render partial: 'authorization_requests/shared/organization_and_applicant' %>
+
     <% if @authorization_request.draft? && !@authorization_request.reopening? %>
       <%= render partial: 'authorization_request_forms/shared/tos_checkboxes', locals: { f: f } %>
     <% end %>

app/views/authorization_requests/shared/_organization_and_applicant.html.erb

@@ -0,0 +1,63 @@
+<div class="fr-container-fluid">
+  <div class="fr-grid-row">
+    <div class="fr-col-12 fr-col-lg-6 fr-pr-4v fr-pb-4v">
+      <div class="fr-basic-card">
+        <div class="contact-card__kind">
+          Organisation
+        </div>
+
+        <div class="contact-card__full_name">
+          <%= @authorization_request.organization.raison_sociale %>
+        </div>
+
+        <%
+          %w[
+            siret
+            address
+            code_naf_with_libelle
+          ].each do |organization_attribute|
+        %>
+          <% next unless @authorization_request.organization.public_send(organization_attribute).present? %>
+
+          <div class="contact-card__attribute">
+            <div class="contact-card__attribute-label">
+              <%= Organization.human_attribute_name(organization_attribute) %>
+            </div>
+            <div class="contact-card__attribute-value">
+              <%= @authorization_request.organization.public_send(organization_attribute) %>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    </div>
+
+    <div class="fr-col-12 fr-col-lg-6 fr-pr-4v fr-pb-4v">
+      <div class="fr-basic-card">
+        <div class="contact-card__kind">
+          Demandeur
+        </div>
+
+        <div class="contact-card__full_name">
+          <%= @authorization_request.applicant.full_name %>
+        </div>
+
+        <%
+          %w[
+            job_title
+            email
+            phone_number
+          ].each do |user_attribute|
+        %>
+          <div class="contact-card__attribute">
+            <div class="contact-card__attribute-label">
+              <%= User.human_attribute_name(user_attribute) %>
+            </div>
+            <div class="contact-card__attribute-value">
+              <%= @authorization_request.applicant.public_send(user_attribute) %>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>

app/views/instruction/authorization_requests/show.html.erb

@@ -1,67 +1,5 @@
 <%= authorization_request_form_tag(@authorization_request) do |f| %>
-  <div class="fr-container-fluid">
-    <div class="fr-grid-row">
-      <div class="fr-col-12 fr-col-lg-6 fr-pr-4v fr-pb-4v">
-        <div class="fr-basic-card">
-          <div class="contact-card__kind">
-            Organisation
-          </div>
-
-          <div class="contact-card__full_name">
-            <%= @authorization_request.organization.raison_sociale %>
-          </div>
-
-          <%
-            %w[
-              siret
-              address
-              code_naf_with_libelle
-            ].each do |organization_attribute|
-          %>
-            <% next unless @authorization_request.organization.public_send(organization_attribute).present? %>
-
-            <div class="contact-card__attribute">
-              <div class="contact-card__attribute-label">
-                <%= Organization.human_attribute_name(organization_attribute) %>
-              </div>
-              <div class="contact-card__attribute-value">
-                <%= @authorization_request.organization.public_send(organization_attribute) %>
-              </div>
-            </div>
-          <% end %>
-        </div>
-      </div>
-
-      <div class="fr-col-12 fr-col-lg-6 fr-pr-4v fr-pb-4v">
-        <div class="fr-basic-card">
-          <div class="contact-card__kind">
-            Demandeur
-          </div>
-
-          <div class="contact-card__full_name">
-            <%= @authorization_request.applicant.full_name %>
-          </div>
-
-          <%
-            %w[
-              job_title
-              email
-              phone_number
-            ].each do |user_attribute|
-          %>
-            <div class="contact-card__attribute">
-              <div class="contact-card__attribute-label">
-                <%= User.human_attribute_name(user_attribute) %>
-              </div>
-              <div class="contact-card__attribute-value">
-                <%= @authorization_request.applicant.public_send(user_attribute) %>
-              </div>
-            </div>
-          <% end %>
-        </div>
-      </div>
-    </div>
-  </div>
+  <%= render partial: 'authorization_requests/shared/organization_and_applicant' %>
 
   <div class="info-block">
     <h3>