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

chore: convert buttons to icons

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
messages/uniworx/misc/de-de-formal.msg
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
BtnExamAutoOccurrenceCalculate: Verteilungstabelle berechnen
BtnExamAutoOccurrenceAccept: Verteilung akzeptieren
BtnExamAutoOccurrenceNudgeUp: +
BtnExamAutoOccurrenceNudgeDown: -
BtnExamAutoOccurrenceIgnore: Ignorieren
BtnExamAutoOccurrenceReconsider: Berücksichtigen
ExamRoomMappingSurname: Nachnamen beginnend mit
ExamRoomMappingMatriculation: Matrikelnummern endend in
ExamRoomMappingRandom: Verteilung

4
messages/uniworx/misc/en-eu.msg
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
BtnExamAutoOccurrenceCalculate: Calculate assignment rules
BtnExamAutoOccurrenceAccept: Accept assignments
BtnExamAutoOccurrenceNudgeUp: +
BtnExamAutoOccurrenceNudgeDown: -
BtnExamAutoOccurrenceIgnore: Ignore
BtnExamAutoOccurrenceReconsider: Reconsider
ExamRoomMappingSurname: Surnames starting with
ExamRoomMappingMatriculation: Matriculation numbers ending in
ExamRoomMappingRandom: Distribution

8
src/Handler/Exam/AutoOccurrence.hs
View File

@ -43,8 +43,14 @@ instance Finite ExamAutoOccurrenceButton
nullaryPathPiece ''ExamAutoOccurrenceButton $ camelToPathPiece' 4
embedRenderMessage ''UniWorX ''ExamAutoOccurrenceButton id
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 BtnExamAutoOccurrenceNudgeDown = [BCIsButton]
btnClasses BtnExamAutoOccurrenceIgnore = [BCIsButton]

8
src/Utils/Icon.hs
View File

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

44
templates/widgets/exam-occurrence-mapping.hamlet
View File

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