17th-Ranger-Battalion-ORG/milsim-site-v4
8
1
Fork 0
Code Issues 20 Pull Requests Actions 4 Packages Projects Releases 8 Wiki Activity

Calendar-attendance-fix #108

Merged
Ajdj100 merged 3 commits from Calendar-attendance-fix into main 2025-12-16 01:31:28 -06:00
Conversation 0 Commits 3 Files Changed 3 +8 -8
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 754ddd11d4 - Show all commits

2
shared/types/calendar.ts
View File

@@ -26,7 +26,7 @@ export interface CalendarSignup {
eventID: number; eventID: number;
status: CalendarAttendance; status: CalendarAttendance;
member_name?: string; member_name?: string;
member_unit?: string; unit_name?: string;
} }
export interface CalendarEventShort { export interface CalendarEventShort {

14
ui/src/components/calendar/ViewCalendarEvent.vue
View File

@@ -104,11 +104,11 @@ const attendanceTab = ref<"Alpha" | "Echo" | "Other">("Alpha");
const attendanceList = computed<CalendarSignup[]>(() => { const attendanceList = computed<CalendarSignup[]>(() => {
let out: CalendarSignup[] = []; let out: CalendarSignup[] = [];
if (attendanceTab.value === 'Alpha') { 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') { } 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 { } 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<CalendarAttendance, number> = { const statusOrder: Record<CalendarAttendance, number> = {
@@ -126,11 +126,11 @@ const attendanceCountsByGroup = computed(() => {
const signups = activeEvent.value.eventSignups ?? []; const signups = activeEvent.value.eventSignups ?? [];
return { return {
Alpha: signups.filter(s => s.member_unit === "Alpha Company").length, Alpha: signups.filter(s => s.unit_name === "Alpha Company").length,
Echo: signups.filter(s => s.member_unit === "Echo Company").length, Echo: signups.filter(s => s.unit_name === "Echo Company").length,
Other: signups.filter(s => Other: signups.filter(s =>
s.member_unit !== "Alpha Company" && s.unit_name !== "Alpha Company" &&
s.member_unit !== "Echo Company" s.unit_name !== "Echo Company"
).length, ).length,
}; };
}); });