Merge branch 'master' of https://github.com/af83/stif-boiv

4 files changed, 56 insertions, 2 deletions

diff --git a/app/views/compliance_control_sets/show.html.slim b/app/views/compliance_control_sets/show.html.slim
index b4a5b2260..d7d4678ba 100644
--- a/app/views/compliance_control_sets/show.html.slim
+++ b/app/views/compliance_control_sets/show.html.slim
@@ -22,4 +22,38 @@
     .row
       .col-lg-6.col-md-6.col-sm-12.col-xs-12
         = definition_list t('metadatas'),
-            ComplianceControlSet.human_attribute_name(:name) => @compliance_control_set.name
\ No newline at end of file
+            ComplianceControlSet.human_attribute_name(:name) => @compliance_control_set.name
+
+  .container-fluid
+    .row
+      .col-lg-12
+        /= render 'filters'
+      .row
+        .col-lg-12
+          .select_table
+            = table_builder_2 @compliance_controls,
+                    [ \
+                TableBuilderHelper::Column.new( \
+                  key: :code, \
+                  attribute: 'code' \
+                ), \
+                TableBuilderHelper::Column.new( \
+                  key: :name, \
+                  attribute: 'name', \
+                  link_to: lambda do |compliance_control| \
+                      compliance_control_set_compliance_control_path(@compliance_control_set, compliance_control) \
+                    end \
+                ), \
+                TableBuilderHelper::Column.new( \
+                  key: :criticity, \
+                  attribute: 'criticity' \
+                ), \
+                TableBuilderHelper::Column.new( \
+                  key: :comment, \
+                  attribute: 'comment' \
+                ), \
+              ],
+              sortable: true,
+              cls: 'table has-filter has-search'
+
+
diff --git a/app/views/compliance_controls/_form.html.slim b/app/views/compliance_controls/_form.html.slim
index 1377ed12b..bb8f68464 100644
--- a/app/views/compliance_controls/_form.html.slim
+++ b/app/views/compliance_controls/_form.html.slim
@@ -2,11 +2,19 @@
   .row
     .col-lg-12
       = f.input :name
-      = f.input :type
+      = f.input :type, as: :select, collection: ComplianceControl.subclasses
       = f.input :code
       = f.input :criticity
       = f.input :comment
 
+      - f.object.class.dynamic_attributes.each do |attribute|
+        = f.input attribute.to_sym
+      end
+
+      = f.simple_fields_for :compliance_control_block do |c|
+        = c.input :name
+        = c.input :transport_mode, as: :select, collection:ComplianceControlBlock.transport_modes
+      end
   .separator
 
   = f.button :submit, t('actions.submit'), class: 'btn btn-default formSubmitr', form: 'compliance_control_form'
diff --git a/app/views/compliance_controls/edit.html.slim b/app/views/compliance_controls/edit.html.slim
index e69de29bb..6824c7e40 100644
--- a/app/views/compliance_controls/edit.html.slim
+++ b/app/views/compliance_controls/edit.html.slim
@@ -0,0 +1,9 @@
+= pageheader 'compliance-control',
+        t('compliance_control.index.edit')
+
+
+.page_content
+  .container-fluid
+    .row
+      .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-10.col-sm-offset-1
+        = render 'form'
diff --git a/app/views/compliance_controls/show.html.slim b/app/views/compliance_controls/show.html.slim
index e69de29bb..a665f1ab1 100644
--- a/app/views/compliance_controls/show.html.slim
+++ b/app/views/compliance_controls/show.html.slim
@@ -0,0 +1,3 @@
+= @compliance_control.inspect
+br
+= @compliance_control.compliance_control_block.inspect