chore: convert buttons to icons

This commit is contained in:
Wolfgang Witt 2021-03-19 16:48:42 +01:00 committed by Gregor Kleen
parent 84a50646b0
commit ea32fdfa91
5 changed files with 49 additions and 19 deletions

View File

@ -2822,10 +2822,6 @@ ExamAutoOccurrenceParticipantsAssigned num@Int64: Verteilungstabelle erfolgreich
TitleExamAutoOccurrence tid@TermId ssh@SchoolId csh@CourseShorthand examn@ExamName: #{tid} - #{ssh} - #{csh} #{examn}: Automatische Raum-/Terminverteilung TitleExamAutoOccurrence tid@TermId ssh@SchoolId csh@CourseShorthand examn@ExamName: #{tid} - #{ssh} - #{csh} #{examn}: Automatische Raum-/Terminverteilung
BtnExamAutoOccurrenceCalculate: Verteilungstabelle berechnen BtnExamAutoOccurrenceCalculate: Verteilungstabelle berechnen
BtnExamAutoOccurrenceAccept: Verteilung akzeptieren BtnExamAutoOccurrenceAccept: Verteilung akzeptieren
BtnExamAutoOccurrenceNudgeUp: +
BtnExamAutoOccurrenceNudgeDown: -
BtnExamAutoOccurrenceIgnore: Ignorieren
BtnExamAutoOccurrenceReconsider: Berücksichtigen
ExamRoomMappingSurname: Nachnamen beginnend mit ExamRoomMappingSurname: Nachnamen beginnend mit
ExamRoomMappingMatriculation: Matrikelnummern endend in ExamRoomMappingMatriculation: Matrikelnummern endend in
ExamRoomMappingRandom: Verteilung ExamRoomMappingRandom: Verteilung

View File

@ -2822,10 +2822,6 @@ ExamAutoOccurrenceParticipantsAssigned num: Occurrence/room assignment rule save
TitleExamAutoOccurrence tid ssh csh examn: #{tid} - #{ssh} - #{csh} #{examn}: Automatic occurrence/room distribution TitleExamAutoOccurrence tid ssh csh examn: #{tid} - #{ssh} - #{csh} #{examn}: Automatic occurrence/room distribution
BtnExamAutoOccurrenceCalculate: Calculate assignment rules BtnExamAutoOccurrenceCalculate: Calculate assignment rules
BtnExamAutoOccurrenceAccept: Accept assignments BtnExamAutoOccurrenceAccept: Accept assignments
BtnExamAutoOccurrenceNudgeUp: +
BtnExamAutoOccurrenceNudgeDown: -
BtnExamAutoOccurrenceIgnore: Ignore
BtnExamAutoOccurrenceReconsider: Reconsider
ExamRoomMappingSurname: Surnames starting with ExamRoomMappingSurname: Surnames starting with
ExamRoomMappingMatriculation: Matriculation numbers ending in ExamRoomMappingMatriculation: Matriculation numbers ending in
ExamRoomMappingRandom: Distribution ExamRoomMappingRandom: Distribution

View File

@ -43,8 +43,14 @@ instance Finite ExamAutoOccurrenceButton
nullaryPathPiece ''ExamAutoOccurrenceButton $ camelToPathPiece' 4 nullaryPathPiece ''ExamAutoOccurrenceButton $ camelToPathPiece' 4
embedRenderMessage ''UniWorX ''ExamAutoOccurrenceButton id
instance Button UniWorX ExamAutoOccurrenceButton where instance Button UniWorX ExamAutoOccurrenceButton where
btnLabel BtnExamAutoOccurrenceCalculate = i18n MsgBtnExamAutoOccurrenceCalculate
btnLabel BtnExamAutoOccurrenceAccept = i18n MsgBtnExamAutoOccurrenceAccept
btnLabel BtnExamAutoOccurrenceNudgeUp = toWidget iconExamAutoOccurrenceNudgeUp
btnLabel BtnExamAutoOccurrenceNudgeDown = toWidget iconExamAutoOccurrenceNudgeDown
btnLabel BtnExamAutoOccurrenceIgnore = toWidget iconExamAutoOccurrenceIgnore
btnLabel BtnExamAutoOccurrenceReconsider = toWidget iconExamAutoOccurrenceReconsider
btnClasses BtnExamAutoOccurrenceNudgeUp = [BCIsButton] btnClasses BtnExamAutoOccurrenceNudgeUp = [BCIsButton]
btnClasses BtnExamAutoOccurrenceNudgeDown = [BCIsButton] btnClasses BtnExamAutoOccurrenceNudgeDown = [BCIsButton]
btnClasses BtnExamAutoOccurrenceIgnore = [BCIsButton] btnClasses BtnExamAutoOccurrenceIgnore = [BCIsButton]

View File

@ -44,6 +44,10 @@ data Icon
| IconExam | IconExam
| IconExamRegisterTrue | IconExamRegisterTrue
| IconExamRegisterFalse | IconExamRegisterFalse
| IconExamAutoOccurrenceNudgeUp
| IconExamAutoOccurrenceNudgeDown
| IconExamAutoOccurrenceIgnore
| IconExamAutoOccurrenceReconsider
| IconCommentTrue | IconCommentTrue
| IconCommentFalse | IconCommentFalse
| IconLink | IconLink
@ -112,6 +116,10 @@ iconText = \case
IconExam -> "poll-h" IconExam -> "poll-h"
IconExamRegisterTrue -> "calendar-check" IconExamRegisterTrue -> "calendar-check"
IconExamRegisterFalse -> "calendar-times" IconExamRegisterFalse -> "calendar-times"
IconExamAutoOccurrenceNudgeUp -> "user-plus"
IconExamAutoOccurrenceNudgeDown -> "user-minus"
IconExamAutoOccurrenceIgnore -> "users-slash"
IconExamAutoOccurrenceReconsider -> "users"
IconCommentTrue -> "comment-alt" IconCommentTrue -> "comment-alt"
IconCommentFalse -> "comment-alt-slash" IconCommentFalse -> "comment-alt-slash"
IconLink -> "link" IconLink -> "link"

View File

@ -29,27 +29,51 @@ $newline never
<tr .table__row> <tr .table__row>
<td .table__td> <td .table__td>
$if isIgnored occId $if isIgnored occId
<strike> <s>
_{examOccurrenceName} _{examOccurrenceName}
$else $else
_{examOccurrenceName} _{examOccurrenceName}
<td .table__td> <td .table__td>
_{loadProp (occLoad occId) examOccurrenceCapacity} $if isIgnored occId
<s>
_{loadProp (occLoad occId) examOccurrenceCapacity}
$else
_{loadProp (occLoad occId) examOccurrenceCapacity}
<td .table__td> <td .table__td>
$maybe nudgeWgt' <- Map.lookup occId nudgeWgt $maybe nudgeWgt' <- Map.lookup occId nudgeWgt
^{nudgeWgt'} ^{nudgeWgt'}
$maybe ignoreRoomWgt' <- Map.lookup occId ignoreRoomWgt $maybe ignoreRoomWgt' <- Map.lookup occId ignoreRoomWgt
^{ignoreRoomWgt'} ^{ignoreRoomWgt'}
<td .table__td> <td .table__td>
$maybe mappingWgt <- occMapping occId $if isIgnored occId
^{mappingWgt} <s>
$maybe mappingWgt <- occMapping occId
^{mappingWgt}
$else
$maybe mappingWgt <- occMapping occId
^{mappingWgt}
<td .table__td> <td .table__td>
$maybe room <- examOccurrenceRoom $if isIgnored occId
^{roomReferenceWidget room} <s>
$nothing $maybe room <- examOccurrenceRoom
_{MsgExamOccurrenceRoomIsUnset} ^{roomReferenceWidget room}
$nothing
_{MsgExamOccurrenceRoomIsUnset}
$else
$maybe room <- examOccurrenceRoom
^{roomReferenceWidget room}
$nothing
_{MsgExamOccurrenceRoomIsUnset}
<td .table__td> <td .table__td>
^{formatTimeRangeW SelFormatDateTime examOccurrenceStart examOccurrenceEnd} $if isIgnored occId
<s>
^{formatTimeRangeW SelFormatDateTime examOccurrenceStart examOccurrenceEnd}
$else
^{formatTimeRangeW SelFormatDateTime examOccurrenceStart examOccurrenceEnd}
<td .table__td> <td .table__td>
$maybe desc <- examOccurrenceDescription $maybe desc <- examOccurrenceDescription
#{desc} $if isIgnored occId
<s>
#{desc}
$else
#{desc}