Skip to content

feat:global forbidden slots should be gray #31

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 should be gray #31

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
5 changes: 4 additions & 1 deletion src/lib/slot/Slot.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<script>
export let day;
export let time;
export let forbiddenSlot;
export let maxSlots;
export let selectedExam;
export let selectedExamerID;
Expand Down Expand Up @@ -125,7 +126,9 @@
</script>

<div class="flex justify-between">
<div class="badge gap-2 m-1">{mkDateShort(day.date)}, {time.start}</div>
{#if !forbiddenSlot}
<div class="badge gap-2 m-1">{mkDateShort(day.date)}, {time.start}</div>
{/if}
{#if exams.length > 0}
{#if conflicts > 0}
<div class="alert shadow-lg p-1 w-full">
Expand Down
19 changes: 10 additions & 9 deletions src/routes/plan/exams/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,14 @@
console.log('globalForbiddenSlot Zugriff', data.globalSlotStatus.get(key));
console.log('globalForbiddenSlot all', data.globalSlotStatus);
if (data.globalSlotStatus.get(key) === 'forbidden') {
return 'bg-red-500';
return 'bg-gray-400';
}
}

function forbiddenSlot(day, time) {
const key = `${day},${time}`;
return data.globalSlotStatus.get(key) === 'forbidden';
}
</script>

<div class="text-center m-2">
Expand Down Expand Up @@ -398,7 +403,7 @@
>
<thead class="border-dashed border-2 border-sky-500 bg-green-400">
<tr>
<th />
<th></th>
{#each data.semesterConfig.days as day}
<th class="border-dashed border-2 border-sky-500 object-center">
<div class="">
Expand All @@ -422,17 +427,13 @@
<td
class="align-top border-dashed border-2 border-sky-500 {statusColor(
slotsStatus[[day.number, time.number]]
)} "
)} {globalForbiddenSlot(day.number, time.number)}"
>
<div
class="{mucdaiSlotToShow[[day.number, time.number]]} {globalForbiddenSlot(
day.number,
time.number
)}"
>
<div class={mucdaiSlotToShow[[day.number, time.number]]}>
<Slot
{day}
{time}
forbiddenSlot={forbiddenSlot(day.number, time.number)}
{maxSlots}
{selectedExam}
{selectedExamerID}
Expand Down