From 84a50646b0d219f40691dff998697bde402e98e0 Mon Sep 17 00:00:00 2001 From: Wolfgang Witt Date: Fri, 19 Mar 2021 14:17:47 +0100 Subject: [PATCH] chore: strikethrough names of ignored occurrences --- src/Handler/Exam/AutoOccurrence.hs | 2 ++ templates/widgets/exam-occurrence-mapping.hamlet | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Handler/Exam/AutoOccurrence.hs b/src/Handler/Exam/AutoOccurrence.hs index 3e4f84957..3f03de4aa 100644 --- a/src/Handler/Exam/AutoOccurrence.hs +++ b/src/Handler/Exam/AutoOccurrence.hs @@ -243,6 +243,8 @@ postEAutoOccurrenceR tid ssh csh examn = do , formSubmit = FormNoSubmit , formAttrs = [("class", "buttongroup")] } + isIgnored :: ExamOccurrenceId -> Bool + isIgnored occId = maybe False (Set.member occId) $ formResult' calculateRes' ^? _Just . _eaofConfig . _eaocIgnoreRooms . _eaoirIgnored ExamAutoOccurrenceAcceptForm{..} <- maybe (redirect $ CExamR tid ssh csh examn EUsersR) return calcResult diff --git a/templates/widgets/exam-occurrence-mapping.hamlet b/templates/widgets/exam-occurrence-mapping.hamlet index 2b63fcb91..975d170ff 100644 --- a/templates/widgets/exam-occurrence-mapping.hamlet +++ b/templates/widgets/exam-occurrence-mapping.hamlet @@ -28,7 +28,11 @@ $newline never $forall Entity occId ExamOccurrence{ examOccurrenceName, examOccurrenceRoom, examOccurrenceStart, examOccurrenceEnd, examOccurrenceDescription, examOccurrenceCapacity } <- occurrences - _{examOccurrenceName} + $if isIgnored occId + + _{examOccurrenceName} + $else + _{examOccurrenceName} _{loadProp (occLoad occId) examOccurrenceCapacity}