diff --git a/src/routes/exam/constraints/[code=integer]/+page.server.js b/src/routes/exam/constraints/[code=integer]/+page.server.js index 35420d8..85cb95a 100644 --- a/src/routes/exam/constraints/[code=integer]/+page.server.js +++ b/src/routes/exam/constraints/[code=integer]/+page.server.js @@ -36,6 +36,9 @@ export async function load({ params }) { lab exahm seb + kdpJiraURL + maxStudents + comments } } } diff --git a/src/routes/exam/constraints/[code=integer]/+page.svelte b/src/routes/exam/constraints/[code=integer]/+page.svelte index 632480d..78465b7 100644 --- a/src/routes/exam/constraints/[code=integer]/+page.svelte +++ b/src/routes/exam/constraints/[code=integer]/+page.svelte @@ -22,7 +22,10 @@ lab: false, seb: false, exahm: false, - excludeDays: [] + excludeDays: [], + kdpJiraURL: '', + maxStudents: 0, + comments: '' }; if (constraints) { @@ -33,6 +36,9 @@ constraintsInput.lab = constraints.roomConstraints.lab; constraintsInput.seb = constraints.roomConstraints.seb; constraintsInput.exahm = constraints.roomConstraints.exahm; + constraintsInput.kdpJiraURL = constraints.roomConstraints.kdpJiraURL; + constraintsInput.maxStudents = constraints.roomConstraints.maxStudents; + constraintsInput.comments = constraints.roomConstraints.comments; } if (constraints.excludeDays) { constraintsInput.excludeDays = @@ -58,6 +64,19 @@ return new Date(`20${yearPart}-${monthPart}-${dayPart}T12:00:00`); }); } + if (!constraintsInput.kdpJiraURL || constraintsInput.kdpJiraURL === '') { + constraintsInput.kdpJiraURL = null; + } else { + constraintsInput.kdpJiraURL = constraintsInput.kdpJiraURL.trim(); + } + if (!constraintsInput.comments || constraintsInput.comments === '') { + constraintsInput.comments = null; + } else { + constraintsInput.comments = constraintsInput.comments.trim(); + } + if (!constraintsInput.maxStudents || constraintsInput.maxStudents === 0) { + constraintsInput.maxStudents = null; + } console.log('ConstraintsInput', constraintsInput); @@ -105,6 +124,7 @@ } let filterText = ''; let showModal = false; + let navigateAncode = ''; $: console.log('ConstraintsInput', constraintsInput.excludeDays); @@ -198,6 +218,38 @@ + {#if constraintsInput.seb || constraintsInput.exahm} +
+
+ + + +
+
+ {/if}
Prüfungen, die im gleichen Slot stattfinden müssen
@@ -279,6 +331,24 @@
+
+ + +
{#if showModal} - +
@@ -49,7 +49,10 @@ + + + @@ -67,13 +70,45 @@ style="background-color: {exam.zpaExam.primussAncodes.some( (ancode) => ancode.program === program ) - ? 'red' + ? 'cyan' : 'transparent'}" > {/each} + - + + {/each}
AncodeDE GS IDRäume (Studierende) GruppenJiraKommentar
+ {#if exam.constraints.roomConstraints.maxStudents} + {Math.ceil(exam.constraints.roomConstraints.maxStudents / 30)} ({exam.constraints + .roomConstraints.maxStudents}) + {:else} + fehlt + {/if} + {exam.zpaExam.groups.join(', ')}
+ {#if exam.constraints.roomConstraints.kdpJiraURL} + + {exam.constraints.roomConstraints.kdpJiraURL.split('/').pop()} + + {:else} + fehlt + {/if} + + {#if exam.constraints.roomConstraints.comments} + {exam.constraints.roomConstraints.comments} + {/if} +