projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GLN: neue Spalte bei customer, vendor und shipto; DB-Upgrade-Skript u. Rose
[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
..
7f68a32
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>
+
+[% PROCESS 'common/flash.html' %]
+[% UNLESS SELF.background_job.data_as_hash.errors %]
+<div id='progress_description'></div>
<div id='progressbar'></div>
<div id='progressbar'></div>
-[%
IF progress < 100
%]
+[%
END
%]
<script type='text/javascript'>
function reload_results () {
$.ajax({
<script type='text/javascript'>
function reload_results () {
$.ajax({
@@
-13,9
+22,11
@@
error: function(e) { alert(e) },
});
}
error: function(e) { alert(e) },
});
}
+[%- UNLESS SELF.background_job.data_as_hash.errors %]
$(document).ready(function(){
$(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>
</script>
-[% END %]