From a628519922df0aaed09f4c2028aa44b7e6f57f35 Mon Sep 17 00:00:00 2001
From: SJost <jost@tcs.ifi.lmu.de>
Date: Tue, 3 Jul 2018 09:20:43 +0200
Subject: [PATCH] Corrector removed

---
 models                 | 12 ------------
 src/Foundation.hs      |  6 ++++++
 src/Handler/Profile.hs |  8 +++++---
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/models b/models
index 070bc1a17..61bb54563 100644
--- a/models
+++ b/models
@@ -80,18 +80,6 @@ Lecturer
     user         UserId
     course       CourseId
     UniqueLecturer user course
-Corrector                  -- deprecated
-    user         UserId
-    course       CourseId
-    load         Load 
-    -- SELECT submissionID FROM Tutorial, TutorialUser, Submission, Sheet
-    -- WHERE ( tutorialTutor = correctorUserId
-    --      && tutorialCourse = correctorCourseId
-    --      && tutorialUserTutorial = tutorialId 
-    --      && submissionUser = tutorialUserUser
-    --      && sheetId = SubmissionSheet
-    --      && sheetCourse = correctorCourseId
-    --      )
 CourseParticipant
     course          CourseId
     user            UserId
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 1a9b854c7..6b513fb6b 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -753,6 +753,12 @@ pageActions (HomeR) =
       , menuItemRoute = AdminTestR
       , menuItemAccessCallback' = return True
       }
+  , NavbarAside $ MenuItem
+      { menuItemLabel = "Impressum"
+      , menuItemIcon  = Just "book"
+      , menuItemRoute = VersionR
+      , menuItemAccessCallback' = return True
+      }
   ]
 
 pageActions _ = []
diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index b6639a11d..8a516562c 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -84,9 +84,11 @@ getProfileR = do
                 return (course ^. CourseShorthand, course ^. CourseTerm)
             )
             <*>
-            (E.select $ E.from $ \(corrector `E.InnerJoin` course) -> do
-                E.where_ $ corrector ^. CorrectorUser E.==. E.val uid
-                E.on $ corrector ^. CorrectorCourse E.==. course ^. CourseId
+            (E.select $ E.from $ \(sheet `E.InnerJoin` corrector `E.InnerJoin` course) -> do
+                E.on $ sheet ^. SheetCourse E.==. course    ^. CourseId
+                E.on $ sheet ^. SheetId     E.==. corrector ^. SheetCorrectorSheet
+                E.where_ $ corrector ^. SheetCorrectorUser E.==. E.val uid
+
                 return (course ^. CourseShorthand, course ^. CourseTerm)
             )
             <*>