Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions src/lib/slot/Slot.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
export let day;
export let time;
export let forbiddenSlot;
export let exahmrooms;
export let maxSlots;
export let selectedExam;
export let selectedExamerID;
Expand Down Expand Up @@ -41,19 +42,7 @@
// calculateConflicts();
}

let exahm = [];

async function fetchEXaHMRooms() {
const response = await fetch('/api/plan/roomsForSlot', {
method: 'POST',
body: JSON.stringify({ day: day.number, time: time.number }),
headers: {
'content-type': 'application/json'
}
});
let data = await response.json();
exahm = data.roomsForSlot.exahmRooms;
}
let exahm = exahmrooms;

let conflicts = 0;

Expand Down Expand Up @@ -96,7 +85,6 @@

onMount(() => {
fetchExams();
fetchEXaHMRooms();
});

function forwardSelected(event) {
Expand Down
25 changes: 24 additions & 1 deletion src/routes/plan/exams/+page.server.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,20 @@ export async function load({ params }) {
slotNumber
}
}
roomsForSlots {
day
slot
rooms {
name
seats
handicap
lab
placesWithSocket
exahm
seb
needsRequest
}
}
}
`;

Expand Down Expand Up @@ -146,9 +160,18 @@ export async function load({ params }) {
}
}

let roomForSlotsMap = new Map();
if (semesterData.roomsForSlots) {
for (let slot of semesterData.roomsForSlots) {
const key = `${slot.day},${slot.slot}`;
roomForSlotsMap.set(key, slot.rooms);
}
}

return {
semesterConfig: semesterData.semesterConfig,
examsWithoutSlot: data.examsWithoutSlot,
globalSlotStatus: globalSlotStatus
globalSlotStatus: globalSlotStatus,
roomsForSlots: roomForSlotsMap
};
}
3 changes: 3 additions & 0 deletions src/routes/plan/exams/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,9 @@
{day}
{time}
forbiddenSlot={forbiddenSlot(day.number, time.number)}
exahmrooms={data.roomsForSlots
.get(`${day.number},${time.number}`)
.filter((r) => r.exahm)}
{maxSlots}
{selectedExam}
{selectedExamerID}
Expand Down