public/owltide
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages 1 Wiki Activity Actions

Add account based filtering of the schedule
Some checks failed
/ build (push) Has been cancelled
Details
/ deploy (push) Has been cancelled
Details

Browse source 
Implement personal filtering of the schedule based on events marked as
being interested in and filtering based on assigned crew for events.
This commit is contained in:
Hornwitser 2025-03-15 22:47:32 +01:00
parent 89b1d2a547
commit 399a4d2ca5
6 changed files with 197 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

70
components/Timetable.vue
View file

@ -56,36 +56,40 @@
</tr>
</thead>
<tbody>
<tr v-for="location in schedule.locations" :key="location.id">
<th>{{ location.name }}</th>
<td
v-for="row, index in locationRows.get(location.id)"
:key="index"
:colSpan="row.span"
:class='{"event": row.slots.size, "crew": row.crew }'
:title="row.title"
>
{{ row.title }}
</td>
</tr>
<template v-if="schedule.roles">
<tr>
<th>Shifts</th>
<td :colSpan="totalColumns"></td>
</tr>
<tr v-for="role in schedule.roles" :key="role.id">
<th>{{ role.name }}</th>
<template v-for="location in schedule.locations" :key="location.id">
<tr v-if="locationRows.has(location.id)">
<th>{{ location.name }}</th>
<td
v-for="row, index in roleRows.get(role.id)"
v-for="row, index in locationRows.get(location.id)"
:key="index"
:colSpan="row.span"
:class='{"shift": row.slots.size }'
:class='{"event": row.slots.size, "crew": row.crew }'
:title="row.title"
>
{{ row.title }}
</td>
</tr>
</template>
<template v-if="schedule.roles">
<tr>
<th>Shifts</th>
<td :colSpan="totalColumns"></td>
</tr>
<template v-for="role in schedule.roles" :key="role.id">
<tr v-if="roleRows.has(role.id)">
<th>{{ role.name }}</th>
<td
v-for="row, index in roleRows.get(role.id)"
:key="index"
:colSpan="row.span"
:class='{"shift": row.slots.size }'
:title="row.title"
>
{{ row.title }}
</td>
</tr>
</template>
</template>
</tbody>
</table>
</figure>
@ -129,9 +133,9 @@ type Stretch = {
spans: Span[];
}
function* edgesFromEvents(events: Iterable<ScheduleEvent>): Generator<Edge> {
function* edgesFromEvents(events: Iterable<ScheduleEvent>, filter = (slot: TimeSlot) => true): Generator<Edge> {
for (const event of events) {
for (const slot of event.slots) {
for (const slot of event.slots.filter(filter)) {
if (slot.start > slot.end) {
throw new Error(`Slot ${slot.id} ends before it starts.`);
}
@ -141,9 +145,9 @@ function* edgesFromEvents(events: Iterable<ScheduleEvent>): Generator<Edge> {
}
}
function* edgesFromShifts(shifts: Iterable<Shift>): Generator<Edge> {
function* edgesFromShifts(shifts: Iterable<Shift>, filter = (slot: ShiftSlot) => true): Generator<Edge> {
for (const shift of shifts) {
for (const slot of shift.slots) {
for (const slot of shift.slots.filter(filter)) {
if (slot.start > slot.end) {
throw new Error(`Slot ${slot.id} ends before it starts.`);
}
@ -470,19 +474,27 @@ function tableElementsFromStretches(
columnGroups,
dayHeaders: dayHeaders.filter(day => day.span),
hourHeaders: hourHeaders.filter(hour => hour.span),
locationRows: new Map([...locationRows].map(([id, cells]) => [id, cells.filter(cell => cell.span)])),
roleRows: new Map([...roleRows].map(([id, cells]) => [id, cells.filter(cell => cell.span)])),
locationRows: new Map([...locationRows]
.filter(([_, cells]) => cells.some(cell => cell.slots.size))
.map(([id, cells]) => [id, cells.filter(cell => cell.span)]))
,
roleRows: new Map([...roleRows]
.filter(([_, cells]) => cells.some(cell => cell.slots.size))
.map(([id, cells]) => [id, cells.filter(cell => cell.span)]))
,
eventBySlotId,
};
}
const props = defineProps<{
schedule: Schedule,
eventSlotFilter?: (slot: TimeSlot) => boolean,
shiftSlotFilter?: (slot: ShiftSlot) => boolean,
}>();
const schedule = computed(() => props.schedule);
const junctions = computed(() => junctionsFromEdges([
...edgesFromEvents(schedule.value.events),
...edgesFromShifts(schedule.value.rota ?? []),
...edgesFromEvents(schedule.value.events, props.eventSlotFilter),
...edgesFromShifts(schedule.value.rota ?? [], props.shiftSlotFilter),
]));
const stretches = computed(() => [
...stretchesFromSpans(