From 2919162986871dec0e78b105b34ec0727a969a07 Mon Sep 17 00:00:00 2001 From: SJost Date: Fri, 6 Jul 2018 13:38:59 +0200 Subject: [PATCH] BUGFIX: Blattliste --- src/Handler/Home.hs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/Handler/Home.hs b/src/Handler/Home.hs index dffb3a887..dfb28c82b 100644 --- a/src/Handler/Home.hs +++ b/src/Handler/Home.hs @@ -121,18 +121,14 @@ homeUser uid = do , E.SqlExpr (E.Value UTCTime) , E.SqlExpr (E.Value (Maybe SubmissionId))) tableData ((participant `E.InnerJoin` course `E.InnerJoin` sheet) `E.LeftOuterJoin` (submission `E.InnerJoin` subuser)) = do - E.on $ submission E.?. SubmissionId E.==. subuser E.?. SubmissionUserSubmission - E.on $ E.just(sheet E.^. SheetId) E.==. submission E.?. SubmissionSheet - E.on $ course E.^. CourseId E.==. sheet E.^. SheetCourse - E.on $ course E.^. CourseId E.==. participant E.^. CourseParticipantCourse + E.on $ submission E.?. SubmissionId E.==. subuser E.?. SubmissionUserSubmission + E.&&. (E.just $ E.val uid) E.==. subuser E.?. SubmissionUserUser + E.on $ submission E.?. SubmissionSheet E.==. E.just(sheet E.^. SheetId) + E.on $ course E.^. CourseId E.==. sheet E.^. SheetCourse + E.on $ course E.^. CourseId E.==. participant E.^. CourseParticipantCourse E.where_ $ participant E.^. CourseParticipantUser E.==. E.val uid - E.&&. sheet E.^. SheetActiveTo E.<=. E.val fTime E.&&. sheet E.^. SheetActiveTo E.>=. E.val cTime - E.&&. ( - (subuser E.?. SubmissionUserUser E.==. (E.just $ E.val uid)) - E.||. - (E.isNothing $ subuser E.?. SubmissionUserUser) - ) + E.&&. sheet E.^. SheetActiveTo E.<=. E.val fTime -- E.limit nrSheetDeadlines return ( course E.^. CourseTerm