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: 12 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,18 @@
"@sveltejs/adapter-node": "^5.2.12",
"@sveltejs/kit": "^2.20.7",
"@sveltejs/vite-plugin-svelte": "^4.0.4",
"@tailwindcss/typography": "^0.5.16",
"@tailwindcss/postcss": "^4.1.4",
"@tailwindcss/typography": "^0.5.16",
"autoprefixer": "^10.4.21",
"daisyui": "^5.0.28",
"postcss": "^8.5.3",
"prettier-plugin-svelte": "^3.3.3",
"svelte": "^5.28.2",
"svelte-check": "^4.1.6",
"svelte-check": "^4.2.1",
"svelte-preprocess": "^6.0.3",
"tailwindcss": "^4.1.4",
"theme-change": "^2.5.0",
"tslib": "^2.8.1",
"typescript": "^5.8.3",
"vite": "^5.4.18"
},
Expand Down
3 changes: 0 additions & 3 deletions src/lib/exam/ExamWithNTAsForRoomPlanning.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
// }
// });
// let data = await response.json();
// // console.log(data.plannedExamsInSlot);
// allowedRoomsUnfiltered = data.roomsForSlot;
// }

Expand All @@ -94,9 +93,7 @@

// async function addRoom(nta) {
// if (nta) {
// console.log(`für NTA ${nta} einplanen`);
// } else {
// console.log('als normalen Prüfungsraum einplanen');

// const response = await fetch('/api/rooms/addRoomToExam', {
// method: 'POST',
Expand Down
1 change: 0 additions & 1 deletion src/lib/examGroups/SlotExamGroup.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
(exam.constraints &&
exam.constraints.roomConstraints &&
exam.constraints.roomConstraints.seb);
// console.log(exam.constraints);
}

$: {
Expand Down
3 changes: 0 additions & 3 deletions src/lib/invigilator/InvigilationSlotPlanning.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
let loading = true;

async function fetchSlot(day, time) {
// console.log(`...fetching Slot (${day}, ${time})`);

const response = await fetch('/api/plan/roomsWithInvigilationsForSlot', {
method: 'POST',
body: JSON.stringify({ day, time }),
Expand All @@ -22,7 +20,6 @@
}
});
let data = await response.json();
// console.log(data.roomsWithInvigilationsForSlot);
slot = data.roomsWithInvigilationsForSlot;
noRooms = !slot || !slot.roomsWithInvigilators || slot.roomsWithInvigilators.length == 0;
loading = false;
Expand Down
1 change: 0 additions & 1 deletion src/lib/invigilator/InvigilatorsForDay.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
}
});
let data = await response.json();
// console.log(data);
want = data.invigilatorsForDay.want;
can = data.invigilatorsForDay.can.sort(function (invig1, invig2) {
return (
Expand Down
1 change: 0 additions & 1 deletion src/lib/slot/ExamsForRoomPlanning.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
}
});
let data = await response.json();
// console.log(data.plannedExamsInSlot);
examsInSlot = data.examsInSlot;
}

Expand Down
1 change: 0 additions & 1 deletion src/lib/slot/ExamsWithNTAs.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
}
});
let data = await response.json();
// console.log(data.plannedExamsInSlot);
examsWithNTAs = data.plannedExamsInSlot;
}

Expand Down
1 change: 0 additions & 1 deletion src/lib/slot/PreSlot.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
});
let data = await response.json();
exams = data.preExamsInSlot;
console.log('exams', exams);
}

let exahm = [];
Expand Down
2 changes: 0 additions & 2 deletions src/lib/zpa/ExamsZpaTable.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
}

async function addExam(ancode) {
console.log(`${ancode} wird hinzugefügt.`);
await fetch('/api/zpaexams/addToPlan', {
method: 'POST',
body: JSON.stringify({ ancode }),
Expand All @@ -50,7 +49,6 @@
location.reload();
}
async function rmExam(ancode) {
console.log(`${ancode} wird entfernt.`);
await fetch('/api/zpaexams/rmFromPlan', {
method: 'POST',
body: JSON.stringify({ ancode }),
Expand Down
6 changes: 2 additions & 4 deletions src/lib/zpa/ExamsZpaTableUnknown.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
export let exams;

async function addExam(ancode) {
console.log(`${ancode} wird hinzugefügt.`);
await fetch('/api/zpaexams/addToPlan', {
method: 'POST',
body: JSON.stringify({ ancode, unknown: true }),
Expand All @@ -13,7 +12,6 @@
location.reload();
}
async function rmExam(ancode) {
console.log(`${ancode} wird entfernt.`);
await fetch('/api/zpaexams/rmFromPlan', {
method: 'POST',
body: JSON.stringify({ ancode, unknown: true }),
Expand Down Expand Up @@ -42,7 +40,7 @@
{#each exams as exam}
<tr>
<td>
<button class="btn btn-success btn-sm" on:click={() => addExam(exam.ancode)}
<button class="btn btn-success btn-sm" on:click={() => addExam(exam.ancode)}
>Planen</button
>
</td>
Expand All @@ -52,7 +50,7 @@
<td>{exam.examTypeFull}</td>
<td>{exam.groups}</td>
<td>
<button class="btn btn-error btn-sm" on:click={() => rmExam(exam.ancode)}
<button class="btn btn-error btn-sm" on:click={() => rmExam(exam.ancode)}
>Nicht planen</button
>
</td>
Expand Down
2 changes: 0 additions & 2 deletions src/routes/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@

if (data.workflow && data.workflow.length > 0) {
for (let i = 0; i < data.workflow.length; i++) {
console.log(data.workflow[i]);
const step = data.workflow[i];
if (highestDone == step.number - 1 && step.done) {
highestDone = step.number;
}
}
console.log(`Highest Done = ${highestDone}`);
}
</script>

Expand Down
1 change: 0 additions & 1 deletion src/routes/api/addConstraints/+server.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ export async function POST({ request }) {
ancode,
constraints: constraints
};
console.log('adding constraints', variables);

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

Expand Down
1 change: 0 additions & 1 deletion src/routes/calendar/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<script>
import ConstraintsTable from '$lib/ConstraintsTable.svelte';
import Calendar from '@event-calendar/core';
import TimeGrid from '@event-calendar/time-grid';

Expand Down
9 changes: 1 addition & 8 deletions src/routes/exam/constraints/[code=integer]/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -81,21 +81,16 @@
constraintsInput.maxStudents = null;
}

console.log('ConstraintsInput', constraintsInput);

await fetch('/api/addConstraints', {
method: 'POST',
body: JSON.stringify({ ancode: exam.ancode, constraints: constraintsInput }),
headers: {
'content-type': 'application/json'
}
});
console.log('Added constraints');
location.reload();
}
function deleteConstraints() {
console.log('Delete constraints');
}
function deleteConstraints() {}

let zpaExamsToPlan = [];
async function getZpaExamsToPlan() {
Expand Down Expand Up @@ -128,8 +123,6 @@
let filterText = '';
let showModal = false;
let navigateAncode = '';

$: console.log('ConstraintsInput', constraintsInput.excludeDays);
</script>

<div class="text-center m-2 text-4xl">
Expand Down
1 change: 0 additions & 1 deletion src/routes/exam/kdp/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
exam.constraints.roomConstraints &&
(exam.constraints.roomConstraints.exahm || exam.constraints.roomConstraints.seb)
);
console.log('exams', exams);
</script>

<div class="text-center m-2 text-4xl">
Expand Down
1 change: 0 additions & 1 deletion src/routes/nta/[mtknr=string]/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<script>
export let data;
console.log(data);
const nta = data.nta;
</script>

Expand Down
4 changes: 1 addition & 3 deletions src/routes/nta/ntaWithRegs/+page.server.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,7 @@ export async function load({ params }) {
}
`;

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

if (
roomData != null &&
Expand Down
3 changes: 0 additions & 3 deletions src/routes/plan/exams/+page.server.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,12 @@ export async function load({ params }) {
}

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,
Expand Down
3 changes: 0 additions & 3 deletions src/routes/plan/exams/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,6 @@

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-gray-400';
}
Expand Down