Merge pull request #1104 from sgmap/template-refactor

Mutualize a duplicated render instruction

app/helpers/champ_helper.rb

@@ -0,0 +1,5 @@
+module ChampHelper
+  def is_not_header_nor_explication?(champ)
+    !['header_section', 'explication'].include?(champ.type_champ)
+  end
+end

app/views/new_gestionnaire/dossiers/champs/_address.html.haml

@@ -1,5 +1,3 @@
-= render partial: 'new_gestionnaire/dossiers/champs/champ_label', locals: { form: form, champ: champ, seen_at: seen_at }
-
 = form.text_field :value,
   'data-address': 'true',
   placeholder: champ.libelle,

app/views/new_gestionnaire/dossiers/champs/_champ.html.haml

@@ -1,3 +1,6 @@
 .champ
+  - if is_not_header_nor_explication?(champ)
+    = render partial: 'new_gestionnaire/dossiers/champs/champ_label', locals: { form: form, champ: champ, seen_at: seen_at }
+
   = render partial: "new_gestionnaire/dossiers/champs/#{champ.type_champ}",
-    locals: { champ: champ, form: form, seen_at: seen_at }
+    locals: { champ: champ, form: form }

app/views/new_gestionnaire/dossiers/champs/_checkbox.html.haml

@@ -1,5 +1,3 @@
-= render partial: 'new_gestionnaire/dossiers/champs/champ_label', locals: { form: form, champ: champ, seen_at: seen_at }
-
 = form.check_box :value,
   { required: champ.mandatory },
   'on',

app/views/new_gestionnaire/dossiers/champs/_civilite.html.haml

@@ -1,5 +1,3 @@
-= render partial: 'new_gestionnaire/dossiers/champs/champ_label', locals: { form: form, champ: champ, seen_at: seen_at }
-
 .radios
   %label
     = form.radio_button :value, 'M.'

app/views/new_gestionnaire/dossiers/champs/_date.html.haml

@@ -1,5 +1,3 @@
-= render partial: 'new_gestionnaire/dossiers/champs/champ_label', locals: { form: form, champ: champ, seen_at: seen_at }
-
 = form.date_field :value,
   value: champ.value,
   placeholder: 'JJ/MM/AAAA',

app/views/new_gestionnaire/dossiers/champs/_datetime.html.haml

@@ -1,5 +1,3 @@
-= render partial: 'new_gestionnaire/dossiers/champs/champ_label', locals: { form: form, champ: champ, seen_at: seen_at }
-
 - parsed_value = champ.value.present? ? DateTime.parse(champ.value) : DateTime.now
 
 .datetime

app/views/new_gestionnaire/dossiers/champs/_departements.html.haml

@@ -1,5 +1,3 @@
-= render partial: 'new_gestionnaire/dossiers/champs/champ_label', locals: { form: form, champ: champ, seen_at: seen_at }
-
 = form.select :value,
   Champ.departements,
   required: champ.mandatory

app/views/new_gestionnaire/dossiers/champs/_dossier_link.html.haml

@@ -1,5 +1,3 @@
-= render partial: 'new_gestionnaire/dossiers/champs/champ_label', locals: { form: form, champ: champ, seen_at: seen_at }
-
 - dossier = Dossier.find_by(id: champ.value)
 - show_text_summary = dossier.present?
 - show_warning = !show_text_summary && champ.value.present?

app/views/new_gestionnaire/dossiers/champs/_drop_down_list.html.haml

@@ -1,5 +1,3 @@
-= render partial: 'new_gestionnaire/dossiers/champs/champ_label', locals: { form: form, champ: champ, seen_at: seen_at }
-
 - if champ.drop_down_list && champ.drop_down_list.options.any?
   = form.select :value,
     champ.drop_down_list.options,

app/views/new_gestionnaire/dossiers/champs/_email.html.haml

@@ -1,5 +1,3 @@
-= render partial: 'new_gestionnaire/dossiers/champs/champ_label', locals: { form: form, champ: champ, seen_at: seen_at }
-
 = form.email_field :value,
   placeholder: champ.libelle,
   required: champ.mandatory

app/views/new_gestionnaire/dossiers/champs/_engagement.html.haml

@@ -1,5 +1,3 @@
-= render partial: 'new_gestionnaire/dossiers/champs/champ_label', locals: { form: form, champ: champ, seen_at: seen_at }
-
 = form.check_box :value,
   { required: champ.mandatory },
   'on',

app/views/new_gestionnaire/dossiers/champs/_multiple_drop_down_list.html.haml

@@ -1,5 +1,3 @@
-= render partial: 'new_gestionnaire/dossiers/champs/champ_label', locals: { form: form, champ: champ, seen_at: seen_at }
-
 - if champ.drop_down_list && champ.drop_down_list.options.any?
   = form.select :value,
       champ.drop_down_list.options,

app/views/new_gestionnaire/dossiers/champs/_number.html.haml

@@ -1,5 +1,3 @@
-= render partial: 'new_gestionnaire/dossiers/champs/champ_label', locals: { form: form, champ: champ, seen_at: seen_at }
-
 = form.number_field :value,
   placeholder: champ.libelle,
   required: champ.mandatory

app/views/new_gestionnaire/dossiers/champs/_pays.html.haml

@@ -1,5 +1,3 @@
-= render partial: 'new_gestionnaire/dossiers/champs/champ_label', locals: { form: form, champ: champ, seen_at: seen_at }
-
 = form.select :value,
   Champ.pays,
   required: champ.mandatory

app/views/new_gestionnaire/dossiers/champs/_phone.html.haml

@@ -1,5 +1,3 @@
-= render partial: 'new_gestionnaire/dossiers/champs/champ_label', locals: { form: form, champ: champ, seen_at: seen_at }
-
 = form.phone_field :value,
   placeholder: champ.libelle,
   required: champ.mandatory

app/views/new_gestionnaire/dossiers/champs/_regions.html.haml

@@ -1,5 +1,3 @@
-= render partial: 'new_gestionnaire/dossiers/champs/champ_label', locals: { form: form, champ: champ, seen_at: seen_at }
-
 = form.select :value,
   Champ.regions,
   required: champ.mandatory

app/views/new_gestionnaire/dossiers/champs/_text.html.haml

@@ -1,5 +1,3 @@
-= render partial: 'new_gestionnaire/dossiers/champs/champ_label', locals: { form: form, champ: champ, seen_at: seen_at }
-
 = form.text_field :value,
   placeholder: champ.libelle,
   required: champ.mandatory

app/views/new_gestionnaire/dossiers/champs/_textarea.html.haml

@@ -1,5 +1,3 @@
-= render partial: 'new_gestionnaire/dossiers/champs/champ_label', locals: { form: form, champ: champ, seen_at: seen_at }
-
 ~ form.text_area :value,
   row: 6,
   placeholder: champ.description,

app/views/new_gestionnaire/dossiers/champs/_yes_no.html.haml

@@ -1,5 +1,3 @@
-= render partial: 'new_gestionnaire/dossiers/champs/champ_label', locals: { form: form, champ: champ, seen_at: seen_at }
-
 .radios
   %label
     = form.radio_button :value, true