diff --git a/src/Handler/Course/List.hs b/src/Handler/Course/List.hs index 98618f45e..f6c63d741 100644 --- a/src/Handler/Course/List.hs +++ b/src/Handler/Course/List.hs @@ -51,10 +51,10 @@ resultMayEditCourse = _dbrOutput . _5 type CourseTableExpr = (E.SqlExpr (Entity Course) `E.InnerJoin` E.SqlExpr (Entity School)) queryCourse :: IndexPreservingGetter CourseTableExpr (E.SqlExpr (Entity Course)) -queryCourse = to $ $(E.sqlIJproj 2 1) +queryCourse = to $(E.sqlIJproj 2 1) querySchool :: IndexPreservingGetter CourseTableExpr (E.SqlExpr (Entity School)) -querySchool = to $ $(E.sqlIJproj 2 2) +querySchool = to $(E.sqlIJproj 2 2) queryParticipants :: IndexPreservingGetter CourseTableExpr (E.SqlExpr (E.Value Int)) queryParticipants = queryCourse . to (E.^. CourseId) . to numCourseParticipants diff --git a/src/Handler/Course/ParticipantInvite.hs b/src/Handler/Course/ParticipantInvite.hs index fab7884ca..99b874430 100644 --- a/src/Handler/Course/ParticipantInvite.hs +++ b/src/Handler/Course/ParticipantInvite.hs @@ -261,7 +261,7 @@ registerUser cid (_avsIdent, Just uid) = exceptT return return $ do upsertNewTutorial :: CourseId -> TutorialIdent -> Handler TutorialId upsertNewTutorial cid tutorialName = do now <- liftIO getCurrentTime - tutId <- runDB $ do + runDB $ do Entity tutId _ <- upsert Tutorial { tutorialCourse = cid @@ -284,7 +284,6 @@ upsertNewTutorial cid tutorialName = do ] audit $ TransactionTutorialEdit tutId return tutId - return tutId registerTutorialMembers :: TutorialId -> Set UserId -> Handler () registerTutorialMembers tutId (Set.toList -> users) = runDB $ do diff --git a/src/Handler/Course/Register.hs b/src/Handler/Course/Register.hs index 01ed75cee..028e5d4ac 100644 --- a/src/Handler/Course/Register.hs +++ b/src/Handler/Course/Register.hs @@ -52,7 +52,7 @@ courseRegisterForm (Entity cid Course{..}) = liftHandler $ do = BtnCourseDeregister | otherwise = BtnCourseRegister - isRegistered = btn `elem` [BtnCourseDeregister] + isRegistered = btn == BtnCourseDeregister return . (, btn) . wFormToAForm $ do MsgRenderer mr <- getMsgRenderer diff --git a/src/Utils/Course.hs b/src/Utils/Course.hs index a6859458f..2446ac190 100644 --- a/src/Utils/Course.hs +++ b/src/Utils/Course.hs @@ -132,9 +132,8 @@ courseIsVisible :: UTCTime -> E.SqlExpr (Entity Course) -> E.SqlExpr (E.Value Bool) courseIsVisible now course = - (E.maybe E.false (\visibleFrom -> visibleFrom E.<=. E.val now) (course E.^. CourseVisibleFrom) + E.maybe E.false (\visibleFrom -> visibleFrom E.<=. E.val now) (course E.^. CourseVisibleFrom) E.&&. E.maybe E.true (\visibleTo -> E.val now E.<=. visibleTo) (course E.^. CourseVisibleTo) - ) courseIsVisible' :: UTCTime -> Entity Course