Fix compliance check sets breadcrumb, locales and datas display

9 files changed, 72 insertions, 28 deletions

diff --git a/app/controllers/compliance_check_sets_controller.rb b/app/controllers/compliance_check_sets_controller.rb
index 600c69126..4ec86f0d6 100644
--- a/app/controllers/compliance_check_sets_controller.rb
+++ b/app/controllers/compliance_check_sets_controller.rb
@@ -21,9 +21,7 @@ class ComplianceCheckSetsController < ChouetteController
 
   def show
     show! do
-      @compliance_check_set = @compliance_check_set.decorate(context: {
-        compliance_check_set: @compliance_check_set
-      })
+      @compliance_check_set = @compliance_check_set.decorate
     end
   end
 
diff --git a/app/models/compliance_check_set.rb b/app/models/compliance_check_set.rb
index 63f380d99..f4c44d26d 100644
--- a/app/models/compliance_check_set.rb
+++ b/app/models/compliance_check_set.rb
@@ -26,6 +26,14 @@ class ComplianceCheckSet < ActiveRecord::Base
     end
   end
 
+  def organisation
+    workbench.organisation
+  end
+
+  def human_attribute_name(*args)
+    self.class.human_attribute_name(*args)
+  end
+
   def update_status
     statuses = compliance_check_resources.map do |resource|
       case resource.status
diff --git a/app/views/compliance_check_sets/executed.html.slim b/app/views/compliance_check_sets/executed.html.slim
index da8a2a3de..b33b516b4 100644
--- a/app/views/compliance_check_sets/executed.html.slim
+++ b/app/views/compliance_check_sets/executed.html.slim
@@ -1,4 +1,4 @@
-- breadcrumb :compliance_check_set, @workbench, @compliance_check_set
+- breadcrumb :compliance_check_set_executed, @workbench, @compliance_check_set
 - page_header_content_for @compliance_check_set
 
 .page_content
diff --git a/app/views/compliance_check_sets/index.html.slim b/app/views/compliance_check_sets/index.html.slim
index f109845b4..f15e85bdd 100644
--- a/app/views/compliance_check_sets/index.html.slim
+++ b/app/views/compliance_check_sets/index.html.slim
@@ -12,7 +12,10 @@
               [ \
                 TableBuilderHelper::Column.new( \
                   key: :ref, \
-                  attribute: 'id' \
+                  attribute: 'id', \
+                  link_to: lambda do |compliance_check_set| \
+                    workbench_compliance_check_set_path(compliance_check_set.workbench_id, compliance_check_set.id) \
+                  end \
                 ), \
                 TableBuilderHelper::Column.new( \
                   key: :creation_date, \
@@ -31,7 +34,10 @@
                 ), \
                 TableBuilderHelper::Column.new(\
                   key: :compliance_control_set, \
-                  attribute: Proc.new{ |n| (n.compliance_control_set.name) if n.compliance_control_set} \
+                  attribute: 'name', \
+                  link_to: lambda do |compliance_check_set| \
+                    executed_workbench_compliance_check_set_path(compliance_check_set.workbench_id, compliance_check_set.id) \
+                  end \
                 ), \
               ],
               sortable: true,
diff --git a/app/views/compliance_check_sets/show.html.slim b/app/views/compliance_check_sets/show.html.slim
index 35a60eb52..4db2e805f 100644
--- a/app/views/compliance_check_sets/show.html.slim
+++ b/app/views/compliance_check_sets/show.html.slim
@@ -1,4 +1,4 @@
-- breadcrumb :compliance_check_sets, @workbench, @compliance_check_set
+- breadcrumb :compliance_check_set, @workbench, @compliance_check_set
 / PageHeader
 - content_for :page_header_content do
   .row
@@ -11,31 +11,28 @@
               = link.content
 
 - page_header_content_for @compliance_check_set
-/ = pageheader 'jeux-de-donnees',
-/              @compliance_check_set.name,
-/              '',
-/              t('last_update', time: l(@compliance_check_set.updated_at, format: :short)) do
-
-  / Below is secundary actions & optional contents (filters, ...)
-  / .row
-  /   .col-lg-12.text-right.mb-sm
-  /     - @compliance_check_set.action_links.each do |link|
-  /       = link_to link.href,
-  /           method: link.method,
-  /           data: link.data,
-  /           class: 'btn btn-primary' do
-  /         = link.content
 
 / PageContent
 .page_content.import_messages
   .container-fluid
     .row
+      .col-lg-6.col-md-6.col-sm-12.col-xs-12
+        = definition_list( t('metadatas'),
+          { I18n.t("compliance_check_sets.show.metadatas.referential") => (@compliance_check_set.referential.nil? ? '' : link_to(@compliance_check_set.referential.name, referential_path(@compliance_check_set.referential)) ),
+            I18n.t("compliance_check_sets.show.metadatas.referential_type") => 'Jeu de données',
+            I18n.t("compliance_check_sets.show.metadatas.compliance_check_set_executed") => link_to(@compliance_check_set.name, executed_workbench_compliance_check_set_path(@compliance_check_set.workbench_id, @compliance_check_set)),
+            I18n.t("compliance_check_sets.show.metadatas.compliance_control_owner") => @compliance_check_set.organisation.name,
+            I18n.t("compliance_check_sets.show.metadatas.import") => '' })
+    .row
       .col-lg-12
         h1
           span.status_icon = compliance_check_set_status(@compliance_check_set.status)
-          span = t('compliance_check_sets.show.table_state', lines_status: @compliance_check_set.lines_status , lines_in_compliance_check_set: @compliance_check_set.lines_in_compliance_check_set )
+          span = t('.table_state', lines_status: @compliance_check_set.lines_status , lines_in_compliance_check_set: @compliance_check_set.lines_in_compliance_check_set )
       .col-lg-12
-        = t('compliance_check_sets.show.table_explanation')
+        h2 = t('.table_title')
+      .col-lg-12
+        = t('.table_explanation')
+
     .row
       .col-lg-12
         = table_builder_2 @compliance_check_set.compliance_check_resources,
@@ -63,4 +60,4 @@
           ],
           sortable: false, \
           links: [],
-          cls: 'table'
+          cls: 'table has-search'
diff --git a/config/breadcrumbs.rb b/config/breadcrumbs.rb
index ce5cf5b0f..6da96d73a 100644
--- a/config/breadcrumbs.rb
+++ b/config/breadcrumbs.rb
@@ -96,6 +96,11 @@ crumb :compliance_check_set do |workbench, compliance_check_set|
   parent :compliance_check_sets, workbench
 end
 
+crumb :compliance_check_set_executed do |workbench, compliance_check_set|
+  link I18n.t('compliance_check_sets.executed.title', name: compliance_check_set.name), executed_workbench_compliance_check_set_path(workbench, compliance_check_set)
+  parent :compliance_check_sets, workbench
+end
+
 crumb :imports do |workbench|
   link I18n.t('imports.index.title'), workbench_imports_path(workbench)
   parent :workbench, workbench
diff --git a/config/locales/compliance_check_sets.en.yml b/config/locales/compliance_check_sets.en.yml
index 1081b1d66..5e8c3b24f 100644
--- a/config/locales/compliance_check_sets.en.yml
+++ b/config/locales/compliance_check_sets.en.yml
@@ -22,7 +22,14 @@ en:
       title: Compliance check set report
       table_state: "%{lines_status} lines imported on %{lines_in_compliance_check_set} in the archive"
       table_explanation: "These controls apply to all imported data and condition the construction of your organization's offer."
+      table_title: Analysed lines state
       metrics: "%{ok_count} ok, %{error_count} errors, %{warning_count} warnings, %{uncheck_count} n/a"
+      metadatas:
+        referential: "Object analysed"
+        referential_type: "Apply to"
+        compliance_check_set_executed: "Compliance check set executed"
+        compliance_control_owner: "Compliance control owner"
+        import: "Import"
     errors:
       no_parent: "The compliance check set doesn't have any parent"
   activerecord:
@@ -40,6 +47,14 @@ en:
         metrics: Test results
         download: Download
     models:
+      compliance_check_set:
+        zero:  "Compliance check set"
+        one:   "Compliance check set"
+        other: "Compliance check sets"
+      compliance_check:
+        zero:  "Compliance check"
+        one:   "Compliance check"
+        other: "Compliance checks"
       compliance_check_block:
         one: compliance_control_set
         other: compliance_control_sets
diff --git a/config/locales/compliance_check_sets.fr.yml b/config/locales/compliance_check_sets.fr.yml
index 8c4561ae9..20bf11d85 100644
--- a/config/locales/compliance_check_sets.fr.yml
+++ b/config/locales/compliance_check_sets.fr.yml
@@ -13,12 +13,19 @@ fr:
       title: "Liste des rapports de contrôles"
     search_no_results: Aucun rapport de contrôle ne correspond à votre recherche
     executed:
-      title: Jeu de contrôles exécutés %{name}
+      title: Jeu de contrôles exécuté %{name}
     show:
       title: Rapport de contrôle
-      table_state: "%{lines_status} lignes importées sur %{lines_in_compliance_check_set} présentes dans l'archive"
+      table_state: "%{lines_status} lignes valides sur %{lines_in_compliance_check_set} présentes dans l'offre de transport"
       table_explanation: Ces contrôles s’appliquent pour toutes les données importées et conditionnent la construction de l’offre de votre organisation
+      table_title: État des lignes analysées
       metrics: "%{ok_count} ok, %{error_count} errors, %{warning_count} warnings, %{uncheck_count} n/a"
+      metadatas:
+        referential: "Objet analysé"
+        referential_type: "Appliqué à"
+        compliance_check_set_executed: "Jeu de contrôles exécuté"
+        compliance_control_owner: "Propriétaire du jeu de contrôles"
+        import: "Rapport d'import"
     errors:
       no_parent: "Le jeux de contrôle n'a pas de parent"
   activerecord:
@@ -28,7 +35,7 @@ fr:
         creation_date: Date et heure de création
         associated_object: Objet associé
         assigned_to: Affectation
-        compliance_control_set: jeu de contrôle
+        compliance_control_set: Jeu de contrôle exécuté
         name: Nom
       compliance_check_resource:
         name: Nom de la ligne
@@ -36,6 +43,14 @@ fr:
         metrics: Résultat des tests
         download: Télécharger
     models:
+      compliance_check_set:
+        zero:  "Rapport de contrôles"
+        one:   "Rapport de contrôles"
+        other: "Rapport de contrôles"
+      compliance_check:
+        zero:  "Contrôle"
+        one:   "Contrôle"
+        other: "Contrôles"
       compliance_check_block:
         zero:  "Groupe de contrôle"
         one:   "Groupe de contrôle"
diff --git a/spec/features/compliance_check_sets_spec.rb b/spec/features/compliance_check_sets_spec.rb
index 6b7d7a4f8..5cace04d4 100644
--- a/spec/features/compliance_check_sets_spec.rb
+++ b/spec/features/compliance_check_sets_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe "ComplianceCheckSets", type: :feature do
       expect_breadcrumb_links "Accueil", "Gestion de l'offre", "Liste des rapports de contrôles"
 
       # Headline
-      expect( page ).to have_content("Jeu de contrôles exécutés #{compliance_check_set.name}")
+      expect( page ).to have_content(I18n.t("compliance_check_sets.executed.title", name: compliance_check_set.name))
 
       # Information Definition List
       expect( page.first('.dl-term') ).to have_content("Nom")