From c3d9e44f5201c25f79787d9ef9185508d97adf03 Mon Sep 17 00:00:00 2001 From: Jannis Berndt Date: Mon, 2 May 2022 22:01:31 +0200 Subject: [PATCH 1/2] Make last saved counter less agressive --- evap/student/templates/student_vote.html | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/evap/student/templates/student_vote.html b/evap/student/templates/student_vote.html index 72cfd9d9fc..ba9b773216 100644 --- a/evap/student/templates/student_vote.html +++ b/evap/student/templates/student_vote.html @@ -208,14 +208,18 @@

{{ evaluation.full_name }} ({{ evaluation.course.semester.name const lastSavedLabel = $('#last-saved'); if (localStorage.getItem(lastSavedStorageKey) !== null) { const lastSavedDate = new Date(localStorage.getItem(lastSavedStorageKey)); - const delta = Math.round((timeNow - lastSavedDate) / 1000) - const languageCode = "{{ LANGUAGE_CODE }}" - const relativeTimeFormat = new Intl.RelativeTimeFormat(languageCode) + const delta = Math.round((timeNow - lastSavedDate) / 1000); + const languageCode = "{{ LANGUAGE_CODE }}"; + const relativeTimeFormat = new Intl.RelativeTimeFormat(languageCode); let timeStamp = "{% trans 'unknown' %}" if (delta < 3) { timeStamp = "{% trans 'just now' %}"; + } else if (delta < 10) { + timeStamp = "{% trans 'less than 10 seconds ago' %}"; + } else if (delta < 30) { + timeStamp = "{% trans 'less than 30 seconds ago' %}"; } else if (delta < 60) { - timeStamp = relativeTimeFormat.format(-delta, 'seconds'); + timeStamp = "{% trans 'less than 1 minute ago' %}"; } else if (delta < 60 * 30) { timeStamp = relativeTimeFormat.format(-Math.round(delta / 60), 'minutes'); } else if (delta < 60 * 60 * 12) { From f63d02a878cd6e5ebe3021fe076f7116021e941a Mon Sep 17 00:00:00 2001 From: Jannis Berndt Date: Mon, 2 May 2022 22:08:14 +0200 Subject: [PATCH 2/2] Remove useless default --- evap/student/templates/student_vote.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evap/student/templates/student_vote.html b/evap/student/templates/student_vote.html index ba9b773216..aeee87164e 100644 --- a/evap/student/templates/student_vote.html +++ b/evap/student/templates/student_vote.html @@ -211,7 +211,7 @@

{{ evaluation.full_name }} ({{ evaluation.course.semester.name const delta = Math.round((timeNow - lastSavedDate) / 1000); const languageCode = "{{ LANGUAGE_CODE }}"; const relativeTimeFormat = new Intl.RelativeTimeFormat(languageCode); - let timeStamp = "{% trans 'unknown' %}" + let timeStamp; if (delta < 3) { timeStamp = "{% trans 'just now' %}"; } else if (delta < 10) { @@ -246,7 +246,7 @@

{{ evaluation.full_name }} ({{ evaluation.course.semester.name sisyphus.saveAllData(); // Initialize lastSavedLabel and update it every second - updateLastSavedLabel() + updateLastSavedLabel(); setInterval(updateLastSavedLabel, 1000); initTextAnswerWarnings(document.querySelectorAll("#student-vote-form textarea"), JSON.parse($("#text-answer-warnings").text()));