diff --git a/src/Handler/ExamOffice/Course.hs b/src/Handler/ExamOffice/Course.hs index 3b212e7f5..73ed6e0ba 100644 --- a/src/Handler/ExamOffice/Course.hs +++ b/src/Handler/ExamOffice/Course.hs @@ -19,7 +19,7 @@ examOfficeOptOutForm uid cid (fromMaybe Set.empty -> template) = renderWForm For schools <- liftHandlerT . runDB . E.select $ courseExamOfficeSchools (E.val uid) (E.val cid) res <- fmap sequence . forM schools $ \(Entity ssh School{..}, E.Value isForced) - -> fmap (ssh, ) <$> (bool wpopt wforcedJust isForced) checkBoxField (fslI schoolName) (Just $ ssh `Set.notMember` template) + -> fmap (ssh, ) <$> bool wpopt wforcedJust isForced checkBoxField (fslI schoolName) (Just $ ssh `Set.notMember` template) return $ res <&> setOf (folded . filtered (not . view _2) . _1) diff --git a/src/Handler/ExamOffice/Exam.hs b/src/Handler/ExamOffice/Exam.hs index a21174a4f..318313817 100644 --- a/src/Handler/ExamOffice/Exam.hs +++ b/src/Handler/ExamOffice/Exam.hs @@ -143,7 +143,7 @@ embedRenderMessage ''UniWorX ''ExamUserAction id data ExamUserActionData = ExamUserMarkSynchronisedData -data ExamUserCsvExportData = ExamUserCsvExportData +newtype ExamUserCsvExportData = ExamUserCsvExportData { csvEUserMarkSynchronised :: Bool } deriving (Eq, Ord, Read, Show, Generic, Typeable) diff --git a/src/Handler/Utils/ExamOffice/Course.hs b/src/Handler/Utils/ExamOffice/Course.hs index f5613bfb0..ec2ecd81d 100644 --- a/src/Handler/Utils/ExamOffice/Course.hs +++ b/src/Handler/Utils/ExamOffice/Course.hs @@ -29,4 +29,4 @@ courseExamOfficeSchools user _course = E.from $ \(school `E.InnerJoin` userFunct let forced = E.maybe E.true id $ examOfficeField E.?. ExamOfficeFieldForced E.orderBy [E.desc forced] - return $ (school, forced) + return (school, forced)