fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(course-teaser): only true lecturers without assistants

Browse Source
This commit is contained in:
Sarah Vaupel 2019-08-09 11:47:56 +02:00
parent 5c88c13cf8
commit 7926f29da1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Handler/Course/List.hs
View File

@ -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