diff --git a/WebDisplay/src/components/NationalDays.vue b/WebDisplay/src/components/NationalDays.vue index b84386e..41fe2a5 100644 --- a/WebDisplay/src/components/NationalDays.vue +++ b/WebDisplay/src/components/NationalDays.vue @@ -4,6 +4,9 @@ import { setNextDayTimer } from '@/nextDayTimer'; import NationalDayEntry from '@/models/calendar/national-day'; + const dialog = ref(false); + const selectedNationalDay = ref({} as NationalDayEntry); + const calendarStore = useCalendarStore(); const nationalDays = ref([] as NationalDayEntry[]); @@ -11,7 +14,7 @@ function loadNationalDays() { calendarStore.getNationalDays().then((data) => { - nationalDays.value = data.sort((a, b) => a.name.localeCompare(b.name)); + nationalDays.value = data; nationalDaysReady.value = true; @@ -19,21 +22,50 @@ }); } + function onNationalDayClick(nationalDay: NationalDayEntry) { + selectedNationalDay.value = nationalDay; + dialog.value = true; + } + loadNationalDays(); diff --git a/WebDisplay/src/models/calendar/national-day.ts b/WebDisplay/src/models/calendar/national-day.ts index 5d5947b..585ed30 100644 --- a/WebDisplay/src/models/calendar/national-day.ts +++ b/WebDisplay/src/models/calendar/national-day.ts @@ -1,6 +1,6 @@ export default interface NationalDayEntry { name: string; url: string; - except: string; + excerpt: string; type: string; } diff --git a/WebDisplay/src/pages/kiosk.vue b/WebDisplay/src/pages/kiosk.vue index f042cf5..0466ea3 100644 --- a/WebDisplay/src/pages/kiosk.vue +++ b/WebDisplay/src/pages/kiosk.vue @@ -58,7 +58,7 @@
- {{ weatherStore.current?.Temperature?.toFixed(0) + '°F' }} + {{ weatherStore.current?.Temperature?.toFixed(0) + '°' }}