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

style(schedule): enhance display for joined entries

Browse Source
This commit is contained in:
Sarah Vaupel 2021-05-06 09:45:54 +02:00
parent bbd5b73142
commit a4a26afa7a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Utils/Schedule/Week.hs
View File

@ -266,3 +266,6 @@ dayOfWeekToDayWith weekDay = go where
| weekDay' > weekDay = go $ pred d | weekDay' > weekDay = go $ pred d
| otherwise = go $ succ d | otherwise = go $ succ d
where weekDay' = dayOfWeek d where weekDay' = dayOfWeek d
indexedList :: [a] -> [(Int, a)]
indexedList = zip [0..]

6
templates/schedule/week.hamlet
View File

@ -50,7 +50,7 @@ $newline never
<br> <br>
^{formatEitherOccurrenceW stOccurrence} ^{formatEitherOccurrenceW stOccurrence}
$of ScheduleExamOccurrence{seoCourse=Entity _ Course{courseName},seoExamName,seoRooms,seoStart,seoEnd} $of ScheduleExamOccurrence{seoCourse=Entity _ Course{courseName},seoExamName,seoRooms,seoStart,seoEnd}
#{CI.original courseName}: #{seoExamName} #{CI.original courseName}: #{seoExamName} #
$if slotAssocIsCont slotAssociation $if slotAssocIsCont slotAssociation
(_{MsgScheduleWeekSlotIsCont}) (_{MsgScheduleWeekSlotIsCont})
<br> <br>
@ -63,10 +63,12 @@ $newline never
<br> <br>
$of more $of more
_{MsgScheduleRooms}: # _{MsgScheduleRooms}: #
$forall (mRoom,showRoom) <- more $forall (idx,(mRoom,showRoom)) <- indexedList more
$if showRoom $if showRoom
$maybe room <- mRoom $maybe room <- mRoom
^{roomReferenceWidget room} ^{roomReferenceWidget room}
$if idx < pred (length more)
; #
<br> <br>
_{MsgScheduleOccur}: # _{MsgScheduleOccur}: #
$if Just (utctDay seoStart) == fmap utctDay seoEnd $if Just (utctDay seoStart) == fmap utctDay seoEnd