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
18 changes: 8 additions & 10 deletions schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,8 @@ type Query {
primussExams: [PrimussExamByProgram]
primussExamsForAnCode(ancode: Int!): [PrimussExam!]
rooms: [Room!]!
roomsForSlot(day: Int!, time: Int!): SlotWithRooms
roomsForSlot(day: Int!, time: Int!): RoomsForSlot
roomsForSlots: [RoomsForSlot!]!
roomsWithConstraints(exahm: Boolean, handicap: Boolean!, lab: Boolean!, placesWithSocket: Boolean!): [Room!]!
roomsWithInvigilationsForSlot(day: Int!, time: Int!): InvigilationSlot
semester: Semester!
Expand Down Expand Up @@ -583,6 +584,12 @@ type RoomWithInvigilator {
studentCount: Int!
}

type RoomsForSlot {
day: Int!
rooms: [Room!]!
slot: Int!
}

type Semester {
id: String!
}
Expand Down Expand Up @@ -613,15 +620,6 @@ type SlotWithExamGroups {
slotNumber: Int!
}

type SlotWithRooms {
dayNumber: Int!
exahmRooms: [Room!]!
labRooms: [Room!]!
normalRooms: [Room!]!
ntaRooms: [Room!]!
slotNumber: Int!
}

type Starttime {
number: Int!
start: String!
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Nav.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<li><a href="/plan/calendar">Kalenderansicht</a></li>
<!-- <li><a href="/plan/ntas">geplante Prüfungen mit NTAs</a></li> -->
<li><a href="/plan/rooms">Raumplanung</a></li>
<li><a href="/plan/roomsTable">Raumplanung (Tabelle)</a></li>
<li><a href="/plan/roomsForSlots">Verfügbare Räume</a></li>
<li><a href="/plan/invigilation/1">Aufsichtenplanung</a></li>
<li><a href="/plan/examsInPlanZPA">Prüfungsliste für ZPA</a></li>
</ul>
Expand Down
26 changes: 26 additions & 0 deletions src/routes/plan/roomsForSlots/+page.server.gql
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
query RoomsForSlots {
rooms {
name
seats
handicap
lab
placesWithSocket
exahm
seb
needsRequest
}
roomsForSlots {
day
slot
rooms {
name
seats
handicap
lab
placesWithSocket
exahm
seb
needsRequest
}
}
}
77 changes: 77 additions & 0 deletions src/routes/plan/roomsForSlots/+page.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<script lang="ts">
import type { PageData } from './$houdini';
export let data: PageData;

$: ({ RoomsForSlots } = data);

let selectedDays: number[] = [];
let availableDays: number[] = [];

$: if ($RoomsForSlots?.data?.roomsForSlots) {
availableDays = [...new Set($RoomsForSlots.data.roomsForSlots.map((slot) => slot.day))].sort(
(a, b) => a - b
);
}

$: filteredSlots =
selectedDays.length === 0
? $RoomsForSlots?.data?.roomsForSlots
: $RoomsForSlots?.data?.roomsForSlots?.filter((slot) => selectedDays.includes(slot.day));

function roomAvailable(room: any, slot: any): string {
if (slot.rooms.map((room) => room.name).includes(room)) {
return 'X';
}
return '';
}
</script>

<div class="text-center m-2">
<div class="text-4xl text-center mt-8 uppercase">Verfügbare Räume</div>

<div class="my-4">
<label class="label">
<span class="label-text">Tage auswählen:</span>
</label>
<div class="flex flex-wrap gap-2 justify-center">
{#each availableDays as day}
<label class="label cursor-pointer">
<input
type="checkbox"
class="checkbox checkbox-primary"
bind:group={selectedDays}
value={day}
/>
<span class="label-text ml-2">Tag {day}</span>
</label>
{/each}
</div>
</div>
</div>
<div class="overflow-x-auto w-full">
<div class="grid grid-cols-1">
<div class="overflow-x-auto">
<table class="table table-zebra w-90%">
<!-- head -->
<thead>
<tr>
<th>Slot</th>
{#each $RoomsForSlots?.data?.rooms as room}
<th>{room.name}</th>
{/each}
</tr>
</thead>
<tbody>
{#each filteredSlots as slot}
<tr>
<td class="font-bold text-right"> ({slot.day}, {slot.slot})</td>
{#each $RoomsForSlots?.data?.rooms as room}
<td>{roomAvailable(room.name, slot)}</td>
{/each}
</tr>
{/each}
</tbody>
</table>
</div>
</div>
</div>
12 changes: 0 additions & 12 deletions src/routes/rooms/+page.gql

This file was deleted.

26 changes: 26 additions & 0 deletions src/routes/rooms/+page.server.gql
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
query Rooms {
rooms {
name
seats
handicap
lab
placesWithSocket
exahm
seb
needsRequest
}
roomsForSlots {
day
slot
rooms {
name
seats
handicap
lab
placesWithSocket
exahm
seb
needsRequest
}
}
}
2 changes: 2 additions & 0 deletions src/routes/rooms/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
rooms?.sort((r1: any, r2: any) => r1.name.localeCompare(r2.name));
}
}

let roomsForSlots = $Rooms?.data?.roomsForSlots || [];
</script>

<div class="text-center m-2">
Expand Down