diff --git a/api/src/services/calendarService.ts b/api/src/services/calendarService.ts index 2c672a6..f91e02c 100644 --- a/api/src/services/calendarService.ts +++ b/api/src/services/calendarService.ts @@ -65,7 +65,7 @@ export async function cancelEvent(eventID: number) { export async function getShortEventsInRange(startDate: string, endDate: string): Promise { const sql = ` - SELECT id, name, start, end, color + SELECT id, name, start, end, color, cancelled FROM calendar_events WHERE start BETWEEN ? AND ? ORDER BY start ASC diff --git a/shared/types/calendar.ts b/shared/types/calendar.ts index 2f9b7b7..184abaf 100644 --- a/shared/types/calendar.ts +++ b/shared/types/calendar.ts @@ -34,4 +34,5 @@ export interface CalendarEventShort { start: Date; end: Date; color: string; + cancelled: boolean; } \ No newline at end of file diff --git a/ui/src/components/calendar/ViewCalendarEvent.vue b/ui/src/components/calendar/ViewCalendarEvent.vue index 4d6509f..1d67e26 100644 --- a/ui/src/components/calendar/ViewCalendarEvent.vue +++ b/ui/src/components/calendar/ViewCalendarEvent.vue @@ -1,6 +1,6 @@