From 67dab88674fd559f26f84c04cad5b99db170b768 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Wed, 12 Feb 2020 16:24:56 +0100 Subject: [PATCH 1/3] Add running indicator --- app/templates/jobs/job.html.j2 | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/app/templates/jobs/job.html.j2 b/app/templates/jobs/job.html.j2 index 674a566f..62de7cb0 100644 --- a/app/templates/jobs/job.html.j2 +++ b/app/templates/jobs/job.html.j2 @@ -8,7 +8,20 @@

{{ job.title }}

{{ job.description }}

- +
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -224,8 +237,11 @@ } setStatus(status) { - let statusElement; - + let progressIndicator, statusElement; + if (status === "complete") { + progressIndicator = document.getElementById("progress-indicator"); + progressIndicator.classList.add("hide"); + } statusElement = document.getElementById("status"); statusElement.dataset.status = status; } From 0f7df4fd3b2d67c9eb2740394389fe4f20a565a9 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Wed, 12 Feb 2020 16:34:31 +0100 Subject: [PATCH 2/3] new status view --- app/templates/corpora/corpus.html.j2 | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/app/templates/corpora/corpus.html.j2 b/app/templates/corpora/corpus.html.j2 index b1156a6c..b6058be5 100644 --- a/app/templates/corpora/corpus.html.j2 +++ b/app/templates/corpora/corpus.html.j2 @@ -7,7 +7,20 @@

{{ corpus.title }}

{{ corpus.description }}

- +
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -150,8 +163,12 @@ } setStatus(status) { - let analyseBtn, statusElement; + let analyseBtn, progressIndicator, statusElement; + if (status != "preparable" && status != "preparing") { + progressIndicator = document.getElementById("progress-indicator"); + progressIndicator.classList.add("hide"); + } statusElement = document.getElementById("status"); statusElement.dataset.status = status; analyseBtn = document.getElementById('analyse'); From 0ea03983d64339bba6b3d636e6bf6da840bd3395 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Wed, 12 Feb 2020 16:42:46 +0100 Subject: [PATCH 3/3] small fix --- app/templates/jobs/job.html.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/jobs/job.html.j2 b/app/templates/jobs/job.html.j2 index 62de7cb0..77ea9a5d 100644 --- a/app/templates/jobs/job.html.j2 +++ b/app/templates/jobs/job.html.j2 @@ -233,7 +233,6 @@ ` ); } - M.Collapsible.getInstance(document.getElementById("job-list")).open(1); } setStatus(status) { @@ -241,6 +240,7 @@ if (status === "complete") { progressIndicator = document.getElementById("progress-indicator"); progressIndicator.classList.add("hide"); + M.Collapsible.getInstance(document.getElementById("job-list")).open(1); } statusElement = document.getElementById("status"); statusElement.dataset.status = status;