Add compliance_control for lines scope in validation Refs #4982

7 files changed, 28 insertions, 3 deletions

diff --git a/app/controllers/compliance_controls_controller.rb b/app/controllers/compliance_controls_controller.rb
index 73dc18f59..7df922d01 100644
--- a/app/controllers/compliance_controls_controller.rb
+++ b/app/controllers/compliance_controls_controller.rb
@@ -5,7 +5,7 @@ class ComplianceControlsController < ChouetteController
   actions :all, :except => [:index]
 
   def select_type
-    @sti_subclasses = ComplianceControl.subclasses
+    @sti_subclasses = ComplianceControl.subclasses.sort_by {|compliance_control| compliance_control.default_code}
   end
 
   def show
diff --git a/app/models/compliance_control.rb b/app/models/compliance_control.rb
index 537343005..1cc06f927 100644
--- a/app/models/compliance_control.rb
+++ b/app/models/compliance_control.rb
@@ -76,6 +76,7 @@ require_dependency 'generic_attribute_control/uniqueness'
 require_dependency 'journey_pattern_control/duplicates'
 require_dependency 'journey_pattern_control/vehicle_journey'
 require_dependency 'line_control/route'
+require_dependency 'line_control/lines_scope'
 require_dependency 'route_control/duplicates'
 require_dependency 'route_control/journey_pattern'
 require_dependency 'route_control/minimum_length'
diff --git a/app/models/line_control/lines_scope.rb b/app/models/line_control/lines_scope.rb
new file mode 100644
index 000000000..4210a10dd
--- /dev/null
+++ b/app/models/line_control/lines_scope.rb
@@ -0,0 +1,8 @@
+module LineControl
+  class LinesScope < ComplianceControl
+
+    def self.default_code; "3-Line-2" end
+
+    def prerequisite; I18n.t("compliance_controls.#{self.class.name.underscore}.prerequisite") end
+  end
+end
diff --git a/config/locales/compliance_check_messages.en.yml b/config/locales/compliance_check_messages.en.yml
index 216a363a3..88841f308 100644
--- a/config/locales/compliance_check_messages.en.yml
+++ b/config/locales/compliance_check_messages.en.yml
@@ -22,10 +22,11 @@ en:
     3_routingconstraint_2: "The Routing Constraint Zone %{source_objectid} covers all the stop points of its related route : %{target_0_objectid}."
     3_routingconstraint_3: "The Routing Constraint Zone %{source_objectid} has less than 2 stop points"
     3_line_1: "On line :%{source_label} (%{source_objectid}), no route has an opposite route"
+    3_line_2: "The line %{source_label} (%{source_objectid}) is not in the lines scope of the organization %{reference_value}"
     3_generic_1: "%{source_objectid} : the %{source_attribute} attribute value (%{error_value}) does not respect the following pattern : %{reference_value}"
     3_generic_2_1: "%{source_objectid}  : the %{source_attribute} attributes's value (%{error_value}) is greater than the authorized maximum value : %{reference_value}"
     3_generic_2_2: "%{source_objectid}  : the %{source_attribute} attributes's value (%{error_value}) is smaller than the authorized minimum value %{reference_value}"
     3_generic_3: "%{source_objectid}  : the %{source_attribute} attribute (%{error_value}) has a value shared with : %{target_0_objectid}"
     3_shape_1: "Tracé %{source_objectid} : le tracé passe trop loin de l'arrêt %{target_0_label} (%{target_0_objectid}) : %{error_value} > %{reference_value}"
     3_shape_2: "Tracé %{source_objectid} : le tracé n'est pas défini entre les arrêts %{target_0_label} (%{target_0_objectid}) et %{target_1_label} (%{target_1_objectid})"
-    3_shape_3: "Le tracé de l'itinéraire %{source_objectid} est en écart avec la voirie sur %{error_value} sections"
\ No newline at end of file
+    3_shape_3: "Le tracé de l'itinéraire %{source_objectid} est en écart avec la voirie sur %{error_value} sections"
diff --git a/config/locales/compliance_check_messages.fr.yml b/config/locales/compliance_check_messages.fr.yml
index db127d236..167ef411a 100644
--- a/config/locales/compliance_check_messages.fr.yml
+++ b/config/locales/compliance_check_messages.fr.yml
@@ -22,10 +22,11 @@ fr:
     3_routingconstraint_2: "L'ITL %{source_objectid} couvre tous les arrêts de l'itinéraire %{target_0_objectid}."
     3_routingconstraint_3: "L'ITL %{source_objectid} n'a pas suffisament d'arrêts (minimum 2 arrêts requis)"
     3_line_1: "Sur la ligne %{source_label} (%{source_objectid}), aucun itinéraire n'a d'itinéraire inverse"
+    3_line_2: "La ligne %{source_label} (%{source_objectid}) ne fait pas partie du périmètre de lignes de l'organisation %{reference_value}"
     3_generic_1: "%{source_objectid} : l'attribut %{source_attribute} a une valeur %{error_value} qui ne respecte pas le motif %{reference_value}"
     3_generic_2_1: "%{source_objectid} : l'attribut %{source_attribute} a une valeur %{error_value} supérieure à la valeur maximale autorisée %{reference_value}"
     3_generic_2_2: "%{source_objectid} : l'attribut %{source_attribute} a une valeur %{error_value} inférieure à la valeur minimale autorisée %{reference_value}"
     3_generic_3: "%{source_objectid} : l'attribut %{source_attribute} a une valeur %{error_value} partagée avec %{target_0_objectid}"
     3_shape_1: "Tracé %{source_objectid} : le tracé passe trop loin de l'arrêt %{target_0_label} (%{target_0_objectid}) : %{error_value} > %{reference_value}"
     3_shape_2: "Tracé %{source_objectid} : le tracé n'est pas défini entre les arrêts %{target_0_label} (%{target_0_objectid}) et %{target_1_label} (%{target_1_objectid})"
-    3_shape_3: "Le tracé de l'itinéraire %{source_objectid} est en écart avec la voirie sur %{error_value} sections"
\ No newline at end of file
+    3_shape_3: "Le tracé de l'itinéraire %{source_objectid} est en écart avec la voirie sur %{error_value} sections"
diff --git a/config/locales/compliance_controls.en.yml b/config/locales/compliance_controls.en.yml
index d8dc44ecc..18069f2f7 100644
--- a/config/locales/compliance_controls.en.yml
+++ b/config/locales/compliance_controls.en.yml
@@ -142,6 +142,11 @@ en:
         3_line_1: "On line :%{source_label} (%{source_objectid}), no route has an opposite route"
       description: "The routes of a line must have an opposite route"
       prerequisite: Line has multiple routes
+    line_control/lines_scope:
+      messages:
+        3_line_2: "The line %{source_label} (%{source_objectid}) is not in the lines scope of the organization %{reference_value}"
+      description: "The line must be included in the lines scope of the organization"
+      prerequisite: "None"
     generic_attribute_control/pattern:
       messages:
         3_generic_1: "%{source_objectid} : the %{source_attribute} attribute value (%{error_value}) does not respect the following pattern : %{reference_value}"
@@ -209,6 +214,8 @@ en:
         one: "Unactivated stop points"
       line_control/route:
         one: "The routes of a line must have an opposite route"
+      line_control/lines_scope:
+        one: "Lines must be included in the lines scope of the organization"
       generic_attribute_control/pattern:
         one: "Attribute pattern of an object in a line"
       generic_attribute_control/min_max:
diff --git a/config/locales/compliance_controls.fr.yml b/config/locales/compliance_controls.fr.yml
index 78b92451f..7dc6eeeb3 100644
--- a/config/locales/compliance_controls.fr.yml
+++ b/config/locales/compliance_controls.fr.yml
@@ -139,6 +139,11 @@ fr:
         3_line_1: "Sur la ligne %{source_label} (%{source_objectid}), aucun itinéraire n'a d'itinéraire inverse"
       description: "Les itinéraires d'une ligne doivent être associés en aller/retour"
       prerequisite: Ligne disposant de plusieurs itinéraires
+    line_control/lines_scope:
+      messages:
+        3_line_2: "La ligne %{source_label} (%{source_objectid}) ne fait pas partie du périmètre de lignes de l'organisation %{reference_value}"
+      description: "Les lignes doivent appartenir au périmètre de lignes de l'organisation"
+      prerequisite: "Aucun"
     generic_attribute_control/pattern:
       messages:
         3_generic_1: "%{source_objectid} : l'attribut %{source_attribute} a une valeur %{error_value} qui ne respecte pas le motif %{reference_value}"
@@ -206,6 +211,8 @@ fr:
         one: "ITL & arret désactivé"
       line_control/route:
         one: "Appariement des itinéraires"
+      line_control/lines_scope:
+        one: "Les lignes doivent appartenir au périmètre de lignes de l'organisation"
       generic_attribute_control/pattern:
         one: "Contrôle du contenu selon un pattern"
       generic_attribute_control/min_max: