From b638783f1262f8ea7817618f70474a114b182fda Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 10 Sep 2019 15:51:14 +0200 Subject: [PATCH] feat(exam-office): show exam(Occurrence) end-time --- src/Handler/ExamOffice/Exam.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Handler/ExamOffice/Exam.hs b/src/Handler/ExamOffice/Exam.hs index 3854cd4c6..aff4bb40a 100644 --- a/src/Handler/ExamOffice/Exam.hs +++ b/src/Handler/ExamOffice/Exam.hs @@ -261,7 +261,10 @@ postEGradesR tid ssh csh examn = do , emptyOpticColonnade (resultStudyField . _entityVal) colStudyTerms , emptyOpticColonnade (resultStudyDegree . _entityVal) colStudyDegree , emptyOpticColonnade (resultStudyFeatures . _entityVal . _studyFeaturesSemester) colStudyFeaturesSemester - , emptyOpticColonnade (resultExamOccurrence . _entityVal . _examOccurrenceStart <> like examStart . _Just) colOccurrenceStart + , Colonnade.singleton (fromSortable . Sortable (Just "occurrence-start") $ i18nCell MsgExamTime) $ \x -> cell . flip runReaderT x $ do + start <- preview $ resultExamOccurrence . _entityVal . _examOccurrenceStart <> like examStart . _Just + end <- preview $ resultExamOccurrence . _entityVal . _examOccurrenceEnd . _Just <> like examEnd . _Just + lift $ maybe mempty (flip (formatTimeRangeW SelFormatDateTime) end) start , colExamResult examShowGrades (resultExamResult . _entityVal . _examResultResult) ] dbtSorting = mconcat