From 754ddd11d49bc1777105a56b80f4b0006552aff6 Mon Sep 17 00:00:00 2001 From: ajdj100 Date: Tue, 16 Dec 2025 02:18:01 -0500 Subject: [PATCH] fixed calendar attendance grouping --- shared/types/calendar.ts | 2 +- ui/src/components/calendar/ViewCalendarEvent.vue | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/shared/types/calendar.ts b/shared/types/calendar.ts index 5a62a8b..6f31a03 100644 --- a/shared/types/calendar.ts +++ b/shared/types/calendar.ts @@ -26,7 +26,7 @@ export interface CalendarSignup { eventID: number; status: CalendarAttendance; member_name?: string; - member_unit?: string; + unit_name?: string; } export interface CalendarEventShort { diff --git a/ui/src/components/calendar/ViewCalendarEvent.vue b/ui/src/components/calendar/ViewCalendarEvent.vue index 838e8ce..1aab52c 100644 --- a/ui/src/components/calendar/ViewCalendarEvent.vue +++ b/ui/src/components/calendar/ViewCalendarEvent.vue @@ -104,11 +104,11 @@ const attendanceTab = ref<"Alpha" | "Echo" | "Other">("Alpha"); const attendanceList = computed(() => { let out: CalendarSignup[] = []; if (attendanceTab.value === 'Alpha') { - out = activeEvent.value.eventSignups?.filter((s) => s.member_unit === 'Alpha Company'); + out = activeEvent.value.eventSignups?.filter((s) => s.unit_name === 'Alpha Company'); } else if (attendanceTab.value === 'Echo') { - out = activeEvent.value.eventSignups?.filter((s) => s.member_unit === 'Echo Company') + out = activeEvent.value.eventSignups?.filter((s) => s.unit_name === 'Echo Company') } else { - out = activeEvent.value.eventSignups?.filter((s) => s.member_unit != 'Alpha Company' && s.member_unit != 'Echo Company') + out = activeEvent.value.eventSignups?.filter((s) => s.unit_name != 'Alpha Company' && s.unit_name != 'Echo Company') } const statusOrder: Record = { @@ -126,11 +126,11 @@ const attendanceCountsByGroup = computed(() => { const signups = activeEvent.value.eventSignups ?? []; return { - Alpha: signups.filter(s => s.member_unit === "Alpha Company").length, - Echo: signups.filter(s => s.member_unit === "Echo Company").length, + Alpha: signups.filter(s => s.unit_name === "Alpha Company").length, + Echo: signups.filter(s => s.unit_name === "Echo Company").length, Other: signups.filter(s => - s.member_unit !== "Alpha Company" && - s.member_unit !== "Echo Company" + s.unit_name !== "Alpha Company" && + s.unit_name !== "Echo Company" ).length, }; });