From c2589a8a58e7c04bb39993e6af48dc3132de460d Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Fri, 18 Nov 2022 12:02:37 +0100
Subject: Imports: display post-process advance

---
 ishtar_common/data_importer.py                   |  6 ++++++
 ishtar_common/models_imports.py                  |  1 +
 ishtar_common/templates/ishtar/import_table.html | 10 +++++-----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py
index ff803f3f8..d58c9019e 100644
--- a/ishtar_common/data_importer.py
+++ b/ishtar_common/data_importer.py
@@ -1057,7 +1057,13 @@ class Importer(object):
 
     def post_import(self):
         related_list = {}
+        if self.import_instance:
+            self.import_instance.state = "PP"
+            self.import_instance.imported_line_numbers = ""
+            self.import_instance.save()
         for cls_pk, idx_line in self.post_save_items.items():
+            if self.import_instance:
+                self.import_instance.add_imported_line(idx_line)
             cls, pk = cls_pk
             # force django based post-processing for the item
             item = cls.objects.get(pk=pk)
diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py
index 87e631842..e24d300cb 100644
--- a/ishtar_common/models_imports.py
+++ b/ishtar_common/models_imports.py
@@ -1054,6 +1054,7 @@ IMPORT_STATE = (
     ("IQ", _("Import in queue")),
     ("HP", _("Check modified in progress")),
     ("IP", _("Import in progress")),
+    ("PP", _("Post-processing in progress")),
     ("PI", _("Partially imported")),
     ("FE", _("Finished with errors")),
     ("F", _("Finished")),
diff --git a/ishtar_common/templates/ishtar/import_table.html b/ishtar_common/templates/ishtar/import_table.html
index 62c32f657..310e1c84d 100644
--- a/ishtar_common/templates/ishtar/import_table.html
+++ b/ishtar_common/templates/ishtar/import_table.html
@@ -87,13 +87,13 @@ $("#import-list").find('input').prop('disabled', true);
                 <a href='{{import.match_file.url}}'>{% trans "File" context "not a directory" %}</a>
                 {% endif %}</td>
         </tr>
-        {% if import.state == 'IP' and import.current_line %}
+        {% if import.state == 'IP' or import.state == 'PP' and import.current_line %}
         <tr>
-            <td colspan="10">
-                <div class="progress">
-                  <div class="progress-bar progress-bar-striped bg-success progress-bar-animated" role="progressbar"
+            <td colspan="11">
+                <div class="progress bg-secondary">
+                  <div class="progress-bar progress-bar-striped {% if import.state == 'IP'%}bg-success{% else %}bg-info{% endif %} progress-bar-animated" role="progressbar"
                        aria-valuenow="{{import.current_line}}" aria-valuemin="0" aria-valuemax="{{import.number_of_line}}" style="width: {{import.progress_percent}}%">
-                       {{import.current_line}} / {{import.number_of_line}}
+                       &nbsp;{{import.current_line}} / {{import.number_of_line}}
                        </div>
                 </div>
             </td>
-- 
cgit v1.2.3