From 29a688d3f870066a2ba8ac7b65f82e72dc82f93f Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Tue, 1 Feb 2022 09:40:42 +0100 Subject: [PATCH 1/2] MOBILE-3909 calendar: Remove decimals from migrated reminders --- src/addons/calendar/services/database/calendar.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/addons/calendar/services/database/calendar.ts b/src/addons/calendar/services/database/calendar.ts index c7591fa5c..a8cc4db50 100644 --- a/src/addons/calendar/services/database/calendar.ts +++ b/src/addons/calendar/services/database/calendar.ts @@ -248,7 +248,8 @@ export const CALENDAR_SITE_SCHEMA: CoreSiteSchema = { return; } else { - record.time = events[record.eventid].timestart - record.time; + // Remove seconds from the old reminder, it could include seconds by mistake. + record.time = events[record.eventid].timestart - Math.floor(record.time / 60) * 60; } return db.insertRecord(REMINDERS_TABLE, record); From 97c49cb04235ec6a20586259027fdf50ce47de84 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Tue, 1 Feb 2022 09:50:26 +0100 Subject: [PATCH 2/2] MOBILE-3909 calendar: Allow deleting past reminders --- src/addons/calendar/pages/event/event.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/addons/calendar/pages/event/event.html b/src/addons/calendar/pages/event/event.html index bcdd07a0e..2719ab3c4 100644 --- a/src/addons/calendar/pages/event/event.html +++ b/src/addons/calendar/pages/event/event.html @@ -140,7 +140,7 @@

{{ reminder.label }}

+ slot="end">