Corrector removed

This commit is contained in:
SJost 2018-07-03 09:20:43 +02:00
parent d58c0e164a
commit a628519922
3 changed files with 11 additions and 15 deletions

12
models
View File

@ -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

View File

@ -753,6 +753,12 @@ pageActions (HomeR) =
, menuItemRoute = AdminTestR
, menuItemAccessCallback' = return True
}
, NavbarAside $ MenuItem
{ menuItemLabel = "Impressum"
, menuItemIcon = Just "book"
, menuItemRoute = VersionR
, menuItemAccessCallback' = return True
}
]
pageActions _ = []

View File

@ -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)
)
<*>