✨ import group sheet

7 files changed, 131 insertions, 100 deletions

diff --git a/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html b/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html
index 4460809d4..fc969bb17 100644
--- a/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html
+++ b/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html
@@ -22,7 +22,7 @@
 <dl class="col-12 col-md-6 col-lg-3 flex-wrap">
     <dt>{% trans "Imports (creation)" %}</dt>
     <dd>{% for imprt in get_import_list %}{% if loop.counter %} ; {% endif %}
-        <a class="display_details" href="#" onclick="load_window('{% url 'show-import' imprt.pk %}')">
+        <a class="display_details" href="#" onclick="load_window('{{ imprt.get_show_url }}')">
             <i class="fa fa-info-circle" aria-hidden="true"></i>
         </a> {{imprt}}{% endfor %}</dd>
 </dl>
@@ -31,7 +31,7 @@
 <dl class="col-12 col-md-6 col-lg-3 flex-wrap">
     <dt>{% trans "Imports (update)" %}</dt>
     <dd>{% for imprt in get_import_updated %}{% if loop.counter %} ; {% endif %}
-        <a class="display_details" href="#" onclick="load_window('{% url 'show-import' imprt.pk %}')">
+        <a class="display_details" href="#" onclick="load_window('{{ imprt.get_show_url }}')">
             <i class="fa fa-info-circle" aria-hidden="true"></i>
         </a> {{imprt}}{% endfor %}</dd>
 </dl>
diff --git a/ishtar_common/templates/ishtar/import_table.html b/ishtar_common/templates/ishtar/import_table.html
index 0a894b778..be3af600b 100644
--- a/ishtar_common/templates/ishtar/import_table.html
+++ b/ishtar_common/templates/ishtar/import_table.html
@@ -65,7 +65,7 @@
              class='import-row{% if import.has_error or not import.pre_import_form_is_valid %}-error{% endif %}{% if import.pk in refreshed_pks %} bg-info{% endif %}'>
             <td><ul class="simple">
                 <li>
-                    <a class="display_details" href="#" onclick="load_window('{% url 'show-import' import.pk %}')"><i class="fa fa-info-circle" aria-hidden="true"></i></a>
+                    <a class="display_details" href="#" onclick="load_window('{{ import.get_show_url }}')"><i class="fa fa-info-circle" aria-hidden="true"></i></a>
                     <strong>{{import.name|default:"-"}}</strong>
                 </li>
                 <li><small><i class="fa fa-fw fa-calendar" aria-hidden="true"></i>&nbsp; {{import.creation_date|date:"DATE_FORMAT"}} {{import.creation_date|time:"H:i"}} - {% if import.end_date %}{{import.end_date|date:"DATE_FORMAT"}} {{import.end_date|time:"H:i"}}{% endif %}</small></li>
diff --git a/ishtar_common/templates/ishtar/sheet_import.html b/ishtar_common/templates/ishtar/sheet_import.html
index 6ee4837a9..8685d9ae8 100644
--- a/ishtar_common/templates/ishtar/sheet_import.html
+++ b/ishtar_common/templates/ishtar/sheet_import.html
@@ -8,101 +8,5 @@
 {% endblock %}
 
 {% block content %}
-{% trans "Source" as source_label %}
-{% trans "Media" as media_label %}
-{% trans "Result" as result_label %}
-{% trans "Error" as error_label %}
-{% trans "Match" as match_label %}
-
-{% with current_import=item %}{% with object=item %}
-{% with imported_list=object.get_all_imported %}
-{% with updated_list=object.get_all_updated %}
-
-{% if output != "ODT" and output != "PDF" %}
-<ul class="nav nav-tabs" id="{{window_id}}-tabs" role="tablist">
-  <li class="nav-item">
-    <a class="nav-link active" id="{{window_id}}-general-tab"
-       data-toggle="tab" href="#{{window_id}}-general" role="tab"
-       aria-controls="{{window_id}}-general" aria-selected="false">
-      {% trans "General" %}
-    </a>
-  </li>
-  {% if imported_list %}<li class="nav-item">
-    <a class="nav-link" id="{{window_id}}-created-tab"
-       data-toggle="tab" href="#{{window_id}}-created" role="tab"
-       aria-controls="{{window_id}}-general" aria-selected="false">
-      {% trans "Created" %}
-    </a>
-  </li>{% endif %}
-  {% if updated_list %}<li class="nav-item">
-    <a class="nav-link" id="{{window_id}}-updated-tab"
-       data-toggle="tab" href="#{{window_id}}-updated" role="tab"
-       aria-controls="{{window_id}}-updated" aria-selected="false">
-      {% trans "Updated" %}
-    </a>
-  </li>{% endif %}
-</ul>
-{% endif %}
-
-<div class="tab-content" id="{{window_id}}-tab-content">
-  <div class="tab-pane fade show active" id="{{window_id}}-general"
-       role="tabpanel" aria-labelledby="{{window_id}}-general-tab">
-    <div class="row mb-3">
-      {% field_flex "Name" item.name %}
-      {% field_flex "Type" item.importer_type %}
-
-      <div class="col-12 col-md-6 col-lg-3 flex-wrap">
-        <i class="fa fa-hourglass-start" aria-hidden="true"></i>&nbsp; {{item.creation_date|date:"DATE_FORMAT"}} {{item.creation_date|time:"H:i"}}
-        {% if item.end_date %}<br><i class="fa fa-hourglass-end" aria-hidden="true"></i>&nbsp; {{item.end_date|date:"DATE_FORMAT"}} {{item.end_date|time:"H:i"}}{% endif %}
-      </div>
-      <div class="col-12 col-md-6 col-lg-3 flex-wrap">
-        <i class="fa fa-fw fa-user" aria-hidden="true"></i>&nbsp; {{item.user}}
-      </div>
-
-      {% if item.imported_file %}
-      <div class="col-12 col-md-6 col-lg-3 flex-wrap">
-        {% with file_label=source_label logo='fa fa-fw fa-file-text-o' file_type='source' file=item.imported_file %}
-        {% include "ishtar/blocks/import_table_buttons_view.html" %}
-        {% endwith %}
-      </div>
-
-      {% if item.get_imported_images %}
-      <div class="col-12 col-md-6 col-lg-3 flex-wrap">
-        {% with file_label=media_label logo='fa fa-fw fa-file-image-o' file_type='' file=item.get_imported_images %}
-        {% include "ishtar/blocks/import_table_buttons_view.html" %}
-        {% endwith %}
-      </div>{% endif %}
-      {% elif item.archive_file %}
-      <div class="col-12 col-md-6 col-lg-3 flex-wrap">
-        <i class="fa fa-fw fa-file-archive-o" aria-hidden="true"></i> <a href='{{item.archive_file.url}}'>{% trans "Archive" context "name" %}</a>
-      </div>{% endif %}
-    </div>
-  </div>
-  {% if imported_list %}
-  <div class="tab-pane fade" id="{{window_id}}-created"
-       role="tabpanel" aria-labelledby="{{window_id}}-created-tab">
-    <div class="row">
-      {% for accessor, imported in imported_list %}
-      {% include "ishtar/import_associated_item.html" %}
-      {% endfor %}
-      {% comment %}<div><div>{% endcomment %}
-        </div>
-      </div>
-    </div>
-  </div>{% endif %}
-  {% if updated_list %}
-  <div class="tab-pane fade" id="{{window_id}}-updated"
-       role="tabpanel" aria-labelledby="{{window_id}}-updated-tab">
-    <div class="row">
-      {% for accessor, imported in updated_list %}
-      {% include "ishtar/import_associated_item.html" %}
-      {% endfor %}
-      {% comment %}<div><div>{% endcomment %}
-        </div>
-      </div>
-    </div>
-  </div>{% endif %}
-</div>
-
-{% endwith %}{% endwith %}{% endwith %}{% endwith %}
+{% include "ishtar/sheet_import_gen.html" %}
 {% endblock %}
diff --git a/ishtar_common/templates/ishtar/sheet_import_gen.html b/ishtar_common/templates/ishtar/sheet_import_gen.html
new file mode 100644
index 000000000..86c2ac6fe
--- /dev/null
+++ b/ishtar_common/templates/ishtar/sheet_import_gen.html
@@ -0,0 +1,98 @@
+{% load i18n window_header window_field window_tables %}
+{% trans "Source" as source_label %}
+{% trans "Media" as media_label %}
+{% trans "Result" as result_label %}
+{% trans "Error" as error_label %}
+{% trans "Match" as match_label %}
+
+{% with current_import=item %}{% with object=item %}
+{% with imported_list=object.get_all_imported %}
+{% with updated_list=object.get_all_updated %}
+
+{% if output != "ODT" and output != "PDF" %}
+<ul class="nav nav-tabs" id="{{window_id}}-tabs" role="tablist">
+  <li class="nav-item">
+    <a class="nav-link active" id="{{window_id}}-general-tab"
+       data-toggle="tab" href="#{{window_id}}-general" role="tab"
+       aria-controls="{{window_id}}-general" aria-selected="false">
+      {% trans "General" %}
+    </a>
+  </li>
+  {% if imported_list %}<li class="nav-item">
+    <a class="nav-link" id="{{window_id}}-created-tab"
+       data-toggle="tab" href="#{{window_id}}-created" role="tab"
+       aria-controls="{{window_id}}-general" aria-selected="false">
+      {% trans "Created" %}
+    </a>
+  </li>{% endif %}
+  {% if updated_list %}<li class="nav-item">
+    <a class="nav-link" id="{{window_id}}-updated-tab"
+       data-toggle="tab" href="#{{window_id}}-updated" role="tab"
+       aria-controls="{{window_id}}-updated" aria-selected="false">
+      {% trans "Updated" %}
+    </a>
+  </li>{% endif %}
+</ul>
+{% endif %}
+
+<div class="tab-content" id="{{window_id}}-tab-content">
+  <div class="tab-pane fade show active" id="{{window_id}}-general"
+       role="tabpanel" aria-labelledby="{{window_id}}-general-tab">
+    <div class="row mb-3">
+      {% field_flex "Name" item.name %}
+      {% field_flex "Type" item.importer_type %}
+
+      <div class="col-12 col-md-6 col-lg-3 flex-wrap">
+        <i class="fa fa-hourglass-start" aria-hidden="true"></i>&nbsp; {{item.creation_date|date:"DATE_FORMAT"}} {{item.creation_date|time:"H:i"}}
+        {% if item.end_date %}<br><i class="fa fa-hourglass-end" aria-hidden="true"></i>&nbsp; {{item.end_date|date:"DATE_FORMAT"}} {{item.end_date|time:"H:i"}}{% endif %}
+      </div>
+      <div class="col-12 col-md-6 col-lg-3 flex-wrap">
+        <i class="fa fa-fw fa-user" aria-hidden="true"></i>&nbsp; {{item.user}}
+      </div>
+
+      {% if item.imported_file %}
+      <div class="col-12 col-md-6 col-lg-3 flex-wrap">
+        {% with file_label=source_label logo='fa fa-fw fa-file-text-o' file_type='source' file=item.imported_file %}
+        {% include "ishtar/blocks/import_table_buttons_view.html" %}
+        {% endwith %}
+      </div>
+
+      {% if item.get_imported_images %}
+      <div class="col-12 col-md-6 col-lg-3 flex-wrap">
+        {% with file_label=media_label logo='fa fa-fw fa-file-image-o' file_type='' file=item.get_imported_images %}
+        {% include "ishtar/blocks/import_table_buttons_view.html" %}
+        {% endwith %}
+      </div>{% endif %}
+      {% elif item.archive_file %}
+      <div class="col-12 col-md-6 col-lg-3 flex-wrap">
+        <i class="fa fa-fw fa-file-archive-o" aria-hidden="true"></i> <a href='{{item.archive_file.url}}'>{% trans "Archive" context "name" %}</a>
+      </div>{% endif %}
+    </div>
+  </div>
+  {% if imported_list %}
+  <div class="tab-pane fade" id="{{window_id}}-created"
+       role="tabpanel" aria-labelledby="{{window_id}}-created-tab">
+    <div class="row">
+      {% for accessor, imported in imported_list %}
+      {% include "ishtar/import_associated_item.html" %}
+      {% endfor %}
+      {% comment %}<div><div>{% endcomment %}
+        </div>
+      </div>
+    </div>
+  </div>{% endif %}
+  {% if updated_list %}
+  <div class="tab-pane fade" id="{{window_id}}-updated"
+       role="tabpanel" aria-labelledby="{{window_id}}-updated-tab">
+    <div class="row">
+      {% for accessor, imported in updated_list %}
+      {% include "ishtar/import_associated_item.html" %}
+      {% endfor %}
+      {% comment %}<div><div>{% endcomment %}
+        </div>
+      </div>
+    </div>
+  </div>{% endif %}
+</div>
+
+{% endwith %}{% endwith %}{% endwith %}{% endwith %}
diff --git a/ishtar_common/templates/ishtar/sheet_importgroup.html b/ishtar_common/templates/ishtar/sheet_importgroup.html
new file mode 100644
index 000000000..593642945
--- /dev/null
+++ b/ishtar_common/templates/ishtar/sheet_importgroup.html
@@ -0,0 +1,12 @@
+{% extends "ishtar/sheet.html" %}
+{% load i18n window_header window_field window_tables %}
+
+{% block head_title %}<strong>{% trans "Import" %}</strong> &ndash; {{item.name}}{% endblock %}
+
+{% block toolbar %}
+{% window_nav item window_id 'show-importgroup' %}
+{% endblock %}
+
+{% block content %}
+{% include "ishtar/sheet_import_gen.html" %}
+{% endblock %}
diff --git a/ishtar_common/templates/ishtar/sheet_importgroup_pdf.html b/ishtar_common/templates/ishtar/sheet_importgroup_pdf.html
new file mode 100644
index 000000000..486f85a86
--- /dev/null
+++ b/ishtar_common/templates/ishtar/sheet_importgroup_pdf.html
@@ -0,0 +1,14 @@
+{% extends "ishtar/sheet_importgroup.html" %}
+{% block header %}
+{% endblock %}
+{% block main_head %}
+{{ block.super }}
+<div id="pdfheader">
+Ishtar &ndash; {{APP_NAME}} &ndash; {{item}}
+</div>
+{% endblock %}
+{%block head_sheet%}{%endblock%}
+{%block main_foot%}
+</body>
+</html>
+{%endblock%}
diff --git a/ishtar_common/templates/ishtar/sheet_importgroup_window.html b/ishtar_common/templates/ishtar/sheet_importgroup_window.html
new file mode 100644
index 000000000..5093cbcec
--- /dev/null
+++ b/ishtar_common/templates/ishtar/sheet_importgroup_window.html
@@ -0,0 +1,3 @@
+{% extends "ishtar/sheet_importgroup.html" %}
+{% block main_head %}{%endblock%}
+{% block main_foot %}{%endblock%}