Refs #4788 Add predicate and perequisite for ComplianceControl

8 files changed, 29 insertions, 1 deletions

diff --git a/app/models/compliance_control.rb b/app/models/compliance_control.rb
index 49fb6513f..146c4e838 100644
--- a/app/models/compliance_control.rb
+++ b/app/models/compliance_control.rb
@@ -3,6 +3,8 @@ class ComplianceControl < ActiveRecord::Base
   class << self
     def criticities; %i(warning error) end
     def default_code; "" end
+    def prerequisite; I18n.t('compliance_controls.metas.no_prerequisite'); end
+    def predicate; I18n.t("compliance_controls.#{self.name.underscore}.description") end
     def dynamic_attributes
       hstore_metadata_for_control_attributes.keys
     end
diff --git a/app/models/line_control/route.rb b/app/models/line_control/route.rb
index aabd2f347..b4b2bd9d8 100644
--- a/app/models/line_control/route.rb
+++ b/app/models/line_control/route.rb
@@ -2,5 +2,7 @@ module LineControl
   class Route < ComplianceControl
 
     def self.default_code; "3-Line-1" end
+
+    def self.prerequisite; I18n.t("compliance_controls.#{self.name.underscore}.prerequisite") end
   end
 end
diff --git a/app/models/route_control/opposite_route.rb b/app/models/route_control/opposite_route.rb
index 3921bb0a2..d5616ca6f 100644
--- a/app/models/route_control/opposite_route.rb
+++ b/app/models/route_control/opposite_route.rb
@@ -3,5 +3,7 @@ module RouteControl
     enumerize :criticity, in: %i(error), scope: true, default: :error
 
     def self.default_code; "3-Route-2" end
+
+    def self.prerequisite; I18n.t("compliance_controls.#{self.name.underscore}.prerequisite") end
   end
 end
diff --git a/app/models/route_control/opposite_route_terminus.rb b/app/models/route_control/opposite_route_terminus.rb
index e12690d48..24c557734 100644
--- a/app/models/route_control/opposite_route_terminus.rb
+++ b/app/models/route_control/opposite_route_terminus.rb
@@ -2,5 +2,7 @@ module RouteControl
   class OppositeRouteTerminus < ComplianceControl
 
     def self.default_code; "3-Route-5" end
+
+    def self.prerequisite; I18n.t("compliance_controls.#{self.name.underscore}.prerequisite") end     
   end
 end
diff --git a/app/views/compliance_controls/new.html.slim b/app/views/compliance_controls/new.html.slim
index fe32e14ee..bd2db230b 100644
--- a/app/views/compliance_controls/new.html.slim
+++ b/app/views/compliance_controls/new.html.slim
@@ -11,3 +11,7 @@
     .row
       .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-10.col-sm-offset-1
         = render 'form'
+
+        = definition_list t('metadatas'),
+          I18n.t('activerecord.attributes.compliance_control.predicate') => @compliance_control.class.predicate,
+          I18n.t('activerecord.attributes.compliance_control.prerequisite') => @compliance_control.class.prerequisite
\ No newline at end of file
diff --git a/app/views/compliance_controls/show.html.slim b/app/views/compliance_controls/show.html.slim
index 44d52a9f1..bfd0d459b 100644
--- a/app/views/compliance_controls/show.html.slim
+++ b/app/views/compliance_controls/show.html.slim
@@ -17,6 +17,8 @@
                 ComplianceControl.human_attribute_name(:code) => @compliance_control.code,
                 ComplianceControl.human_attribute_name(:criticity) => @compliance_control.criticity,
                 ComplianceControl.human_attribute_name(:comment) => @compliance_control.comment,
+                I18n.t('activerecord.attributes.compliance_control.predicate') => @compliance_control.class.predicate,
+                I18n.t('activerecord.attributes.compliance_control.prerequisite') => @compliance_control.class.prerequisite,
               }.merge( \
                 {}.tap do |hash| \
                   @compliance_control.class.dynamic_attributes.each do |attribute| \
diff --git a/config/locales/compliance_controls.en.yml b/config/locales/compliance_controls.en.yml
index 41971d9e9..618ecfb08 100644
--- a/config/locales/compliance_controls.en.yml
+++ b/config/locales/compliance_controls.en.yml
@@ -25,6 +25,8 @@ en:
       title: "Add a new compliance control"
     edit:
       title: "Update compliance control"
+    metas:
+      no_prerequisite: "None"
     route_control/zdl_stop_area:
       messages:
         3_route_1: "The route with %{source_objectid} objectid connect the stop points %{target_0_label} (%{target_0_objectid}) and %{target_1_label} (%{target_1_objectid}) which belong to the same ZDL"
@@ -36,6 +38,7 @@ en:
         "If the route has an opposite route, it must :
           - reference the opposite route
           - have an opposite route in relation with the tested route"
+      prerequisite: "Présence d'itinéraire référençant un itinéraire inverse"
     route_control/journey_pattern:
       messages:
         3_route_3: "The route with %{source_objectid} objectid doesn't have any journey pattern"
@@ -48,6 +51,7 @@ en:
       messages:
         3_route_5: "The route with %{source_objectid} objectid has a first stop from the %{target_0_label} ZDL whereas its oppoite route's last stop is from the ZDL %{target_1_label}"
       description: "Deux itinéraires en aller/retour doivent desservir les mêmes terminus"
+      prerequisite: "Présence d'itinéraire référençant un itinéraire inverse"
     route_control/minimum_length:
       messages:
         3_route_6: "The route with %{source_objectid} objectid does not connect enough stop points (required 2 stop points)"
@@ -110,6 +114,7 @@ en:
       messages:
         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: Lign has multiple routes
     generic_attribute_control/pattern:
       messages:
         3_generic_1: "%{source_objectid} : the %{source_label} attribute value (%{error_value}) does not respect the following pattern : %{reference_value}"
@@ -191,3 +196,5 @@ en:
         minimum: "Minimum"
         maximum: "Maximum"
         target: "Target"
+        prerequisite: "Prerequisite"
+        predicate: "Predicate"
\ No newline at end of file
diff --git a/config/locales/compliance_controls.fr.yml b/config/locales/compliance_controls.fr.yml
index eeae46ebb..55efc78ea 100644
--- a/config/locales/compliance_controls.fr.yml
+++ b/config/locales/compliance_controls.fr.yml
@@ -25,6 +25,8 @@ fr:
       title: "Editer un contrôle"
     select_type:
       title: "Sélectionner un type de contrôle"
+    metas:
+      no_prerequisite: "Aucun"
     route_control/zdl_stop_area:
       messages:
         3_route_1: "L'itinéraire %{source_objectid} dessert successivement les arrêts %{target_0_label} (%{target_0_objectid}) et %{target_1_label} (%{target_1_objectid}) de la même zone de lieu"
@@ -36,6 +38,7 @@ fr:
         "Si l'itinéraire référence un itinéraire inverse, celui-ci doit :
           - référencer l'itinéraire inverse
           - avoir un sens opposé à l'itinéraire testé"
+      prerequisite: "Présence d'itinéraire référençant un itinéraire inverse"
     route_control/journey_pattern:
       messages:
         3_route_3: "L'itinéraire %{source_objectid} n'a pas de mission"
@@ -48,6 +51,7 @@ fr:
       messages:
         3_route_5: "L'itinéraire %{source_objectid} dessert au départ un arrêt de la ZDL %{target_0_label} alors que l'itinéraire inverse dessert à l'arrivée un arrêt de la ZDL %{target_1_label}"
       description: "Deux itinéraires en aller/retour doivent desservir les mêmes terminus"
+      prerequisite: "Présence d'itinéraire référençant un itinéraire inverse"
     route_control/minimum_length:
       messages:
         3_route_6: "L'itinéraire %{source_objectid} ne dessert pas assez d'arrêts (minimum 2 requis)"
@@ -110,6 +114,7 @@ fr:
       messages:
         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
     generic_attribute_control/pattern:
       messages:
         3_generic_1: "%{source_objectid} : l'attribut % à une valeur %{error_value} qui ne respecte pas le motif %{reference_value}"
@@ -149,7 +154,7 @@ fr:
       route_control/unactivated_stop_points:
         one: "Itinéraire & arrêt désactivé"
       route_control/stop_points_in_journey_pattern:
-        one: "Les arrêts de l'itinéraire doivent être desservis par au moins une mission"
+        one: "Utilisation des arrêts par les missions"
       journey_pattern_control/duplicates:
         one: "Doublon de missions dans une ligne"
       journey_pattern_control/vehicle_journey:
@@ -191,3 +196,5 @@ fr:
         minimum: "Minimum"
         maximum: "Maximum"
         target: "Cible"
+        prerequisite: "Prérequis"
+        predicate: "Prédicat"
\ No newline at end of file