From 221ebf1c2b97f8e4357c1848774d372f32173795 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 16 Dec 2020 23:49:50 +0100 Subject: [PATCH] fixed bug --- logs/Voting.log | 6 ++++++ .../templates/errors/alreadysubmittedcandidates.html | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/logs/Voting.log b/logs/Voting.log index 78fdf4b..69676ff 100644 --- a/logs/Voting.log +++ b/logs/Voting.log @@ -3849,3 +3849,9 @@ java.lang.NullPointerException: null 2020-12-16 23:40:06,992 WARN [http-nio-8000-exec-10] simon.bussmann@adolfinum.de has already submitted its candidates 2020-12-16 23:41:01,246 WARN [http-nio-8000-exec-2] simon.bussmann@adolfinum.de 2020-12-16 23:41:01,250 WARN [http-nio-8000-exec-2] simon.bussmann@adolfinum.de has already submitted its candidates +2020-12-16 23:46:16,518 WARN [http-nio-8000-exec-7] simon.bussmann@adolfinum.de +2020-12-16 23:46:16,522 WARN [http-nio-8000-exec-7] simon.bussmann@adolfinum.de has already submitted its candidates +2020-12-16 23:47:29,293 WARN [http-nio-8000-exec-10] simon.bussmann@adolfinum.de +2020-12-16 23:47:29,297 WARN [http-nio-8000-exec-10] simon.bussmann@adolfinum.de has already submitted its candidates +2020-12-16 23:49:09,880 WARN [http-nio-8000-exec-3] simon.bussmann@adolfinum.de +2020-12-16 23:49:09,884 WARN [http-nio-8000-exec-3] simon.bussmann@adolfinum.de has already submitted its candidates diff --git a/src/main/resources/templates/errors/alreadysubmittedcandidates.html b/src/main/resources/templates/errors/alreadysubmittedcandidates.html index c7749b8..99868c8 100644 --- a/src/main/resources/templates/errors/alreadysubmittedcandidates.html +++ b/src/main/resources/templates/errors/alreadysubmittedcandidates.html @@ -31,11 +31,13 @@ function showTimeRemaining() { var dateNow = Date.now(); - var days = Math.floor((dateFuture - dateNow) / (1000 * 60 * 60 * 24)) - var hours = Math.floor(((dateFuture - dateNow) - days * 1000 * 60 * 60 * 24) / (1000 * 60 * 60)) - var mins = Math.floor(((dateFuture - dateNow) - days * 1000 * 60 * 60 * 24 - hours * 1000 * 60 * 60) / (1000 * 60)) - var secs = Math.floor(((dateFuture - dateNow) - days * 1000 * 60 * 60 * 24 - hours * 1000 * 60 * 60 - mins * 1000 * 60) / 1000) + var days = Math.floor((dateFuture - dateNow) / (1000 * 60 * 60 * 24)); + var hours = Math.floor(((dateFuture - dateNow) - days * 1000 * 60 * 60 * 24) / (1000 * 60 * 60)); + var mins = Math.floor(((dateFuture - dateNow) - days * 1000 * 60 * 60 * 24 - hours * 1000 * 60 * 60) / (1000 * 60)); + var secs = Math.floor(((dateFuture - dateNow) - days * 1000 * 60 * 60 * 24 - hours * 1000 * 60 * 60 - mins * 1000 * 60) / 1000); document.getElementById("time_remain").innerHTML = "Nächste Abstimmung in: " + days + "D " + hours + ":" + mins + ":" + secs; + console.log("Nächste Abstimmung in: " + days + "D " + hours + ":" + mins + ":" + secs); + }