From af49fd1021ee6b22fd8ca6c6592c5f7d64c23aa0 Mon Sep 17 00:00:00 2001
From: Zog
Date: Mon, 30 Apr 2018 14:22:53 +0200
Subject: Better views

---
 app/views/compliance_check_sets/show.html.slim |  1 +
 app/views/imports/import/_workbench.html.slim  | 41 ++++++++++++++------------
 2 files changed, 23 insertions(+), 19 deletions(-)

(limited to 'app/views')

diff --git a/app/views/compliance_check_sets/show.html.slim b/app/views/compliance_check_sets/show.html.slim
index 4e1a8e2f9..bf4642b21 100644
--- a/app/views/compliance_check_sets/show.html.slim
+++ b/app/views/compliance_check_sets/show.html.slim
@@ -9,6 +9,7 @@
         = definition_list( t('metadatas'),
           { I18n.t("compliance_check_sets.show.metadatas.referential") => (@compliance_check_set.referential.nil? ? '' : link_to(@compliance_check_set.referential.name, referential_path(@compliance_check_set.referential)) ),
             I18n.t("compliance_check_sets.show.metadatas.referential_type") => 'Jeu de données',
+            I18n.t("compliance_check_sets.show.metadatas.status") => import_status(@compliance_check_set.status, verbose: true),
             I18n.t("compliance_check_sets.show.metadatas.compliance_check_set_executed") => link_to(@compliance_check_set.name, executed_workbench_compliance_check_set_path(@compliance_check_set.workbench_id, @compliance_check_set)),
             I18n.t("compliance_check_sets.show.metadatas.compliance_control_owner") => @compliance_check_set.organisation.name,
             I18n.t("compliance_check_sets.show.metadatas.import") => '' })
diff --git a/app/views/imports/import/_workbench.html.slim b/app/views/imports/import/_workbench.html.slim
index cec5d837c..0b6cc5945 100644
--- a/app/views/imports/import/_workbench.html.slim
+++ b/app/views/imports/import/_workbench.html.slim
@@ -8,6 +8,25 @@
   .error_messages
     = render 'shared/iev_interfaces/messages', messages: @import.messages
 
+ruby:
+ controls = []
+ controls << TableBuilderHelper::Column.new(
+   name: t('.stif_control'),
+   attribute: Proc.new { |n| import_status(n.workbench_import_control_set&.status, verbose: true, default_status: :pending) },
+   sortable: false,
+   link_to: lambda do |item|
+     item.workbench_import_control_set.present? && [@import.workbench, item.workbench_import_control_set]
+   end
+ ) if @workbench.import_compliance_control_set.present?
+ controls << TableBuilderHelper::Column.new(
+   name: t('.stif_control'),
+   attribute: Proc.new { |n| import_status(n.workgroup_import_control_set&.status, verbose: true, default_status: :pending) },
+   sortable: false,
+   link_to: lambda do |item|
+     item.workbench_import_control_set.present? && [@import.workbench, item.workgroup_import_control_set]
+   end
+ ) if @workbench.workgroup.import_compliance_control_set.present?
+
 - if @import.resources.any?
   .col-lg-12
     = table_builder_2 @import.resources,
@@ -22,28 +41,12 @@
         ), \
         TableBuilderHelper::Column.new( \
           key: :status, \
-          attribute: Proc.new { |n| import_status(n.status) }, \
+          attribute: Proc.new { |n| import_status(n.status, verbose: true, default_status: :pending) }, \
           sortable: false, \
           link_to: lambda do |item| \
             item.netex_import.present? ? [@import.workbench, item.netex_import] : [@import.workbench, @import, item] \
           end \
-        ), \
-        TableBuilderHelper::Column.new( \
-          name: t('.stif_control'), \
-          attribute: Proc.new { |n| import_status(n.workbench_import_control_set&.status) }, \
-          sortable: false, \
-          link_to: lambda do |item| \
-            item.workbench_import_control_set.present? && [@import.workbench, item.workbench_import_control_set] \
-          end \
-        ), \
-        TableBuilderHelper::Column.new( \
-          name: t('.organisation_control'), \
-          attribute: Proc.new { |n| import_status(n.workgroup_import_control_set&.status) }, \
-          sortable: false, \
-          link_to: lambda do |item| \
-            item.workgroup_import_control_set.present? && [@import.workbench, item.workgroup_import_control_set] \
-          end \
-        ) \
+        ), *controls \
       ],
       cls: 'table',
       overhead: [ \
@@ -51,7 +54,7 @@
         {}, \
         { \
           title: I18n.t('imports.show.summary').html_safe, \
-          width: 2, \
+          width: controls.size, \
           cls: 'overheaded-default colspan="2"' \
         } \
       ]
-- 
cgit v1.2.3