Merge pull request #113 from af83/4823-compliance_check_show

4823 compliance check show

7 files changed, 72 insertions, 22 deletions

diff --git a/config/locales/compliance_check_blocks.en.yml b/config/locales/compliance_check_blocks.en.yml
new file mode 100644
index 000000000..a20fb483e
--- /dev/null
+++ b/config/locales/compliance_check_blocks.en.yml
@@ -0,0 +1,8 @@
+en:
+  activerecord:
+    models:
+      compliance_check_block:
+        zero:  Control blocks
+        one:   Control block
+        other: Control blocks
+
diff --git a/config/locales/compliance_check_blocks.fr.yml b/config/locales/compliance_check_blocks.fr.yml
new file mode 100644
index 000000000..3d385aff6
--- /dev/null
+++ b/config/locales/compliance_check_blocks.fr.yml
@@ -0,0 +1,7 @@
+fr:
+  activerecord:
+    models:
+      compliance_check_block:
+        zero:  "Groupe de contrôle"
+        one:   "Groupe de contrôle"
+        other: "Groupes de contrôles"
diff --git a/config/locales/compliance_check_sets.en.yml b/config/locales/compliance_check_sets.en.yml
index 89c142a49..5aa6f9740 100644
--- a/config/locales/compliance_check_sets.en.yml
+++ b/config/locales/compliance_check_sets.en.yml
@@ -1,9 +1,5 @@
 en:
   compliance_check_sets:
-    index:
-      title: Control reports
-      new: Creating a Control Report
-      edit: Update a Control Report
     actions:
           new: Add a control report
           edit: Edit a control report
@@ -12,12 +8,25 @@ en:
     filters:
           name: Specify a control report name...
           error_period_filter: End date must be greater than or equal to begin date
+    index:
+      title: Compliance control set
+      new: New compliance control set
+      new_control: Creating a Control
+      select_types: Control Type Selection
+      edit: Edit compliance control set
     search_no_results: No control reports match your search
+    executed:
+      title: Executed control report %{name}
   activerecord:
-          attributes:
-            compliance_check_set:
-              ref: réf
-              creation_date: Created at
-              associated_object: Associated object
-              assigned_to: Assigned to
-              compliance_control_set: Compliance control set
+    attributes:
+      compliance_check_set:
+        ref: ref
+        creation_date: Created at
+        associated_object: Associated object
+        assigned_to: Assigned to
+        compliance_control_set: Compliance control set
+        name: Name
+    models:
+      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 8c21f33fd..8ad5af904 100644
--- a/config/locales/compliance_check_sets.fr.yml
+++ b/config/locales/compliance_check_sets.fr.yml
@@ -1,9 +1,5 @@
 fr:
   compliance_check_sets:
-    index:
-      title: Rapports de contrôle
-      new: Création d'un rapport de contrôle
-      edit: Édition d'un rapport de contrôle
     actions:
           new: Ajouter
           edit: Editer
@@ -12,12 +8,22 @@ fr:
     filters:
           name: Indiquez un nom d'un objet associé...
           error_period_filter: La date de fin doit être supérieure ou égale à la date de début0
+    index:
+      title: "Liste des jeux 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}
   activerecord:
-          attributes:
-            compliance_check_set:
-              ref: réf
-              creation_date: Date et heure de création
-              associated_object: Objet associé
-              assigned_to: Affectation
-              compliance_control_set: jeu de contrôle
+    attributes:
+      compliance_check_set:
+        ref: réf
+        creation_date: Date et heure de création
+        associated_object: Objet associé
+        assigned_to: Affectation
+        compliance_control_set: jeu de contrôle
+        name: Nom
+    models:
+      compliance_check_block:
+        zero:  "Groupe de contrôle"
+        one:   "Groupe de contrôle"
+        other: "Groupes de contrôles"
diff --git a/config/locales/compliance_checks.en.yml b/config/locales/compliance_checks.en.yml
index 7f3e317be..177c87852 100644
--- a/config/locales/compliance_checks.en.yml
+++ b/config/locales/compliance_checks.en.yml
@@ -1,2 +1,10 @@
 en:
+  activerecord:
+    attributes:
+      compliance_check:
+        code: Code
   compliance_checks:
+    filters:
+      subclass: Object
+      criticity: Severity
+      name: Name
diff --git a/config/locales/compliance_checks.fr.yml b/config/locales/compliance_checks.fr.yml
index 421574cbd..d11d37003 100644
--- a/config/locales/compliance_checks.fr.yml
+++ b/config/locales/compliance_checks.fr.yml
@@ -1,3 +1,14 @@
 fr:
+  activerecord:
+    attributes:
+      compliance_check:
+        code: Code
+        name: Nom
+        criticity: Criticité
+        comment: Commentaire
   compliance_checks:
+    filters:
+      subclass: Objet
+      criticity: Criticité
+      name: Nom
     
diff --git a/config/routes.rb b/config/routes.rb
index 8221dfe1a..8ea8168bf 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -12,6 +12,7 @@ ChouetteIhm::Application.routes.draw do
       end
     end
     resources :compliance_check_sets, only: [:index, :show] do
+      get :executed, on: :member
       resources :compliance_checks, only: [:show]
     end
   end