Merge branch 'master' into 4941-refactoring_object_id

23 files changed, 73 insertions, 195 deletions

diff --git a/config/breadcrumbs.rb b/config/breadcrumbs.rb
index 0cabf9c6b..4ef16059f 100644
--- a/config/breadcrumbs.rb
+++ b/config/breadcrumbs.rb
@@ -3,7 +3,7 @@ crumb :root do
 end
 
 crumb :workbench do |workbench|
-  link breadcrumb_name(workbench), workbench_path(workbench)
+  link workbench.name, workbench_path(workbench)
 end
 
 crumb :referential do |referential|
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index 1c951317a..87bca0b45 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -24,7 +24,6 @@ Apartment.configure do |config|
     'Organisation',
     'User',
     'Api::V1::ApiKey',
-    'RuleParameterSet',
     'StopAreaReferential',
     'StopAreaReferentialMembership',
     'StopAreaReferentialSync',
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/locales/import_tasks.en.yml b/config/locales/import_tasks.en.yml
index ad633e872..34f7e6998 100644
--- a/config/locales/import_tasks.en.yml
+++ b/config/locales/import_tasks.en.yml
@@ -30,7 +30,6 @@ en:
         no_save: "No save"
         resources: "File to import"
         references_type: "Data to be imported"
-        rule_parameter_set_id: "Rule parameter set for compliance check"
         object_id_prefix: "Neptune Id prefix"
         max_distance_for_commercial: "Max distance for commercial stop"
         max_distance_for_connection_link: "Max distance for connection link"
diff --git a/config/locales/import_tasks.fr.yml b/config/locales/import_tasks.fr.yml
index 13e796520..002ca03cb 100644
--- a/config/locales/import_tasks.fr.yml
+++ b/config/locales/import_tasks.fr.yml
@@ -30,7 +30,6 @@ fr:
         no_save: "Pas de sauvegarde"
         resources: "Fichier à importer"
         references_type: "Données à importer"
-        rule_parameter_set_id: "Jeu de paramètres pour validation"
         object_id_prefix: "Préfixe d'identifiants"
         max_distance_for_commercial: "Distance max pour créer les zones"
         max_distance_for_connection_link: "Distance max pour créer les correspondances"
diff --git a/config/locales/imports.en.yml b/config/locales/imports.en.yml
index 10434dd19..97574007c 100644
--- a/config/locales/imports.en.yml
+++ b/config/locales/imports.en.yml
@@ -19,7 +19,6 @@ en:
     show:
       report: "Report"
       imported_file: "Original file"
-      rule_parameter_set: "Rule parameter set"
       compliance_check: "Validation report"
       compliance_check_of: "Validation of import: "
       import_of_validation: "Import of the validation"
@@ -69,7 +68,6 @@ en:
         creator: "Creator"
         references_type: "Data to be imported"
         no_save: "No save"
-        rule_parameter_set_id: "Rule parameter set for compliance check"
         object_id_prefix: "Neptune Id prefix"
         max_distance_for_commercial: "Max distance for commercial stop"
         max_distance_for_connection_link: "Max distance for connection link"
diff --git a/config/locales/imports.fr.yml b/config/locales/imports.fr.yml
index 099488a6b..59107cccb 100644
--- a/config/locales/imports.fr.yml
+++ b/config/locales/imports.fr.yml
@@ -19,7 +19,6 @@ fr:
     show:
       report: "Rapport"
       imported_file: "Fichier source"
-      rule_parameter_set: "Jeu de paramètres"
       compliance_check: "Test de conformité"
       compliance_check_of: "Validation de l'import : "
       import_of_validation: "L'import de la validation"
@@ -69,7 +68,6 @@ fr:
         creator: "Opérateur"
         no_save: "Pas de sauvegarde"
         references_type: "Données à importer"
-        rule_parameter_set_id: "Jeu de paramètres pour validation"
         object_id_prefix: "Préfixe d'identifiants"
         max_distance_for_commercial: "Distance max pour créer les zones"
         max_distance_for_connection_link: "Distance max pour créer les correspondances"
diff --git a/config/locales/organisations.en.yml b/config/locales/organisations.en.yml
index a64920daf..cade312e1 100644
--- a/config/locales/organisations.en.yml
+++ b/config/locales/organisations.en.yml
@@ -8,7 +8,6 @@ en:
       key_not_registered: "No key registered"
     show:
       users: "Users"
-      rule_parameter_sets: "Rule parameter sets"
   activerecord:
     models:
       organisation:
diff --git a/config/locales/organisations.fr.yml b/config/locales/organisations.fr.yml
index 50cb9f3be..756615285 100644
--- a/config/locales/organisations.fr.yml
+++ b/config/locales/organisations.fr.yml
@@ -8,7 +8,6 @@ fr:
       key_not_registered: "Pas de clé"
     show:
       users: "Utilisateurs"
-      rule_parameter_sets: "Jeux de paramètres"
   activerecord:
     models:
       organisation:
diff --git a/config/locales/referentials.en.yml b/config/locales/referentials.en.yml
index a2c6fcf59..8420e9539 100644
--- a/config/locales/referentials.en.yml
+++ b/config/locales/referentials.en.yml
@@ -86,7 +86,6 @@ en:
         imports: "Imports"
         exports: "Exports"
         compliance_checks: "Validations"
-        rule_parameter_sets: "Rule parameters sets"
         data_format_restrictions: "Data format constraint"
         data_format: "Favorite format for export"
         timebands: "Time bands"
diff --git a/config/locales/referentials.fr.yml b/config/locales/referentials.fr.yml
index e132c959d..ec7ed776d 100644
--- a/config/locales/referentials.fr.yml
+++ b/config/locales/referentials.fr.yml
@@ -86,7 +86,6 @@ fr:
         imports: "Imports"
         exports: "Exports"
         compliance_checks: "Validations"
-        rule_parameter_sets: "Jeux de paramètres"
         data_format_restrictions: "Format d'export privilégié"
         data_format: "Format d'export privilégié"
         timebands: "Créneaux horaires"
diff --git a/config/locales/rule_parameter_sets.en.yml b/config/locales/rule_parameter_sets.en.yml
deleted file mode 100644
index 814e97f1d..000000000
--- a/config/locales/rule_parameter_sets.en.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-en:
-  rule_parameter_sets:
-    actions:
-      new: "Add a new parameter set"
-      edit: "Edit this parameter set"
-      index: "Rule parameter sets"
-      destroy: "Remove this rule parameter set"
-      destroy_confirm: "Are you sure you want destroy this rule parameter set ?"
-    new:
-      title: "Add a new parameter set"
-    destroy:
-      last_rps_protected: "Delete refused. Last rule parameter set in current referential can't be destroyed."
-    edit:
-      title: "Update parameter set %{rule_parameter_set}"
-    form:
-      add_mode_parameter_set: "Add mode specific parameter set"
-    show:
-      title: "Parameter Set %{rule_parameter_set}"
-      max_distance: "Maximum distance between "
-      min_distance: "Minimum distance between "
-      walk_speed: "Maximum walk speed for travellers"
-      inter_stop_area_distance_min: "2 stop areas having different parent"
-      parent_stop_area_distance_max: "a stop area and its own parent"
-      inter_access_point_distance_min: "2 access with different names on a same stop area"
-      inter_connection_link_distance_max: "stop areas in a connection link"
-      walk_default_speed_max: "a regular one"
-      walk_occasional_traveller_speed_max: "an occasional one"
-      walk_frequent_traveller_speed_max: "a frequent one"
-      walk_mobility_restricted_traveller_speed_max: "a mobility restricted one"
-      inter_access_link_distance_max: "an access point and a linked stop area"
-      inter_stop_duration_max: "Maximum duration between the moment when a vehicle is arriving at a stop and the moment when the vehicle is leaving"
-      facility_stop_area_distance_max: "a stop area and a facility"
-      rule_parameter_by_mode: "Parameters by mode"
-      modes_allowed: " (only for allowed ones)"
-    index:
-      title: "Parameter sets"
-    labels:
-      columns_restrictions: "Check model objects atributes"
-      attribute: "attribute"
-      free_char: "free"
-      num_char: "number only"
-      alpha_char: "character only"
-      lower_char: "lowercase only"
-      upper_char: "uppercase only"
-  activerecord:
-    models:
-      rule_parameter_set:  "Parameter Set for Conformity Rules"
-    attributes:
-      rule_parameter_set:
-        name: "Name"
-        inter_stop_area_distance_min: "Minimum distance between 2 stop areas having different parent"
-        parent_stop_area_distance_max: "Maximum distance between a stop area and its own parent"
-        stop_areas_area: "Geographic stop area envelop"
-        inter_access_point_distance_min: "Minimum distance between 2 access having different name for a commun stop area"
-        inter_connection_link_distance_max: "Maximum distance between stop area departure and stop area arrival in a connection link"
-        walk_default_speed_max: "Maximum walk speed for a regular traveller"
-        walk_occasional_traveller_speed_max: "Maximum walk speed for an occasional traveller"
-        walk_frequent_traveller_speed_max: "Maximum walk speed for a frequent traveller"
-        walk_mobility_restricted_traveller_speed_max: "Maximum walk speed for a mobility restricted traveller"
-        inter_access_link_distance_max: "Access link maximum distance"
-        inter_stop_duration_max: "Maximum duration for a stopping time"
-        facility_stop_area_distance_max: "Maximum distance between a stop area and a facility"
-        inter_stop_area_distance_min: "Maximum distance between 2 stop areas"
-        inter_stop_area_distance_max: "Maximum distance between 2 stop areas"
-        speed_min: "Minimum speed"
-        speed_max: "Maximum speed"
-        inter_stop_duration_variation_max: "Maximum duration gap between 2 vehicle journeys and between 2 following stops"
-        check_lines_in_groups: "check if each line belongs scrictly to one group of line"
-        check_line_routes:  "check if each line have 1 route or 2 routes coupled"
-        check_stop_parent:  "check if all physical stop areas are owned by a commercial stop point"
-        check_connection_link_on_physical: "check if connection links connect only physical stops"
-        check_allowed_transport_modes: "Check transport modes"
-        allowed_transport: "Allowed"
-        attribute: "attribute"
-        unique: "uniqness"
-        string_type: "allowed characters"
-        min_size: "minimal size or value"
-        max_size: "maximal  size or value"
diff --git a/config/locales/rule_parameter_sets.fr.yml b/config/locales/rule_parameter_sets.fr.yml
deleted file mode 100644
index fd5d75938..000000000
--- a/config/locales/rule_parameter_sets.fr.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-fr:
-  rule_parameter_sets:
-    actions:
-      new: "Ajouter un jeu de paramètres"
-      edit: "Editer ce jeu de paramètres"
-      index: "Jeux de paramètres"
-      destroy: "Supprimer ce jeu de paramètres"
-      destroy_confirm: "Etes vous sûr de supprimer ce jeu de paramètres ?"
-    new:
-      title: "Ajouter un jeu de paramètres"
-    form:
-      add_mode_parameter_set: "Ajouter les paramètres spécifiques à un mode"
-    edit:
-      title: "Editer le jeu de paramètres %{rule_parameter_set}"
-    destroy:
-      last_rps_protected: "Suppresion impossible. L'espace de données doit compter au minimum un jeu de paramètres."
-    show:
-      title: "Jeu de paramètres %{rule_parameter_set}"
-      max_distance: "Distance maximum entre : "
-      min_distance: "Distance minimum entre : "
-      walk_speed: "Vitesse de marche maximum d'un voyageur : "
-      inter_stop_area_distance_min: "2 arrêts n'ayant pas le même parent"
-      parent_stop_area_distance_max: "un arrêt et son parent"
-      inter_access_point_distance_min: "2 accès de noms différents pour un même arrêt"
-      inter_connection_link_distance_max: "les arrêts en correspondance"
-      walk_default_speed_max: "ordinaire"
-      walk_occasional_traveller_speed_max: "occasionnel"
-      walk_frequent_traveller_speed_max: "habituel"
-      walk_mobility_restricted_traveller_speed_max: "à mobilité réduite"
-      inter_access_link_distance_max: "liaison accès - arrêt"
-      facility_stop_area_distance_max: "un arrêt et un équipement"
-      inter_stop_duration_max: "Durée maximum de stationnement à un arrêt"
-      rule_parameter_by_mode: "Jeu de paramètres pour un mode de transport"
-      modes_allowed: " (uniquement pour les modes autorisés)"
-    index:
-      title: "Jeux de paramètres"
-    labels:
-      columns_restrictions: "Contôles sur les attributs des objets du modèle"
-      attribute: "attribut"
-      free_char: "libre"
-      num_char: "numérique"
-      alpha_char: "alphabétique"
-      lower_char: "minuscule"
-      upper_char: "majuscule"
-  activerecord:
-    models:
-      rule_parameter_set: "Jeu de paramètres pour le contrôle de qualité des données"
-    attributes:
-      rule_parameter_set:
-        name: "Nom"
-        inter_stop_area_distance_min: "Distance minimum entre 2 arrêts n'ayant pas le même parent"
-        parent_stop_area_distance_max: "Distance maximum entre un arrêt et son parent"
-        stop_areas_area: "Délimitation géographique des arrêts"
-        inter_access_point_distance_min: "Distance minimum entre 2 accès de noms différents pour un même arrêt"
-        inter_connection_link_distance_max: "Distance maximum entre les arrêts en correspondance"
-        walk_default_speed_max: "Vitesse de marche maximum pour un voyageur ordinaire"
-        walk_occasional_traveller_speed_max: "Vitesse de marche maximum pour un voyageur occasionnel"
-        walk_frequent_traveller_speed_max: "Vitesse de marche maximum pour un voyageur habituel"
-        walk_mobility_restricted_traveller_speed_max: "Vitesse de marche maximum pour un voyageur à mobilité réduite"
-        inter_access_link_distance_max: "Distance maximum d'un liaison accès - arrêt"
-        inter_stop_duration_max: "Durée maximum entre les horaires d'arrivée et de départ à un arrêt"
-        facility_stop_area_distance_max: "Distance maximum entre un arrêt et un équipement"
-        inter_stop_area_distance_min: "Distance minimum entre 2 arrêts"
-        inter_stop_area_distance_max: "Distance maximum entre 2 arrêts"
-        speed_min: "Vitesse minimum"
-        speed_max: "Vitesse maximum"
-        inter_stop_duration_variation_max: "Ecart maximum de durée entre 2 arrêts successifs pour les différentes courses"
-        check_lines_in_groups: "Contrôler que chaque ligne appartient à un et un seul groupe de lignes"
-        check_line_routes:  "Contrôler que chaque ligne a une séquence d'arrêt ou un couple A/R de séquences d'arrêts"
-        check_stop_parent:  "Contrôler que chaque arrêt physique est rattaché à un arrêt commercial"
-        check_connection_link_on_physical: "Contrôler que les correspondances ne relient que des arrêts physiques"
-        check_allowed_transport_modes: "Contrôler les modes de transport des lignes et des courses"
-        allowed_transport: "Autorisé"
-        attribute: "attribut"
-        unique: "unicité"
-        string_type: "caractères autorisés"
-        min_size: "taille ou valeur minimale"
-        max_size: "taille ou valeur maximale"
diff --git a/config/locales/validation_tasks.en.yml b/config/locales/validation_tasks.en.yml
index 1b142e992..ebccae383 100644
--- a/config/locales/validation_tasks.en.yml
+++ b/config/locales/validation_tasks.en.yml
@@ -96,7 +96,6 @@ en:
         status: "Status"
         references_type: "subset"
         no_save: "No save"
-        rule_parameter_set_id: "Rule parameter set for compliance check"
         object_id_prefix: "Neptune Id prefix"
         max_distance_for_commercial: "Max distance for commercial stop"
         max_distance_for_connection_link: "Max distance for connection link"
diff --git a/config/locales/validation_tasks.fr.yml b/config/locales/validation_tasks.fr.yml
index adbd9c99f..286807edd 100644
--- a/config/locales/validation_tasks.fr.yml
+++ b/config/locales/validation_tasks.fr.yml
@@ -96,7 +96,6 @@ fr:
         status: "Status"
         no_save: "Pas de sauvegarde"
         references_type: "Sous ensemble"
-        rule_parameter_set_id: "Jeu de paramètres pour validation"
         object_id_prefix: "Préfixe d'identifiants"
         max_distance_for_commercial: "Distance max pour créer les zones"
         max_distance_for_connection_link: "Distance max pour créer les correspondances"
diff --git a/config/locales/validations.en.yml b/config/locales/validations.en.yml
index 5bac62ff3..aa63c2551 100644
--- a/config/locales/validations.en.yml
+++ b/config/locales/validations.en.yml
@@ -101,7 +101,6 @@ en:
         status: "Status"
         references_type: "subset"
         no_save: "No save"
-        rule_parameter_set_id: "Rule parameter set for compliance check"
         object_id_prefix: "Neptune Id prefix"
         max_distance_for_commercial: "Max distance for commercial stop"
         max_distance_for_connection_link: "Max distance for connection link"
diff --git a/config/locales/validations.fr.yml b/config/locales/validations.fr.yml
index dc459bee0..d1c1355db 100644
--- a/config/locales/validations.fr.yml
+++ b/config/locales/validations.fr.yml
@@ -101,7 +101,6 @@ fr:
         status: "Status"
         no_save: "Pas de sauvegarde"
         references_type: "Sous ensemble"
-        rule_parameter_set_id: "Jeu de paramètres pour validation"
         object_id_prefix: "Préfixe d'identifiants"
         max_distance_for_commercial: "Distance max pour créer les zones"
         max_distance_for_connection_link: "Distance max pour créer les correspondances"
diff --git a/config/routes.rb b/config/routes.rb
index 27db66c2c..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
@@ -71,7 +72,6 @@ ChouetteIhm::Application.routes.draw do
 
   resource :organisation, :only => [:show, :edit, :update] do
     resources :users
-    resources :rule_parameter_sets
   end
 
   resources :api_keys, :only => [:edit, :update, :new, :create, :destroy]