diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs index 0dc1351ec..e8e6e5ffb 100644 --- a/src/Handler/Sheet.hs +++ b/src/Handler/Sheet.hs @@ -236,7 +236,7 @@ getSheetListR tid csh = do , ( "rating" , SortColumn $ \(_ `E.LeftOuterJoin` (submission `E.InnerJoin` submissionUser)) -> submission E.?. SubmissionRatingPoints ) --- GitLab Issue $1??: HOW TO SORT? +-- GitLab Issue $143: HOW TO SORT? -- , ( "percent" -- , SortColumn $ \(sheet `E.LeftOuterJoin` (submission `E.InnerJoin` ))) -> -- case sheetType of -- no Haskell inside Esqueleto, right? @@ -248,15 +248,15 @@ getSheetListR tid csh = do , dbtStyle = def , dbtIdent = "sheets" :: Text } - cTime <- Just <$> liftIO getCurrentTime -- TODO: remove me, see issue #??? + cTime <- Just <$> liftIO getCurrentTime -- TODO: remove me and the 2 next TODOs, see issue #142 rawStats <- runDB $ do E.select $ E.from $ \(sheet `E.LeftOuterJoin` (submission `E.InnerJoin` submissionUser)) -> do E.on $ submission E.?. SubmissionId E.==. submissionUser E.?. SubmissionUserSubmission E.on $ (E.just $ sheet E.^. SheetId) E.==. submission E.?. SubmissionSheet E.&&. submissionUser E.?. SubmissionUserUser E.==. E.val muid E.where_ $ sheet E.^. SheetCourse E.==. E.val cid - E.&&. (E.not_ $ E.isNothing $ sheet E.^. SheetVisibleFrom) - E.&&. sheet E.^. SheetVisibleFrom E.<=. E.val cTime + E.&&. (E.not_ $ E.isNothing $ sheet E.^. SheetVisibleFrom) -- TODO see above #142 + E.&&. sheet E.^. SheetVisibleFrom E.<=. E.val cTime -- TODO see above #142 return $ (sheet E.^. SheetType, submission E.?. SubmissionRatingPoints) let sheetTypeSummary = foldl' sumSheetTypes emptySheetTypeSummary