Auftrags-Controller: Beleg neu laden nach "Speichern und drucken"/Druckvorschau.

[kivitendo-erp.git] / templates / webpages / csv_import / _deferred_results.html

diff --git a/templates/webpages/csv_import/_deferred_results.html b/templates/webpages/csv_import/_deferred_results.html
index e422347..f206189 100644 (file)
--- a/templates/webpages/csv_import/_deferred_results.html
+++ b/templates/webpages/csv_import/_deferred_results.html
@@ -1,5 +1,14 @@
+[%- USE L %]
+[%- USE T8 %]
+[%- USE HTML %]
+
+<h2>[% 'Import Status' | $T8 %]</h2>
+
+[% INCLUDE 'common/flash.html' %]
+[% UNLESS SELF.background_job.data_as_hash.errors %]
+<div id='progress_description'></div>
 <div id='progressbar'></div>
-[% IF progress < 100 %]
+[% END  %]
 <script type='text/javascript'>
   function reload_results () {
     $.ajax({
@@ -13,9 +22,11 @@
       error: function(e) { alert(e) },
     });
   }
+[%- UNLESS SELF.background_job.data_as_hash.errors %]
   $(document).ready(function(){
-    $('#progressbar').progressbar({ value: [% progress * 1 %] });
-    window.setTimeout(reload_results, 2000);
+    $('#progress_description').html('[% SELF.status_text | html %]');
+    $('#progressbar').progressbar({ value: [% SELF.background_job.data_as_hash.progress.progress * 1 %] });
+    window.setTimeout(reload_results, 500);
   })
+[%- END %]
 </script>
-[% END %]