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

Merge branch 'master' of github.com:ckaczor/HomeMonitor

Browse Source
This commit is contained in:
Chris Kaczor
2024-12-19 09:51:48 -05:00
parent 88cf5d1b83 28645d8bc3
commit 2c740dd604
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,7 @@
function loadCalendar() { function loadCalendar() {
const newCalendarDays = [] as CalendarDay[]; const newCalendarDays = [] as CalendarDay[];
calendarStore.getUpcoming(calendarDayCount).then((upcoming) => { calendarStore.getUpcoming(calendarDayCount, true).then((upcoming) => {
const currentDay = startOfDay(currentTime.value); const currentDay = startOfDay(currentTime.value);
for (let i = 0; i < calendarDayCount; i++) { for (let i = 0; i < calendarDayCount; i++) {
@@ -78,7 +78,7 @@
loadCalendar(); loadCalendar();
setInterval(() => currentTime.value = new Date(), 1000); setInterval(() => currentTime.value = new Date(), 1000);
setInterval(() => loadCalendar(), 60000); setInterval(() => loadCalendar(), 30 * 60 * 1000);
</script> </script>
<template> <template>

4
WebDisplay/src/stores/calendarStore.ts
View File

@@ -8,8 +8,8 @@ export const useCalendarStore = defineStore('calendar', {
return {}; return {};
}, },
actions: { actions: {
async getUpcoming(days: number): Promise<CalendarEntry[]> { async getUpcoming(days: number, includeHolidays: boolean): Promise<CalendarEntry[]> {
const response = await axios.get<CalendarEntry[]>(Environment.getUrlPrefix() + `:8081/api/calendar/calendar/upcoming?days=${days}`); const response = await axios.get<CalendarEntry[]>(Environment.getUrlPrefix() + `:8081/api/calendar/calendar/upcoming?days=${days}&includeHolidays=${includeHolidays}`);
return response.data; return response.data;
} }