From 7926f29da1565ce27600115d0030246cb1bf4ba0 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Fri, 9 Aug 2019 11:47:56 +0200 Subject: [PATCH] feat(course-teaser): only true lecturers without assistants --- src/Handler/Course/List.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Handler/Course/List.hs b/src/Handler/Course/List.hs index 16b67cb9c..55ab97a2b 100644 --- a/src/Handler/Course/List.hs +++ b/src/Handler/Course/List.hs @@ -83,7 +83,7 @@ makeCourseTable whereClause colChoices psValidator = do return (course, participants, registered, school) lecturerQuery cid (user `E.InnerJoin` lecturer) = do E.on $ user E.^. UserId E.==. lecturer E.^. LecturerUser - E.where_ $ cid E.==. lecturer E.^. LecturerCourse + E.where_ $ cid E.==. lecturer E.^. LecturerCourse E.&&. lecturer E.^. LecturerType E.==. E.val CourseLecturer return user dbtProj :: DBRow _ -> MaybeT (ReaderT SqlBackend (HandlerT UniWorX IO)) CourseTableData dbtProj = traverse $ \(course, E.Value participants, E.Value registered, school) -> do @@ -138,7 +138,7 @@ makeCourseTable whereClause colChoices psValidator = do -- , ( "openregistration", FilterColumn $ \(course `E.InnerJoin` _school) criterion -> case getLast (criterion :: Last Bool) of -- Nothing -> E.val True :: E.SqlExpr (E.Value Bool) -- -- TODO: get current time?? - -- Just True -> (maybe (E.val True :: E.SqlExpr (E.Value Bool)) ((E.<=.) today) $ course E.^. CourseRegisterTo) E.&&. (maybe (E.val True :: E.SqlExpr (E.Value Bool)) ((E.>.) today) $ course E.^. CourseRegisterFrom) + -- Just True -> (maybe (E.val True :: E.SqlExpr (E.Value Bool)) ((E.<=.) today) $ course E.^. CourseRegisterTo) E.&&. (maybe (E.val True :: E.SqlExpr (E.Value Bool)) ((E.>=.) today) $ course E.^. CourseRegisterFrom) -- _ -> E.val False :: E.SqlExpr (E.Value Bool) -- TODO: rethink -- ) , ( "registered", FilterColumn $ \tExpr criterion -> case getLast (criterion :: Last Bool) of