Fix titles on different pages, Translate compliance_control_block in edit of compliance_control

11 files changed, 19 insertions, 64 deletions

diff --git a/app/models/compliance_control_block.rb b/app/models/compliance_control_block.rb
index 2be8d98a0..5721c00f4 100644
--- a/app/models/compliance_control_block.rb
+++ b/app/models/compliance_control_block.rb
@@ -12,7 +12,4 @@ class ComplianceControlBlock < ActiveRecord::Base
   validates :transport_mode, presence: true
   validates :compliance_control_set, presence: true
 
-  def label_method
-    [transport_mode, transport_submode].compact.map {|x| "[#{x}]"}.join
-  end
 end
diff --git a/app/views/compliance_control_sets/edit.html.slim b/app/views/compliance_control_sets/edit.html.slim
index a9b8d7253..934bd81b0 100644
--- a/app/views/compliance_control_sets/edit.html.slim
+++ b/app/views/compliance_control_sets/edit.html.slim
@@ -1,6 +1,6 @@
 / PageHeader
 = pageheader 'modele-calendrier',
-             t('compliance_control_sets.index.edit')
+             t('compliance_control_sets.edit.title', name: @compliance_control_set.name)
 
 / PageContent
 .page_content
diff --git a/app/views/compliance_control_sets/show.html.slim b/app/views/compliance_control_sets/show.html.slim
index 9a23a679c..b6e203a9e 100644
--- a/app/views/compliance_control_sets/show.html.slim
+++ b/app/views/compliance_control_sets/show.html.slim
@@ -1,6 +1,6 @@
 / PageHeader
 = pageheader 'jeux-de-donnees',
-              @compliance_control_set.name,
+              t('compliance_control_sets.show.title', name: @compliance_control_set.name),
              'Lorem ipsum dolor sit amet'
 
   / Below is secondary actions & optional contents (filters, ...)
diff --git a/app/views/compliance_controls/_form.html.slim b/app/views/compliance_controls/_form.html.slim
index 1ebbe8802..cf9d7379a 100644
--- a/app/views/compliance_controls/_form.html.slim
+++ b/app/views/compliance_controls/_form.html.slim
@@ -5,7 +5,7 @@
       = f.input :type, as: :hidden
       = f.input :code
       = f.input :criticity
-      = f.association :compliance_control_block, collection: @compliance_control_set.compliance_control_blocks, label_method: :label_method
+      = f.association :compliance_control_block, collection: @compliance_control_set.compliance_control_blocks, label_method: lambda { |block| transport_mode(block.transport_mode, block.transport_submode) }
       = f.input :comment
       - f.object.class.dynamic_attributes.each do |attribute|
         - if attribute == :target
diff --git a/app/views/compliance_controls/edit.html.slim b/app/views/compliance_controls/edit.html.slim
index 6824c7e40..d7497c0e2 100644
--- a/app/views/compliance_controls/edit.html.slim
+++ b/app/views/compliance_controls/edit.html.slim
@@ -1,5 +1,5 @@
 = pageheader 'compliance-control',
-        t('compliance_control.index.edit')
+        t('compliance_controls.edit.title')
 
 
 .page_content
diff --git a/app/views/compliance_controls/index.html.slim b/app/views/compliance_controls/index.html.slim
deleted file mode 100644
index fd1293837..000000000
--- a/app/views/compliance_controls/index.html.slim
+++ /dev/null
@@ -1,44 +0,0 @@
-/ PageHeader
-- header_params = ['jeux-de-donnees',
-        t('compliance_controls.index.title'),
-        '']
-- header_params << link_to(t('compliance_controls.actions.new'), new_compliance_control_set_compliance_control_path(@compliance_control_set), class: 'btn btn-default')  if policy(ComplianceControl).create?
-= pageheader(*header_params) do
-
-  .row.mb-sm
-    .col-lg-12.text-right
-
-.page_content
-  .container-fluid
-    .row
-      .col-lg-12
-        /= render 'filters'
-      .row
-        .col-lg-12
-          .select_table
-            = table_builder_2 @compliance_controls,
-                    [ \
-                TableBuilderHelper::Column.new( \
-                  key: :code, \
-                  attribute: 'code' \
-                ), \
-                TableBuilderHelper::Column.new( \
-                  key: :name, \
-                  attribute: 'name', \
-                  link_to: lambda do |compliance_control| \
-                      compliance_control_set_compliance_control_path(@compliance_control_set, compliance_control) \
-                    end \
-                ), \
-                TableBuilderHelper::Column.new( \
-                  key: :criticity, \
-                  attribute: 'criticity' \
-                ), \
-                TableBuilderHelper::Column.new( \
-                  key: :comment, \
-                  attribute: 'comment' \
-                ), \
-              ],
-              sortable: true,
-              cls: 'table has-filter has-search'
-
-
diff --git a/app/views/compliance_controls/new.html.slim b/app/views/compliance_controls/new.html.slim
index 20ed371ab..962f70ecc 100644
--- a/app/views/compliance_controls/new.html.slim
+++ b/app/views/compliance_controls/new.html.slim
@@ -1,6 +1,6 @@
 / PageHeader
 - header_params = ['jeux-de-donnees',
-        t('compliance_control_sets.index.new_control'),
+        t('compliance_controls.new.title'),
         '']
 = pageheader(*header_params) do
 
diff --git a/app/views/compliance_controls/select_type.html.slim b/app/views/compliance_controls/select_type.html.slim
index a4ae1ed27..c6e3b0427 100644
--- a/app/views/compliance_controls/select_type.html.slim
+++ b/app/views/compliance_controls/select_type.html.slim
@@ -1,6 +1,6 @@
 / PageHeader
 - header_params = ['jeux-de-donnees',
-        t('compliance_control_sets.index.select_types'),
+        t('compliance_controls.select_type.title'),
         '']
 = pageheader(*header_params) do
 
diff --git a/app/views/compliance_controls/show.html.slim b/app/views/compliance_controls/show.html.slim
index 2cf8051fc..8232dbe28 100644
--- a/app/views/compliance_controls/show.html.slim
+++ b/app/views/compliance_controls/show.html.slim
@@ -1,6 +1,6 @@
 / PageHeader
 = pageheader 'jeux-de-donnees',
-        @compliance_control.name,
+        t('compliance_controls.show.title'),
         ''
 / PageContent
 .page_content
diff --git a/config/locales/compliance_control_sets.fr.yml b/config/locales/compliance_control_sets.fr.yml
index e1b56c820..37851d7c4 100644
--- a/config/locales/compliance_control_sets.fr.yml
+++ b/config/locales/compliance_control_sets.fr.yml
@@ -1,11 +1,13 @@
 fr:
   compliance_control_sets:
     index:
-      title: Jeux de contrôle
-      new: Création d'un jeux de contrôle
-      new_control: Création d'un contrôle
-      select_types: Séléction du type de contrôle
-      edit: Édition d'un jeux de contrôle
+      title: "Liste des jeux de contrôles"
+    edit:
+      title: "Editer le jeu de contrôles %{name}"
+    show:
+      title: "Consulter le jeu de contrôles %{name}"
+    new:
+      title: "Créer un jeu de contrôles"
     actions:
       new: Ajouter
       edit: Editer
diff --git a/config/locales/compliance_controls.fr.yml b/config/locales/compliance_controls.fr.yml
index 8a55743f2..1f60e0fbc 100644
--- a/config/locales/compliance_controls.fr.yml
+++ b/config/locales/compliance_controls.fr.yml
@@ -4,13 +4,13 @@ fr:
       incoherent_control_sets: "Le contrôle ne peut pas être associé à un jeu de contrôle (id: %{direct_set_name}) différent de celui de son groupe (id: %{indirect_set_name})"
       mandatory_control_type: "Un type de contrôle doit être sélectionné"
     show:
-      title: "Jeu de controle"
-    index:
-      title: "Jeux de controles"
+      title: "Consulter un contrôle"
     new:
-      title: "Ajouter un jeu de controle"
+      title: "Ajouter un contrôle"
     edit:
-      title: "Editer le jeu de controle"
+      title: "Editer un contrôle"
+    select_type:
+      title: "Sélectionner un type de contrôle"
     route_control/zdl_stop_area:
       messages:
         3_route_1: "L'itinéraire % dessert successivement les arrêts % % et % % de la même zone de lieu"