From 4287f3a92160cbe069bc63cd2adf8c9de96c024b Mon Sep 17 00:00:00 2001 From: Gabriele Monaco Date: Sun, 2 Jul 2023 19:37:54 +0200 Subject: [PATCH] agenda: Fixed "Today" and "Yesterday" wrongly displayed for allDay events on some time zones --- apps/agenda/ChangeLog | 1 + apps/agenda/agenda.js | 11 +++++------ apps/agenda/metadata.json | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/agenda/ChangeLog b/apps/agenda/ChangeLog index 9e7151e1ef..8368106384 100644 --- a/apps/agenda/ChangeLog +++ b/apps/agenda/ChangeLog @@ -13,3 +13,4 @@ Added dynamic, short and range fields to clkinfo 0.12: Added color field and updating clkinfo periodically (running events) 0.13: Show day of the week in date +0.14: Fixed "Today" and "Yesterday" wrongly displayed for allDay events on some time zones diff --git a/apps/agenda/agenda.js b/apps/agenda/agenda.js index 6d2b783fd1..814525a2e5 100644 --- a/apps/agenda/agenda.js +++ b/apps/agenda/agenda.js @@ -38,13 +38,12 @@ function formatDay(date) { if (!settings.useToday) { return formattedDate; } - const dateformatted = date.toISOString().split('T')[0]; // yyyy-mm-dd - const today = new Date(Date.now()).toISOString().split('T')[0]; // yyyy-mm-dd - if (dateformatted == today) { + const today = new Date(Date.now()); + if (date.getDay() == today.getDay() && date.getMonth() == today.getMonth()) return /*LANG*/"Today "; - } else { - const tomorrow = new Date(Date.now() + 86400 * 1000).toISOString().split('T')[0]; // yyyy-mm-dd - if (dateformatted == tomorrow) { + else { + const tomorrow = new Date(Date.now() + 86400 * 1000); + if (date.getDay() == tomorrow.getDay() && date.getMonth() == tomorrow.getMonth()) { return /*LANG*/"Tomorrow "; } return formattedDate; diff --git a/apps/agenda/metadata.json b/apps/agenda/metadata.json index 737568cb5c..2d58641454 100644 --- a/apps/agenda/metadata.json +++ b/apps/agenda/metadata.json @@ -1,7 +1,7 @@ { "id": "agenda", "name": "Agenda", - "version": "0.13", + "version": "0.14", "description": "Simple agenda", "icon": "agenda.png", "screenshots": [{"url":"screenshot_agenda_overview.png"}, {"url":"screenshot_agenda_event1.png"}, {"url":"screenshot_agenda_event2.png"}],