From b0023dfa672958b2686b995c722027409724b83b Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <>
Date: Mon, 9 Nov 2020 19:31:14 +0100
Subject: [PATCH] fix(schedule-opt): course schedule opt does not affect
 unregistered tutorials

---
 src/Utils/Schedule.hs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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