fraport/fradrive-old
fraport/fradrive-old
Archived
3
1
Fork 0
Code Issues 65 Pull Requests 5 Actions Packages Projects Releases 197 Wiki Activity

fix(schedule): use should-be-displayed result for course event actions

Browse Source
This commit is contained in:
Sarah Vaupel 2020-11-10 20:31:45 +01:00
parent 45a5766210
commit ec04fe161e
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Handler/Course/Show.hs
View File

@ -100,23 +100,11 @@ getCShowR tid ssh csh = do
events' <- fmap (sortOn $ courseEventTime . entityVal) . lift $ selectList [ CourseEventCourse ==. cid ] []
events <- forM events' $ \(Entity evId ev) -> do
evId' <- encrypt evId
courseEventShouldBeDisplayedInSchedule <- lift $ E.select . E.from $ \(course `E.InnerJoin` courseEvent) -> courseEventShouldBeDisplayedInSchedule (view _1 <$> mbAuth) ata course courseEvent
mCourseEventScheduleOpt <- case mbAuth of
Just (aid,_) -> lift $ getBy $ UniqueCourseEventScheduleOpt evId aid
Nothing -> return Nothing
let
currentOpt = maybe
( maybe
( maybe
False
((&&) (is _Just registration) . userScheduleOccurrenceDisplayDefault . view _2)
mbAuth
)
(courseScheduleOptOpt . entityVal)
mCourseScheduleOpt
)
(courseEventScheduleOptOpt . entityVal)
mCourseEventScheduleOpt
return (evId', ev, currentOpt, mCourseEventScheduleOpt)
return (evId', ev, courseEventShouldBeDisplayedInSchedule, mCourseEventScheduleOpt)
hasSubmissionGroups <- lift . E.selectExists . E.from $ \(submissionGroupUser `E.InnerJoin` submissionGroup) -> do
E.on $ submissionGroupUser E.^. SubmissionGroupUserSubmissionGroup E.==. submissionGroup E.^. SubmissionGroupId