Merge pull request #105 from af83/4774-compliance_control_sets-filters

4774 compliance control sets filters

3 files changed, 27 insertions, 4 deletions

diff --git a/config/locales/compliance_controls.en.yml b/config/locales/compliance_controls.en.yml
index 887bc2009..41971d9e9 100644
--- a/config/locales/compliance_controls.en.yml
+++ b/config/locales/compliance_controls.en.yml
@@ -2,6 +2,17 @@ en:
   compliance_controls:
     clone:
       prefix: 'Copy of'
+    filters:
+      criticity: Severity
+      name: "Search by a control's name or code"
+      subclass: Object
+      subclasses:
+        generic: 'Generic'
+        journey_pattern: 'JourneyPattern'
+        line: 'Line'
+        route: 'Route'
+        routing_constraint_zone: 'RoutingConstraint'
+        vehicle_journey: 'VehicleJourney'
     min_max_values: "the minimum (%{min}) is not supposed to be greater than the maximum (%{max})"
     errors:
       incoherent_control_sets: "Impossible to assign a control to a set (id: %{direct_set_name}) differing from the one of its group (id: %{indirect_set_name})"
@@ -179,4 +190,4 @@ en:
         compliance_control_block: "Control Block"
         minimum: "Minimum"
         maximum: "Maximum"
-        target: "Target"
\ No newline at end of file
+        target: "Target"
diff --git a/config/locales/compliance_controls.fr.yml b/config/locales/compliance_controls.fr.yml
index 2feb201bf..3fa83a147 100644
--- a/config/locales/compliance_controls.fr.yml
+++ b/config/locales/compliance_controls.fr.yml
@@ -2,6 +2,17 @@ fr:
   compliance_controls:
     clone:
       prefix: 'Copie de'
+    filters:
+      criticity: Criticité
+      name: "Chercher le nom ou code d'un contrôl"
+      subclass: Objet  
+      subclasses:
+        generic: 'Généric'
+        journey_pattern: 'JourneyPattern'
+        line: 'Ligne'
+        route: 'Itinéraire'
+        routing_constraint_zone: 'ITL'
+        vehicle_journey: 'Course'
     min_max_values: "la valeur de minimum (%{min}) ne doit pas être superieur à la valuer du maximum (%{max})"
     errors:
       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})"
@@ -119,7 +130,7 @@ fr:
   activerecord:
     models:
       compliance_control:
-        one: "controle"
+        one: "contrôle"
         other: "contrôles"
       route_control/zdl_stop_area:
         one: "Deux arrêts d’une même ZDL ne peuvent pas se succéder dans un itinéraire"
@@ -130,7 +141,7 @@ fr:
       route_control/duplicates:
         one: "Détection de double définition d'itinéraire"
       route_control/opposite_route_terminus:
-        one: "Vérification des terminus de l'itinéraire inverse"
+       one: "Vérification des terminus de l'itinéraire inverse"
       route_control/minimum_length:
         one: "Un itinéraire doit contenir au moins 2 arrêts"
       route_control/omnibus_journey_pattern:
@@ -179,4 +190,4 @@ fr:
         compliance_control_block: "Groupe de contrôle"
         minimum: "Minimum"
         maximum: "Maximum"
-        target: "Cible"
\ No newline at end of file
+        target: "Cible"
diff --git a/config/routes.rb b/config/routes.rb
index b105e77d6..27c3c3044 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -74,6 +74,7 @@ ChouetteIhm::Application.routes.draw do
   resources :api_keys, :only => [:edit, :update, :new, :create, :destroy]
 
   resources :compliance_control_sets do
+    get :simple, on: :member
     get :clone, on: :member
     resources :compliance_controls, except: :index do
       get :select_type, on: :collection