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-opt): course schedule opt does not affect unregistered tutorials

Browse Source
This commit is contained in:
Sarah Vaupel 2020-11-09 19:31:14 +01:00
parent 1d34cae4e2
commit b0023dfa67
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Utils/Schedule.hs
View File

@ -71,13 +71,12 @@ tutorialShouldBeDisplayed muid@(Just uid) ata course tutorial = E.exists . E.fro
mCourseOpt = E.subSelect $ getCourseScheduleOpt course user
in E.where_ $ user E.^. UserId E.==. E.val uid
E.&&. E.fromMaybe
( E.fromMaybe
( user E.^. UserScheduleOccurrenceDisplayDefault
E.&&. ( isTutorialTutor muid ata (tutorial E.^. TutorialId)
( ( E.fromMaybe
(user E.^. UserScheduleOccurrenceDisplayDefault)
mCourseOpt
) E.&&. ( isTutorialTutor muid ata (tutorial E.^. TutorialId)
E.||. isTutorialParticipant muid ata (tutorial E.^. TutorialId)
)
)
mCourseOpt
)
mTutorialOpt
tutorialShouldBeDisplayed _ _ _ _ = E.false