diff --git a/src/Utils/Schedule.hs b/src/Utils/Schedule.hs index c7416fbe4..57caa7d64 100644 --- a/src/Utils/Schedule.hs +++ b/src/Utils/Schedule.hs @@ -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