From 327bb6f7b9819f74330e060ca0ff290df98e7b9f Mon Sep 17 00:00:00 2001 From: Chris Kaczor Date: Thu, 19 Dec 2024 18:46:28 +0000 Subject: [PATCH] Sort calendar entries by holiday then name --- WebDisplay/src/pages/kiosk.vue | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/WebDisplay/src/pages/kiosk.vue b/WebDisplay/src/pages/kiosk.vue index 04b4ecb..eb873f6 100644 --- a/WebDisplay/src/pages/kiosk.vue +++ b/WebDisplay/src/pages/kiosk.vue @@ -58,16 +58,24 @@ const day = new Date(currentDay); day.setDate(day.getDate() + i); - const entries = upcoming.filter((entry) => { - const entryStart = startOfDay(entry.start); - const entryEnd = endOfDay(entry.end); + const entries = upcoming + .filter((entry) => { + const entryStart = startOfDay(entry.start); + const entryEnd = endOfDay(entry.end); - if (entry.isAllDay) { - return day > entryStart && day < entryEnd; - } + if (entry.isAllDay) { + return day > entryStart && day < entryEnd; + } - return day >= entryStart && day <= entryEnd; - }); + return day >= entryStart && day <= entryEnd; + }) + .sort((a, b) => { + if (a.isHoliday == b.isHoliday) { + return a.summary.localeCompare(b.summary); + } + + return (b.isHoliday ? 1 : 0) - (a.isHoliday ? 1 : 0); + }); newCalendarDays.push(new CalendarDay(day, entries)); }