Make getRemoteEvents inclusive of the last day, by adding one to the …

…`to` date. (#242)
thunderbird · Jan 23, 2024 · 022675a · 022675a
1 parent 8f5b75e
commit 022675a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/frontend/src/views/CalendarView.vue b/frontend/src/views/CalendarView.vue
@@ -212,9 +212,12 @@ const calendarEvents = ref([]);
 const hideUntilRefreshed = ref(true);
 
 const getRemoteEvents = async (from, to) => {
+  // Most calendar impl are non-inclusive of the last day, so just add one to the day.
+  const inclusiveTo = dj(to).add(1, 'day').format('YYYY-MM-DD');
+
   calendarEvents.value = [];
   await Promise.all(calendarStore.connectedCalendars.map(async (calendar) => {
-    const { data } = await call(`rmt/cal/${calendar.id}/${from}/${to}`).get().json();
+    const { data } = await call(`rmt/cal/${calendar.id}/${from}/${inclusiveTo}`).get().json();
     if (Array.isArray(data.value)) {
       calendarEvents.value.push(...data.value.map((e) => ({ ...e, duration: dj(e.end).diff(dj(e.start), 'minutes') })));
     }

diff --git a/frontend/src/views/ScheduleView.vue b/frontend/src/views/ScheduleView.vue
@@ -144,9 +144,12 @@ const dateNav = (unit = 'auto', forward = true) => {
 // get remote calendar data for current year
 const calendarEvents = ref([]);
 const getRemoteEvents = async (from, to) => {
+  // Most calendar impl are non-inclusive of the last day, so just add one to the day.
+  const inclusiveTo = dj(to).add(1, 'day').format('YYYY-MM-DD');
+
   calendarEvents.value = [];
   await Promise.all(calendarStore.connectedCalendars.map(async (calendar) => {
-    const { data } = await call(`rmt/cal/${calendar.id}/${from}/${to}`).get().json();
+    const { data } = await call(`rmt/cal/${calendar.id}/${from}/${inclusiveTo}`).get().json();
     if (Array.isArray(data.value)) {
       calendarEvents.value.push(...data.value.map((e) => ({ ...e, duration: dj(e.end).diff(dj(e.start), 'minutes') })));
     }