Merge pull request #196 from etalab/ux/tos-summary

Enhance ToS UX

Author: skelz0r

app/form_builders/authorization_request_form_builder.rb

@@ -62,9 +62,27 @@ def cgu_check_box(opts = {})
       I18n.t('authorization_request_forms.default.terms_of_service_accepted.label', link: @object.definition.cgu_link).html_safe
     end
 
+    opts[:class] ||= []
+    opts[:class] << 'fr-input-group--error' if all_terms_not_accepted_error?(:terms_of_service_accepted)
+
     dsfr_check_box(:terms_of_service_accepted, opts)
   end
 
+  def data_protection_officer_informed_check_box(opts = {})
+    opts[:class] ||= []
+    opts[:class] << 'fr-input-group--error' if all_terms_not_accepted_error?(:data_protection_officer_informed)
+
+    dsfr_check_box(:data_protection_officer_informed, opts)
+  end
+
+  def all_terms_not_accepted_error?(attribute)
+    return false if @object.public_send(attribute).present?
+
+    @object.errors.any? do |error|
+      error.attribute == :base && error.type == :all_terms_not_accepted
+    end
+  end
+
   def dsfr_file_field(attribute, opts = {})
     opts[:class] ||= 'fr-upload-group'
 

app/views/authorization_request_forms/shared/_tos_checkboxes.html.erb

@@ -1,2 +1,2 @@
 <%= f.cgu_check_box %>
-<%= f.dsfr_check_box :data_protection_officer_informed %>
+<%= f.data_protection_officer_informed_check_box %>

app/views/authorization_request_forms/summary.html.erb

@@ -84,10 +84,6 @@
 
     <%= 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 %>
-
     <% if @authorization_request.filling? %>
       <% @authorization_request.editable_blocks.each do |block| %>
         <%= render partial: "authorization_requests/shared/blocks/#{block[:name]}", locals: { f: f, editable: true } %>
@@ -111,6 +107,10 @@
       <% end %>
     <% end %>
 
+    <% if @authorization_request.draft? && !@authorization_request.reopening? %>
+      <%= render partial: 'authorization_request_forms/shared/tos_checkboxes', locals: { f: f } %>
+    <% end %>
+
     <% if policy(@authorization_request).submit? %>
       <div class="fr-btns-group fr-btns-group--inline-lg fr-btns-group--icon-left fr-btns-group--right">
         <%= f.button t('authorization_request_forms.form.submit'), type: :submit, name: :submit, id: :submit_authorization_request, class: %w(fr-btn fr-btn--sm fr-icon-checkbox-line fr-btn--icon-left) %>