From 9fd8bf17413542a11bf7f4611affd6ac812a4b7c Mon Sep 17 00:00:00 2001
From: glax <johanna@bernloehr.eu>
Date: Sat, 10 Jun 2023 16:00:41 +0200
Subject: [PATCH] website uses taskId

---
 Website/interaction.js | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/Website/interaction.js b/Website/interaction.js
index b92d63e..6acfcce 100644
--- a/Website/interaction.js
+++ b/Website/interaction.js
@@ -367,14 +367,8 @@ function ShowTasksQueue(){
             tagTasksRunning.innerText = json.length;
             json.forEach(task => {
                 downloadTasksOutput.appendChild(CreateProgressChild(task));
-
-                if(task.chapter != undefined){
-                    document.querySelector(`#progress${task.publication.internalId.replace('=','')}-${task.chapter.chapterNumber}`).value = task.progress;
-                    document.querySelector(`#progressStr${task.publication.internalId.replace('=','')}-${task.chapter.chapterNumber}`).innerText = task.progress.toLocaleString(undefined,{style: 'percent', minimumFractionDigits:2});
-                }else{
-                    document.querySelector(`#progress${task.publication.internalId.replace('=','')}`).value = task.progress;
-                    document.querySelector(`#progressStr${task.publication.internalId.replace('=','')}`).innerText = task.progress.toLocaleString(undefined,{style: 'percent', minimumFractionDigits:2});
-                }
+                document.querySelector(`#progress${task.taskId.replaceAll('=','')}`).value = task.progress;
+                document.querySelector(`#progressStr${task.taskId.replaceAll('=','')}`).innerText = task.progress.toLocaleString(undefined,{style: 'percent', minimumFractionDigits:2});
             });
         });
 
@@ -401,11 +395,13 @@ function CreateProgressChild(task){
 
 
     var progress = document.createElement("progress");
+    progress.id = `progress${task.taskId.replaceAll('=','')}`;
     child.appendChild(progress);
     
     var progressStr = document.createElement("span");
     progressStr.innerText = "00.00%";
     progressStr.className = "progressStr";
+    progressStr.id = `progressStr${task.taskId.replaceAll('=','')}`;
     child.appendChild(progressStr);
     
     if(task.chapter != undefined){
@@ -418,12 +414,6 @@ function CreateProgressChild(task){
         chapterName.className = "chapterName";
         chapterName.innerText = task.chapter.name;
         child.appendChild(chapterName);
-
-        progress.id = `progress${task.publication.internalId.replace('=','')}-${task.chapter.chapterNumber}`;
-        progressStr.id = `progressStr${task.publication.internalId.replace('=','')}-${task.chapter.chapterNumber}`;
-    }else{
-        progress.id = `progress${task.publication.internalId.replace('=','')}`;
-        progressStr.id = `progressStr${task.publication.internalId.replace('=','')}`;
     }
     
     
@@ -494,13 +484,8 @@ setInterval(() => {
 setInterval(() => {
     GetRunningTasks().then((json) => {
         json.forEach(task => {
-            if(task.chapter != undefined){
-                document.querySelector(`#progress${task.publication.internalId.replace('=','')}-${task.chapter.chapterNumber}`).value = task.progress;
-                document.querySelector(`#progressStr${task.publication.internalId.replace('=','')}-${task.chapter.chapterNumber}`).innerText = task.progress.toLocaleString(undefined,{style: 'percent', minimumFractionDigits:2});
-            }else{
-                document.querySelector(`#progress${task.publication.internalId.replace('=','')}`).value = task.progress;
-                document.querySelector(`#progressStr${task.publication.internalId.replace('=','')}`).innerText = task.progress.toLocaleString(undefined,{style: 'percent', minimumFractionDigits:2});
-            }
+            document.querySelector(`#progress${task.taskId.replaceAll('=','')}`).value = task.progress;
+            document.querySelector(`#progressStr${task.taskId.replaceAll('=','')}`).innerText = task.progress.toLocaleString(undefined,{style: 'percent', minimumFractionDigits:2});
         });
     });
 },500);
\ No newline at end of file