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
1 change: 1 addition & 0 deletions src/lib/Nav.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
<li><a href="/exam/examsNotToPlan">Nicht zu planende ZPA-Prüfungen</a></li>
<li><a href="/exam/examsPlaningStatusUnknown">Nicht zugeordnete ZPA-Prüfungen</a></li>
<li><a href="/exam/constraints">Constraints</a></li>
<li><a href="/rooms">Räume</a></li>
<li><a href="/exam/externalExams">Zusätzliche Prüfungen</a></li>
<li><a href="/exam/connected">Anmeldungszuordnung (ZPA/Primuss)</a></li>
</ul>
Expand Down
13 changes: 9 additions & 4 deletions src/lib/nta/NTACard.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
{nta.nta.name} ({nta.nta.program})
</span>
{#if nta.nta.needsHardware}
<div class="badge badge-info">spezielle Hardware</div>
<div class="badge badge-info">spezielle Hardware</div>
{/if}
{#if nta.nta.needsRoomAlone}
<div class="badge badge-warning">eigener Raum</div>
<div class="badge badge-warning">eigener Raum</div>
{/if}
</div>
<div>
Expand All @@ -32,10 +32,15 @@
<li>
{exam.ancode}. {exam.zpaExam.mainExamer}: {exam.zpaExam.module}
{#if exam.constraints && exam.constraints.roomConstraints && exam.constraints.roomConstraints.seb}
<div class="badge badge-error">SEB</div>
<div class="badge badge-error">SEB</div>
{/if}
{#if exam.constraints && exam.constraints.roomConstraints && exam.constraints.roomConstraints.exahm}
<div class="badge badge-error">EXaHM</div>
<div class="badge badge-error">EXaHM</div>
{/if}
{#if exam.roomName}
<div class="badge badge-success">{exam.roomName}</div>
{:else}
<div class="badge badge-warning">noch nicht geplant</div>
{/if}
</li>
{/if}
Expand Down
27 changes: 27 additions & 0 deletions src/routes/api/plan/plannedRoomForStudent/+server.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { env } from '$env/dynamic/private';
import { json } from '@sveltejs/kit';
import { request as gqlrequest, gql } from 'graphql-request';

/** @type {import('./$types').RequestHandler} */
export async function POST({ request }) {
const query = gql`
query ($ancode: Int!, $mtknr: String!) {
plannedRoomForStudent(ancode: $ancode, mtknr: $mtknr) {
room {
name
}
}
}
`;

const { ancode, mtknr } = await request.json();

const variables = {
ancode,
mtknr
};

const data = await gqlrequest(env.PLEXAMS_SERVER, query, variables);

return json(data);
}
19 changes: 19 additions & 0 deletions src/routes/nta/ntaWithRegs/+page.server.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,25 @@ export async function load({ params }) {
`;

const data = await request(env.PLEXAMS_SERVER, query);

const roomQuery = gql`
query {
plannedRoomForStudent(ancode: ${ancode}, mtknr: "${nta.mtknr}") {
room {
name
}
}
}
`;

const roomData = await request(env.PLEXAMS_SERVER, roomQuery).catch((e) => {
(e) => console.log(e);
});

if (roomData != null && roomData.plannedRoomForStudent.room != null) {
data.generatedExam.roomName = roomData.plannedRoomForStudent.room.name;
}

exams.push(data.generatedExam);
}

Expand Down
25 changes: 25 additions & 0 deletions src/routes/rooms/+page.server.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { env } from '$env/dynamic/private';
import { request, gql } from 'graphql-request';

export async function load({ params }) {
const query = gql`
query {
rooms {
name
seats
handicap
lab
placesWithSocket
exahm
seb
needsRequest
}
}
`;

let data = await request(env.PLEXAMS_SERVER, query);

return {
rooms: data.rooms
};
}
91 changes: 91 additions & 0 deletions src/routes/rooms/+page.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<script>
export let data;

let rooms = data.rooms;

function onClick(column) {
if (column === 'nta') {
rooms = data.rooms.filter((r) => r.handicap);
} else if (column === 'lab') {
rooms = data.rooms.filter((r) => r.lab);
} else if (column === 'placesWithSocket') {
rooms = data.rooms.filter((r) => r.placesWithSocket);
} else if (column === 'exahm') {
rooms = data.rooms.filter((r) => r.exahm);
} else if (column === 'seb') {
rooms = data.rooms.filter((r) => r.seb);
} else if (column === 'needsRequest') {
rooms = data.rooms.filter((r) => r.needsRequest);
} else if (column === 'seats') {
rooms = data.rooms;
rooms.sort((r1, r2) => r2.seats - r1.seats);
} else if (column === 'name') {
rooms = data.rooms;
rooms.sort((r1, r2) => r1.name.localeCompare(r2.name));
}
}
</script>

<div class="text-center m-2">
<div class="text-4xl text-center mt-8 uppercase">
{data.rooms.length} Räume
</div>
</div>

<div class="grid grid-cols-1 justify-items-center">
<div class="overflow-x-auto">
<table class="table table-zebra">
<!-- head -->
<thead>
<tr>
<th on:click={() => onClick('name')}>Name</th>
<th on:click={() => onClick('seats')}>Plätze</th>
<th on:click={() => onClick('nta')}>NTA</th>
<th on:click={() => onClick('lab')}>Labor</th>
<th on:click={() => onClick('placesWithSocket')}>Steckdosen</th>
<th on:click={() => onClick('exahm')}>EXaHM</th>
<th on:click={() => onClick('seb')}>SEB</th>
<th on:click={() => onClick('needsRequest')}>Anforderung</th>
</tr>
</thead>
<tbody>
{#each rooms as room}
<tr>
<td class="font-bold"> {room.name} </td>
<td class="text-right"> {room.seats} Plätze </td>
<td>
{#if room.handicap}
<div class="badge badge-info">NTA</div>
{/if}
</td>
<td>
{#if room.lab}
<div class="badge badge-info">Labor</div>
{/if}
</td>
<td>
{#if room.placesWithSocket}
<div class="badge badge-info">Steckdosen</div>
{/if}
</td>
<td>
{#if room.exahm}
<div class="badge badge-info">EXaHM</div>
{/if}
</td>
<td>
{#if room.seb}
<div class="badge badge-info">SEB</div>
{/if}
</td>
<td>
{#if room.needsRequest}
<div class="badge badge-info">Request</div>
{/if}
</td>
</tr>
{/each}
</tbody>
</table>
</div>
</div>
Loading