fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(exams): show occurrenceRule in exam overview

Browse Source
This commit is contained in:
Steffen Jost 2019-08-06 15:21:57 +02:00
parent 248482b1bb
commit 06673e0031
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
messages/uniworx/de.msg
View File

@ -1204,7 +1204,7 @@ ExamBonusMaxPointsNonPositive: Maximaler Klausurbonus muss positiv und größer
ExamBonusOnlyPassed: Bonus nur nach Bestehen anrechnen ExamBonusOnlyPassed: Bonus nur nach Bestehen anrechnen
ExamOccurrenceRule: Automatische Termin- bzw. Raumzuteilung ExamOccurrenceRule: Automatische Termin- bzw. Raumzuteilung
ExamOccurrenceRuleParticipant: Termin- bzw. Raumzuteilung ExamOccurrenceRuleParticipant: Termin- bzw. Raumzuteilungsverfahren
ExamRoomManual': Keine automatische Zuteilung ExamRoomManual': Keine automatische Zuteilung
ExamRoomSurname': Nach Nachname ExamRoomSurname': Nach Nachname
ExamRoomMatriculation': Nach Matrikelnummer ExamRoomMatriculation': Nach Matrikelnummer

20
templates/exam-show.hamlet
View File

@ -80,7 +80,7 @@ $maybe desc <- examDescription
$if not occurrenceAssignmentsVisible $if not occurrenceAssignmentsVisible
\ ^{isVisible False} \ ^{isVisible False}
<dd .deflist__dd> <dd .deflist__dd>
$# TODO _{classifyExamOccurrenceRule examOccurrenceRule}
$maybe registerWdgt <- registerWidget $maybe registerWdgt <- registerWidget
<dt .deflist__dt>_{MsgExamRegistration} <dt .deflist__dt>_{MsgExamRegistration}
<dd .deflist__dd>^{registerWdgt} <dd .deflist__dd>^{registerWdgt}
@ -99,21 +99,25 @@ $if not (null occurrences)
$if occurrenceNamesShown $if occurrenceNamesShown
<th .table__th> <th .table__th>
_{MsgExamRoomName} _{MsgExamRoomName}
^{isVisible False} \ ^{isVisible False}
<th .table__th>_{MsgExamRoom}
$if not examTimes
<th .table__th>_{MsgExamRoomTime}
<th .table__th>_{MsgExamRoomDescription}
$if occurrenceAssignmentsShown $if occurrenceAssignmentsShown
<th .table__th> <th .table__th>
_{MsgExamRoomRegistered} _{MsgExamRoomRegistered}
$if not occurrenceAssignmentsVisible $if not occurrenceAssignmentsVisible
\ ^{isVisible False} \ ^{isVisible False}
<th .table__th>_{MsgExamRoom}
$if not examTimes
<th .table__th>_{MsgExamRoomTime}
<th .table__th>_{MsgExamRoomDescription}
<tbody> <tbody>
$forall (Entity _occId ExamOccurrence{examOccurrenceName, examOccurrenceRoom, examOccurrenceStart, examOccurrenceEnd, examOccurrenceDescription}, registered) <- occurrences $forall (Entity _occId ExamOccurrence{examOccurrenceName, examOccurrenceRoom, examOccurrenceStart, examOccurrenceEnd, examOccurrenceDescription}, registered) <- occurrences
<tr .table__row :occurrenceAssignmentsShown && not registered:.occurrence--not-registered> <tr .table__row :occurrenceAssignmentsShown && not registered:.occurrence--not-registered>
$if occurrenceNamesShown $if occurrenceNamesShown
<td .table__td #exam-occurrence__#{examOccurrenceName}>#{examOccurrenceName} <td .table__td #exam-occurrence__#{examOccurrenceName}>#{examOccurrenceName}
$if occurrenceAssignmentsShown
<td .table__td>
$if registered
#{iconOK}
<td .table__td>#{examOccurrenceRoom} <td .table__td>#{examOccurrenceRoom}
$if not examTimes $if not examTimes
<td .table__td> <td .table__td>
@ -121,10 +125,6 @@ $if not (null occurrences)
<td .table__td> <td .table__td>
$maybe desc <- examOccurrenceDescription $maybe desc <- examOccurrenceDescription
#{desc} #{desc}
$if occurrenceAssignmentsShown
<td .table__td>
$if registered
#{iconOK}
$if gradingShown && not (null parts) $if gradingShown && not (null parts)
<section> <section>