Make a hack to display compliance_controls and block. Must be fixed in a future release Refs #4584

2 files changed, 77 insertions, 46 deletions

diff --git a/app/controllers/compliance_control_sets_controller.rb b/app/controllers/compliance_control_sets_controller.rb
index 306b2eac7..e3304c0b8 100644
--- a/app/controllers/compliance_control_sets_controller.rb
+++ b/app/controllers/compliance_control_sets_controller.rb
@@ -17,12 +17,19 @@ class ComplianceControlSetsController < BreadcrumbController
     show! do |format|
       format.html {
         @compliance_control_set = @compliance_control_set.decorate
-        @compliance_controls = decorate_compliance_controls(@compliance_control_set.compliance_controls)
+        @compliance_controls_without_block = decorate_compliance_controls(@compliance_control_set.compliance_controls.where(compliance_control_block_id: nil))
       }
     end
   end
 
+  protected
+
+  # def begin_of_association_chain
+  #   current_organisation
+  # end
+
   private
+
   def decorate_compliance_control_sets(compliance_control_sets)
     ModelDecorator.decorate(
       compliance_control_sets,
@@ -30,13 +37,6 @@ class ComplianceControlSetsController < BreadcrumbController
     )
   end
 
-  protected
-
-  # def begin_of_association_chain
-  #   current_organisation
-  # end
-
-  private
   def decorate_compliance_controls(compliance_controls)
     ModelDecorator.decorate(
       compliance_controls,
diff --git a/app/views/compliance_control_sets/show.html.slim b/app/views/compliance_control_sets/show.html.slim
index 0de6fb359..4443e8005 100644
--- a/app/views/compliance_control_sets/show.html.slim
+++ b/app/views/compliance_control_sets/show.html.slim
@@ -27,42 +27,73 @@
   .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,
-              #links: [:show],
-              cls: 'table has-filter has-search'
-
-        .select_toolbox
-          ul
-            li.st_action
-              = link_to select_type_compliance_control_set_compliance_controls_path(@compliance_control_set.id)
-                span.fa.fa-plus
-            li.st_action
-              = link_to new_compliance_control_set_compliance_control_block_path(@compliance_control_set.id)
-                span.fa.fa-plus-square
+          /= render 'filters'
+    .row
+      .col-lg-12
+        = "Tous mode de transport"
+      .col-lg-12
+        .select_table
+          = table_builder_2 @compliance_controls_without_block,
+                  [ \
+              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'
 
+    - @compliance_control_set.compliance_control_blocks.each do |block|
+        .row
+          .col-lg-12
+            = "#{block.transport_mode} / #{block.transport_mode}"
+        .row
+          .col-lg-12
+            .select_table
+              = table_builder_2 block.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'
+    .select_toolbox
+      ul
+        li.st_action
+          = link_to select_type_compliance_control_set_compliance_controls_path(@compliance_control_set.id)
+            span.fa.fa-plus
+        li.st_action
+          = link_to new_compliance_control_set_compliance_control_block_path(@compliance_control_set.id)
+            span.fa.fa-plus-square