Refs #4788 Add predicate and perequisite for ComplianceControl

6 files changed, 14 insertions, 0 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| \