Fix NETEX imports

3 files changed, 95 insertions, 51 deletions

diff --git a/app/views/imports/import/_netex.html.slim b/app/views/imports/import/_netex.html.slim
new file mode 100644
index 000000000..5542e389f
--- /dev/null
+++ b/app/views/imports/import/_netex.html.slim
@@ -0,0 +1,43 @@
+.row
+  .col-lg-6.col-md-6.col-sm-12.col-xs-12
+    - metadata = { t('.parent') => link_to(@import.parent.name, [@import.parent.workbench, @import.parent]) }
+    - metadata = metadata.update({t('.status') => import_status(@import.status, verbose: true) })
+    = definition_list t('metadatas'), metadata
+
+.col-lg-12
+  .error_messages
+    = render 'shared/iev_interfaces/messages', messages: @import.main_resource.messages
+
+- if @import.resources.present?
+  .col-lg-12
+    h2 = t('.table_title')
+  .col-lg-12
+    = t('.table_explanation')
+  .col-lg-12
+    = table_builder_2 @import.resources.where(resource_type: :file),
+      [ \
+        TableBuilderHelper::Column.new( \
+          key: :name, \
+          attribute: 'name', \
+          sortable: false, \
+        ), \
+        TableBuilderHelper::Column.new( \
+          key: :status, \
+          attribute: Proc.new { |n| import_resource_status(n.status) }, \
+          sortable: false, \
+        ), \
+        TableBuilderHelper::Column.new( \
+          name: 'Résultat des tests' , \
+          attribute: Proc.new { |n| I18n.t('import_resources.index.metrics', n.metrics.deep_symbolize_keys) }, \
+          sortable: false, \
+        ), \
+        TableBuilderHelper::Column.new( \
+          name: 'Téléchargement' , \
+          attribute: Proc.new { |n| '<i class="fa fa-download" aria-hidden="true"></i>'.html_safe }, \
+          sortable: false, \
+          link_to: lambda do |import_resource| \
+            workbench_import_import_resource_import_messages_path(import_resource.import.workbench, import_resource.import, import_resource, format: 'csv' ) \
+          end \
+        ), \
+      ],
+      cls: 'table has-search'
diff --git a/app/views/imports/import/_workbench.html.slim b/app/views/imports/import/_workbench.html.slim
new file mode 100644
index 000000000..d384cbbe2
--- /dev/null
+++ b/app/views/imports/import/_workbench.html.slim
@@ -0,0 +1,51 @@
+.row
+  .col-lg-6.col-md-6.col-sm-12.col-xs-12
+    - metadata = { t('.data_recovery') => '-', t('.filename') => @import.try(:file_identifier)}
+    - metadata = metadata.update({t('.status') => import_status(@import.status, verbose: true) })
+    = definition_list t('metadatas'), metadata
+
+.col-lg-12
+  .error_messages
+    = render 'shared/iev_interfaces/messages', messages: @import.messages
+
+- if @import.resources.any?
+  .col-lg-12
+    = table_builder_2 @import.resources,
+      [ \
+        TableBuilderHelper::Column.new( \
+          name: t('.referential_name'), \
+          attribute: 'name', \
+          sortable: false, \
+          link_to: lambda do |item| \
+            referential_path(item.referential) if item.referential.present? \
+          end \
+        ), \
+        TableBuilderHelper::Column.new( \
+          key: :status, \
+          attribute: Proc.new { |n| import_status(n.status) }, \
+          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: '', \
+          sortable: false, \
+        ), \
+        TableBuilderHelper::Column.new( \
+          name: t('.organisation_control'), \
+          attribute: '', \
+          sortable: false, \
+        ) \
+      ],
+      cls: 'table',
+      overhead: [ \
+        {}, \
+        {}, \
+        { \
+          title: I18n.t('imports.show.summary').html_safe, \
+          width: 2, \
+          cls: 'overheaded-default colspan="2"' \
+        } \
+      ]
diff --git a/app/views/imports/show.html.slim b/app/views/imports/show.html.slim
index 99458c7fe..10552129d 100644
--- a/app/views/imports/show.html.slim
+++ b/app/views/imports/show.html.slim
@@ -4,54 +4,4 @@
 
 .page_content
   .container-fluid
-    .row
-      .col-lg-6.col-md-6.col-sm-12.col-xs-12
-        - metadata = { t('.data_recovery') => '-', t('.filename') => @import.try(:file_identifier)}
-        - metadata = metadata.update({t('.status') => import_status(@import.status, verbose: true) })
-        = definition_list t('metadatas'), metadata
-
-    .col-lg-12
-      .error_messages
-        = render 'shared/iev_interfaces/messages', messages: @import.messages
-
-    - if @import.resources.any?
-      .col-lg-12
-        = table_builder_2 @import.resources,
-          [ \
-            TableBuilderHelper::Column.new( \
-              name: t('.referential_name'), \
-              attribute: 'name', \
-              sortable: false, \
-              link_to: lambda do |item| \
-                referential_path(item.referential) if item.referential.present? \
-              end \
-            ), \
-            TableBuilderHelper::Column.new( \
-              key: :status, \
-              attribute: Proc.new { |n| import_status(n.status) }, \
-              sortable: false, \
-              link_to: lambda do |item| \
-                workbench_import_import_resource_path(@import.workbench_id, @import, item) \
-              end \
-            ), \
-            TableBuilderHelper::Column.new( \
-              name: t('.stif_control'), \
-              attribute: '', \
-              sortable: false, \
-            ), \
-            TableBuilderHelper::Column.new( \
-              name: t('.organisation_control'), \
-              attribute: '', \
-              sortable: false, \
-            ) \
-          ],
-          cls: 'table',
-          overhead: [ \
-            {}, \
-            {}, \
-            { \
-              title: I18n.t('imports.show.summary').html_safe, \
-              width: 2, \
-              cls: 'overheaded-default colspan="2"' \
-            } \
-          ]
+    = render partial: "imports/#{@import.type.tableize.singularize}"