fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUGFIX: Blattliste

Browse Source
This commit is contained in:
SJost 2018-07-06 13:38:59 +02:00
parent f49001993c
commit 2919162986
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Handler/Home.hs
View File

@ -121,18 +121,14 @@ homeUser uid = do
, E.SqlExpr (E.Value UTCTime) , E.SqlExpr (E.Value UTCTime)
, E.SqlExpr (E.Value (Maybe SubmissionId))) , E.SqlExpr (E.Value (Maybe SubmissionId)))
tableData ((participant `E.InnerJoin` course `E.InnerJoin` sheet) `E.LeftOuterJoin` (submission `E.InnerJoin` subuser)) = do 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 $ submission E.?. SubmissionId E.==. subuser E.?. SubmissionUserSubmission
E.on $ E.just(sheet E.^. SheetId) E.==. submission E.?. SubmissionSheet E.&&. (E.just $ E.val uid) E.==. subuser E.?. SubmissionUserUser
E.on $ course E.^. CourseId E.==. sheet E.^. SheetCourse E.on $ submission E.?. SubmissionSheet E.==. E.just(sheet E.^. SheetId)
E.on $ course E.^. CourseId E.==. participant E.^. CourseParticipantCourse 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.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.&&. sheet E.^. SheetActiveTo E.>=. E.val cTime
E.&&. ( E.&&. sheet E.^. SheetActiveTo E.<=. E.val fTime
(subuser E.?. SubmissionUserUser E.==. (E.just $ E.val uid))
E.||.
(E.isNothing $ subuser E.?. SubmissionUserUser)
)
-- E.limit nrSheetDeadlines -- E.limit nrSheetDeadlines
return return
( course E.^. CourseTerm ( course E.^. CourseTerm