diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/job_progress.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/job_progress.inc index 14ecb96083..7241ce8348 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/job_progress.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/job_progress.inc @@ -1,5 +1,4 @@ -
-
- 0% +
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/str/job_progress.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/str/job_progress.inc index 7fc7f2a349..7e70975462 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/str/job_progress.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/str/job_progress.inc @@ -4,4 +4,5 @@ var JOB_PROGRESS_STARTED = _("Started"); var JOB_PROGRESS_FINISHED = _("Finished"); var JOB_PROGRESS_FAILED = _("Failed"); + var JOB_PROGRESS_PERCENT = _("%"); diff --git a/koha-tmpl/intranet-tmpl/prog/js/job_progress.js b/koha-tmpl/intranet-tmpl/prog/js/job_progress.js index acd75e3d2a..3ae641dcf8 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/job_progress.js +++ b/koha-tmpl/intranet-tmpl/prog/js/job_progress.js @@ -3,30 +3,29 @@ function updateProgress(job_id, callbacks) { let recheck = true; if ( job.status == "new" ) { - $('#job-percent-' + job_id).text(0); - $('#job-status-' + job_id).text(JOB_PROGRESS_NOT_STARTED); - $('#progress-bar-' + job_id).attr('aria-valuenow', 0).css("width", "100%"); + $('#progress-' + job_id).attr('aria-valuenow', 0); + $('#progress-bar-' + job_id).width("100%"); + $('#progress-bar-' + job_id).text("0" + JOB_PROGRESS_PERCENT + " " + JOB_PROGRESS_NOT_STARTED); } else if ( job.status == "started" ) { const progress = job["progress"]; const size = job["size"]; const percent = progress > 0 ? ( progress / size ) * 100 : 0; - $('#job-percent-' + job_id).text(percent.toFixed(2)); - $('#job-status-' + job_id).text(JOB_PROGRESS_STARTED); - $('#progress-bar-' + job_id).attr('aria-valuenow', percent); + $('#progress-' + job_id).attr('aria-valuenow', percent); $('#progress-bar-' + job_id).width(Math.floor(percent) +"%"); + $('#progress-bar-' + job_id).text(percent.toFixed(2) + JOB_PROGRESS_PERCENT + " " + JOB_PROGRESS_STARTED); typeof callbacks.progress_callback === 'function' && callbacks.progress_callback(); } else if ( job.status == "finished" ) { - $('#job-percent-' + job_id).text(100); - $('#job-status-' + job_id).text(JOB_PROGRESS_FINISHED); - $('#progress-bar-' + job_id).addClass("progress-bar-success"); - $('#progress-bar-' + job_id).attr('aria-valuenow', 100).css("width", "100%"); + $('#progress-bar-' + job_id).addClass("bg-success"); + $('#progress-' + job_id).attr('aria-valuenow', 100); + $('#progress-bar-' + job_id).css("width", "100%"); + $('#progress-bar-' + job_id).text("100" + JOB_PROGRESS_PERCENT + " " + JOB_PROGRESS_FINISHED); recheck = false; typeof callbacks.finish_callback === 'function' && callbacks.finish_callback(); } else if ( job.status == "failed" ) { - $('#job-percent-' + job_id).text(0); - $('#job-status-' + job_id).text(JOB_PROGRESS_FAILED); - $('#progress-bar-' + job_id).addClass("progress-bar-danger"); - $('#progress-bar-' + job_id).attr('aria-valuenow', 0).css("width", "100%"); + $('#progress-bar-' + job_id).addClass("bg-danger"); + $('#progress' + job_id).attr('aria-valuenow', 0); + $('#progress-bar-' + job_id).css("width", "100%"); + $('#progress-bar-' + job_id).text("0" + JOB_PROGRESS_PERCENT + " " + JOB_PROGRESS_FAILED); recheck = false; }