Skip to content

feat: global forbidden slots #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
obcode merged 1 commit into from
May 9, 2025
Merged

feat: global forbidden slots #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/lib/examsInPlan/SlotExam.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,13 +483,13 @@
<div class="badge badge-error">online</div>
{/if}
{#if exam.constraints && exam.constraints.roomConstraints && exam.constraints.roomConstraints.exahm}
<div class="badge badge-error">EXaHM</div>
<div class="badge badge-error rounded-lg border-black">EXaHM</div>
{/if}
{#if exam.constraints && exam.constraints.roomConstraints && exam.constraints.roomConstraints.seb}
<div class="badge badge-error">S.E.B.</div>
<div class="badge badge-error rounded-lg border-black">SEB</div>
{/if}
{#if exam.constraints != null && exam.constraints.sameSlot != null && exam.constraints.sameSlot.length > 0}
<div class="badge badge-warning">sameSlot</div>
<div class="badge badge-warning rounded-lg border-black">sameSlot</div>
{/if}
{/if}
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/lib/slot/Slot.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,15 @@
{/if}
<div class="flex justify-end">
{#if count > 0}
<div class="badge {badgeColor(count)} gap-2 m-1">{count}</div>
<div class="badge {badgeColor(count)} gap-2 m-1 rounded-lg border-black">{count}</div>
{/if}
</div>
{/if}
</div>
{#if showOnlyEXaHMRooms}
<div>
{#each exahm as room}
<div class="badge badge-warning">{room.name}</div>
<div class="badge badge-warning m-1 rounded-lg border-black">{room.name}</div>
{/each}
</div>
{/if}
Expand Down
28 changes: 27 additions & 1 deletion src/routes/plan/exams/+page.server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ export async function load({ params }) {
number
start
}
forbiddenSlots {
dayNumber
slotNumber
}
}
}
`;
Expand Down Expand Up @@ -124,8 +128,30 @@ export async function load({ params }) {

const data = await request('http://localhost:8080/query', examsWithoutSlotQuery);

let semesterConfig = semesterData.semesterConfig;

let globalSlotStatus = new Map();

for (let day of semesterConfig.days) {
for (let time of semesterConfig.starttimes) {
const key = `${day.number},${time.number}`;
globalSlotStatus.set(key, 'okay');
}
}

if (semesterConfig.forbiddenSlots) {
console.log('forbiddenSlots', semesterConfig.forbiddenSlots);
for (let slot of semesterConfig.forbiddenSlots) {
const key = `${slot.dayNumber},${slot.slotNumber}`;
globalSlotStatus.set(key, 'forbidden');
}
}

console.log('globalSlotStatus', globalSlotStatus);

return {
semesterConfig: semesterData.semesterConfig,
examsWithoutSlot: data.examsWithoutSlot
examsWithoutSlot: data.examsWithoutSlot,
globalSlotStatus: globalSlotStatus
};
}
22 changes: 20 additions & 2 deletions src/routes/plan/exams/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,16 @@
let data = await response.json();
return data.conflictingAncodes;
}

function globalForbiddenSlot(day, time) {
const key = `${day},${time}`;
console.log('globalForbiddenSlot', day, time, key);
console.log('globalForbiddenSlot Zugriff', data.globalSlotStatus.get(key));
console.log('globalForbiddenSlot all', data.globalSlotStatus);
if (data.globalSlotStatus.get(key) === 'forbidden') {
return 'bg-red-500';
}
}
</script>

<div class="text-center m-2">
Expand Down Expand Up @@ -410,8 +420,16 @@
</td>
{#each data.semesterConfig.days as day}
<td
class="align-top border-dashed border-2 border-sky-500 {statusColor(slotsStatus[[day.number, time.number]])}">
<div class="{mucdaiSlotToShow[[day.number, time.number]]}">
class="align-top border-dashed border-2 border-sky-500 {statusColor(
slotsStatus[[day.number, time.number]]
)} "
>
<div
class="{mucdaiSlotToShow[[day.number, time.number]]} {globalForbiddenSlot(
day.number,
time.number
)}"
>
<Slot
{day}
{time}
Expand Down