From b1eaa810ce37e4af88fdb41f0067b56f8725ef31 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 1 Oct 2021 17:09:36 +0200 Subject: improve channel import progress page --- view/js/mod_import_progress.js | 64 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 view/js/mod_import_progress.js (limited to 'view/js/mod_import_progress.js') diff --git a/view/js/mod_import_progress.js b/view/js/mod_import_progress.js new file mode 100644 index 000000000..69e4c5242 --- /dev/null +++ b/view/js/mod_import_progress.js @@ -0,0 +1,64 @@ +$(document).ready(function() { + + console.log('import_progress'); + + setInterval(get_progress, 5000); + + + function get_progress(){ + console.log('get'); + + $.get('import_progress', function(data) { + update_progress(data); + }); + } + + function update_progress(data){ + console.log('update'); + console.log(data); + console.log(data.cprogress); + console.log(data.fprogress); + + + if (typeof data.cprogress == 'number') { + $('#cprogress-label').html(data.cprogress + '%'); + $('#cprogress-bar').css('width', data.cprogress + '%'); + + if (data.cprogress == 100) { + $('#cprogress-resume').addClass('d-none'); + $('#cprogress-complete').removeClass('d-none'); + $('#cprogress-bar').removeClass('progress-bar-animated'); + } + else if (data.cprogress < 100) { + $('#cprogress-resume').removeClass('d-none'); + $('#cprogress-complete').addClass('d-none'); + $('#cprogress-bar').addClass('progress-bar-animated'); + } + } + else { + $('#cprogress-label').html(data.cprogress); + $('#cprogress-bar').css('width', '0%'); + + } + + if (typeof data.fprogress == 'number') { + $('#fprogress-label').html(data.fprogress + '%'); + $('#fprogress-bar').css('width', data.fprogress + '%'); + + if (data.fprogress == 100) { + $('#fprogress-resume').addClass('d-none'); + $('#fprogress-complete').removeClass('d-none'); + $('#fprogress-bar').removeClass('progress-bar-animated'); + } + else if (data.fprogress < 100) { + $('#fprogress-resume').removeClass('d-none'); + $('#fprogress-complete').addClass('d-none'); + $('#fprogress-bar').addClass('progress-bar-animated'); + } + } + else { + $('#fprogress-label').html(data.fprogress); + $('#fprogress-bar').css('width', '0%'); + } + } +}); -- cgit v1.2.3 From dac27aab6810473fa020120d348c51dcf93e2d79 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 1 Oct 2021 17:11:14 +0200 Subject: remove logging --- view/js/mod_import_progress.js | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'view/js/mod_import_progress.js') diff --git a/view/js/mod_import_progress.js b/view/js/mod_import_progress.js index 69e4c5242..acfb78de8 100644 --- a/view/js/mod_import_progress.js +++ b/view/js/mod_import_progress.js @@ -1,25 +1,13 @@ $(document).ready(function() { - - console.log('import_progress'); - setInterval(get_progress, 5000); - function get_progress(){ - console.log('get'); - $.get('import_progress', function(data) { update_progress(data); }); } function update_progress(data){ - console.log('update'); - console.log(data); - console.log(data.cprogress); - console.log(data.fprogress); - - if (typeof data.cprogress == 'number') { $('#cprogress-label').html(data.cprogress + '%'); $('#cprogress-bar').css('width', data.cprogress + '%'); -- cgit v1.2.3 From 47e83a15c1168cfd8ebc7905db853f3db6b3b31b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 1 Oct 2021 21:52:30 +0200 Subject: import_progress: deal with the situation where items/files are being imported but there are none to import --- view/js/mod_import_progress.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'view/js/mod_import_progress.js') diff --git a/view/js/mod_import_progress.js b/view/js/mod_import_progress.js index acfb78de8..7aed56365 100644 --- a/view/js/mod_import_progress.js +++ b/view/js/mod_import_progress.js @@ -8,39 +8,41 @@ $(document).ready(function() { } function update_progress(data){ + + // items if (typeof data.cprogress == 'number') { $('#cprogress-label').html(data.cprogress + '%'); $('#cprogress-bar').css('width', data.cprogress + '%'); if (data.cprogress == 100) { $('#cprogress-resume').addClass('d-none'); - $('#cprogress-complete').removeClass('d-none'); + $('#cprogress-completed').removeClass('d-none'); $('#cprogress-bar').removeClass('progress-bar-animated'); } else if (data.cprogress < 100) { $('#cprogress-resume').removeClass('d-none'); - $('#cprogress-complete').addClass('d-none'); + $('#cprogress-completed').addClass('d-none'); $('#cprogress-bar').addClass('progress-bar-animated'); } } else { $('#cprogress-label').html(data.cprogress); $('#cprogress-bar').css('width', '0%'); - } + // files if (typeof data.fprogress == 'number') { $('#fprogress-label').html(data.fprogress + '%'); $('#fprogress-bar').css('width', data.fprogress + '%'); if (data.fprogress == 100) { $('#fprogress-resume').addClass('d-none'); - $('#fprogress-complete').removeClass('d-none'); + $('#fprogress-completed').removeClass('d-none'); $('#fprogress-bar').removeClass('progress-bar-animated'); } else if (data.fprogress < 100) { $('#fprogress-resume').removeClass('d-none'); - $('#fprogress-complete').addClass('d-none'); + $('#fprogress-completed').addClass('d-none'); $('#fprogress-bar').addClass('progress-bar-animated'); } } -- cgit v1.2.3