ckaczor/HomeMonitor
1
0
Fork 0
mirror of https://github.com/ckaczor/HomeMonitor.git synced 2026-01-13 17:22:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Sort calendar entries by holiday then name

Browse Source
This commit is contained in:
Chris Kaczor
2024-12-19 18:46:28 +00:00
parent 8f8f4179f9
commit 327bb6f7b9
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
WebDisplay/src/pages/kiosk.vue
View File

@@ -58,16 +58,24 @@
const day = new Date(currentDay); const day = new Date(currentDay);
day.setDate(day.getDate() + i); day.setDate(day.getDate() + i);
const entries = upcoming.filter((entry) => { const entries = upcoming
const entryStart = startOfDay(entry.start); .filter((entry) => {
const entryEnd = endOfDay(entry.end); const entryStart = startOfDay(entry.start);
const entryEnd = endOfDay(entry.end);
if (entry.isAllDay) { if (entry.isAllDay) {
return day > entryStart && day < entryEnd; 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)); newCalendarDays.push(new CalendarDay(day, entries));
} }