diff options
Diffstat (limited to 'frontend/main.js')
| -rw-r--r-- | frontend/main.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/frontend/main.js b/frontend/main.js index 7729b93..c9db1dd 100644 --- a/frontend/main.js +++ b/frontend/main.js @@ -138,8 +138,8 @@ async function updateMachines() { machine_imgs[i].src = "/assets/img/dryer_on.png"; } const now = Date.now(); - const start = Date.parse(status[1][i]); - machine_txts[i].innerHTML = Math.ceil(((start + (status[2][i] * 60000)) - now) / 60000).toString() + " min(s) left"; + const end = Date.parse(status[2][i]); + machine_txts[i].innerHTML = Math.ceil((end - now) / 6000).toString + " min(s) left"; } else if (status[0][i] == "FINISHED") { if ((i + 1) % 2 == 0) { machine_imgs[i].src = "/assets/img/washer_clothes.png"; @@ -175,6 +175,7 @@ async function startLoadTimers() { const textList = [] const progList = [] + const startTimestamps = [] const endTimestamps = [] for (let i = 0; i < timers.length; i++) { @@ -211,6 +212,7 @@ async function startLoadTimers() { textList.push(`timer-txt-${i}`); progList.push(`timer-prog-${i}`); + startTimestamps.push(Date.parse(timers[i]["start_time"])); endTimestamps.push(Date.parse(timers[i]["end_time"])); } @@ -237,7 +239,8 @@ async function startLoadTimers() { text.innerText += seconds.toString().padStart(2, '0'); const prog = document.getElementById(progList[i]); - prog.style.width = ((timeRemaining / (timers[i]["duration"] * 60)) * 100).toString() + "%"; + const totalTime = endTimestamps - startTimestamps; + prog.style.width = ((timeRemaining / (totalTime / 60000)) * 100).toString() + "%"; if (timeRemaining <= 0) { document.getElementById(`timer-btn-${i}`).disabled = false; |