From 344b9acbf812b8f6012a1c946f62e346dcf81d65 Mon Sep 17 00:00:00 2001
From: Hornwitser <code@hornwitser.no>
Date: Mon, 30 Jun 2025 16:39:51 +0200
Subject: [PATCH] Render events without a location

Show events that have no locations set. This is useful when drafting a
schedule and having events who's location have yet to be decided.
---
 components/Timetable.vue | 56 ++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/components/Timetable.vue b/components/Timetable.vue
index cb0fc15..e34a06a 100644
--- a/components/Timetable.vue
+++ b/components/Timetable.vue
@@ -82,17 +82,16 @@
 						</div>
 					</td>
 				</tr>
-				<template v-for="location in schedule.locations.values()" :key="location.id">
+				<template v-for="[id, locationGroup] in locationGroups" :key="id">
 					<tr
-						v-if="locationGroups.has(location.id)"
-						v-for="row, index in locationGroups.get(location.id)"
+						v-for="row, index in locationGroup"
 						:key="index"
 					>
 						<th
 							v-if="index === 0"
-							:rowSpan="locationGroups.get(location.id)!.length"
+							:rowSpan="locationGroup.length"
 						>
-							{{ location.name }}
+							{{ schedule.locations.get(id!)?.name }}
 						</th>
 						<td
 							v-for="cell, index in row"
@@ -161,7 +160,7 @@ type Junction = { ts: number, edges: Edge[] };
 type Span = {
 	start: Junction;
 	end: Junction,
-	locations: Map<number, Set<ClientScheduleEventSlot>>,
+	locations: Map<number | undefined, Set<ClientScheduleEventSlot>>,
 	roles: Map<number | undefined, Set<ClientScheduleShiftSlot>>,
 };
 
@@ -234,9 +233,10 @@ function* spansFromJunctions(
 	locations: ClientMap<ClientScheduleLocation>,
 	roles: ClientMap<ClientScheduleRole>,
 ): Generator<Span> {
-	const activeLocations = new Map(
-		[...locations.keys()].map(id => [id, new Set<ClientScheduleEventSlot>()])
+	const activeLocations = new Map<number | undefined, Set<ClientScheduleEventSlot>>(
+		[...locations.keys()].map(id => [id, new Set()])
 	);
+	activeLocations.set(undefined, new Set());
 	const activeRoles = new Map<number | undefined, Set<ClientScheduleShiftSlot>>(
 		[...roles.keys()].map(id => [id, new Set()]),
 	);
@@ -246,7 +246,10 @@ function* spansFromJunctions(
 			if (edge.type === "start") {
 				if (edge.source === "event") {
 					for (const locationId of edge.slot.locationIds) {
-						activeLocations.get(locationId)?.add(edge.slot)
+						activeLocations.get(locationId)?.add(edge.slot);
+					}
+					if (edge.slot.locationIds.size === 0) {
+						activeLocations.get(undefined)?.add(edge.slot);
 					}
 				} else if (edge.source === "shift") {
 					activeRoles.get(edge.roleId)?.add(edge.slot);
@@ -271,7 +274,10 @@ function* spansFromJunctions(
 			if (edge.type === "end") {
 				if (edge.source === "event") {
 					for (const locationId of edge.slot.locationIds) {
-						activeLocations.get(locationId)?.delete(edge.slot)
+						activeLocations.get(locationId)?.delete(edge.slot);
+					}
+					if (edge.slot.locationIds.size === 0) {
+						activeLocations.get(undefined)?.delete(edge.slot);
 					}
 				} else if (edge.source === "shift") {
 					activeRoles.get(edge.roleId)?.delete(edge.slot);
@@ -402,7 +408,8 @@ function tableElementsFromStretches(
 	const columnGroups: ColumnGroup[] = [];
 	const dayHeaders: DayHead[] = [];
 	const hourHeaders: HourHead[]= [];
-	const locationGroups = new Map<number, LocationRow[]>([...locations.keys()].map(id => [id, []]));
+	const locationGroups = new Map<number | undefined, LocationRow[]>([...locations.keys()].map(id => [id, []]));
+	locationGroups.set(undefined, []);
 	const roleGroups = new Map<number | undefined, RoleRow[]>([...roles.keys()].map(id => [id, []]));
 	roleGroups.set(undefined, []);
 	const eventBySlotId = new Map([...events.values()].flatMap(event => [...event.slots.values()].map(slot => [slot.id, event])));
@@ -418,7 +425,7 @@ function tableElementsFromStretches(
 	function startHour(isBreak: boolean, content?: string, isDayShift = false) {
 		hourHeaders.push({ span: 0, isBreak, isDayShift, content })
 	}
-	function startLocation(id: number, isBreak: boolean, newSlots = new Set<ClientScheduleEventSlot>()) {
+	function startLocation(id: number | undefined, isBreak: boolean, newSlots = new Set<ClientScheduleEventSlot>()) {
 		const group = locationGroups.get(id)!;
 		// Remove all slots that are no longer in the new slots.
 		for (const row of group) {
@@ -476,9 +483,8 @@ function tableElementsFromStretches(
 		columnGroups[columnGroups.length - 1].cols.push({ minutes })
 		dayHeaders[dayHeaders.length - 1].span += 1;
 		hourHeaders[hourHeaders.length - 1].span += 1;
-		for(const location of locations.values()) {
-			const group = locationGroups.get(location.id)!;
-			for (const row of group) {
+		for (const locationGroup of locationGroups.values()) {
+			for (const row of locationGroup) {
 				row[row.length - 1].span += 1;
 			}
 		}
@@ -497,8 +503,8 @@ function tableElementsFromStretches(
 			startColumnGroup(stretch.start, stretch.end, (stretch.end - stretch.start) / oneHourMs, false);
 			startDay(false, startDate.toFormat("yyyy-LL-dd"));
 			startHour(false, startDate.toFormat("HH:mm"));
-			for (const location of locations.values()) {
-				startLocation(location.id, false);
+			for (const locationId of locationGroups.keys()) {
+				startLocation(locationId, false);
 			}
 			for (const roleId of roleGroups.keys()) {
 				startRole(roleId, false);
@@ -511,8 +517,8 @@ function tableElementsFromStretches(
 			if (!sameDay)
 				startDay(true);
 			startHour(true, "break");
-			for(const location of locations.values()) {
-				startLocation(location.id, true);
+			for (const locationId of locationGroups.keys()) {
+				startLocation(locationId, true);
 			}
 			for (const roleId of roleGroups.keys()) {
 				startRole(roleId, true);
@@ -523,8 +529,8 @@ function tableElementsFromStretches(
 			if (!sameDay)
 				startDay(false, dayName);
 			startHour(false, startDate.toFormat("HH:mm"));
-			for(const location of locations.values()) {
-				startLocation(location.id, false);
+			for (const locationId of locationGroups.keys()) {
+				startLocation(locationId, false);
 			}
 			for (const roleId of roleGroups.keys()) {
 				startRole(roleId, false);
@@ -536,12 +542,12 @@ function tableElementsFromStretches(
 				const end = cutSpan.end.ts;
 				const durationMs = end - cutSpan.start.ts;
 
-				for (const location of locations.values()) {
-					const slots = cutSpan.locations.get(location.id) ?? new Set();
-					const group = locationGroups.get(location.id)!;
+				for (const locationId of locationGroups.keys()) {
+					const slots = cutSpan.locations.get(locationId) ?? new Set();
+					const group = locationGroups.get(locationId)!;
 					const existing = new Set(group.map(row => row[row.length - 1].slot).filter(slot => slot));
 					if (!setEquals(slots, existing)) {
-						startLocation(location.id, false, slots)
+						startLocation(locationId, false, slots);
 					}
 				}
 				for (const roleId of roleGroups.keys()) {