From 240477b9abf55c3df84378c95760d24405511d6a Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 20 Jul 2020 16:13:45 +0200 Subject: [PATCH] refactor: hlint --- src/Handler/Sheet/CorrectorInvite.hs | 2 +- src/Handler/Sheet/List.hs | 6 +++--- src/Handler/Sheet/New.hs | 6 +++--- src/Handler/Sheet/Show.hs | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Handler/Sheet/CorrectorInvite.hs b/src/Handler/Sheet/CorrectorInvite.hs index 084ca1b75..810dfa09b 100644 --- a/src/Handler/Sheet/CorrectorInvite.hs +++ b/src/Handler/Sheet/CorrectorInvite.hs @@ -74,7 +74,7 @@ correctorInvitationConfig = InvitationConfig{..} itAuthority <- HashSet.singleton . Right <$> liftHandler requireAuthId return $ InvitationTokenConfig itAuthority Nothing Nothing Nothing invitationRestriction _ _ = return Authorized - invitationForm _ (InvDBDataSheetCorrector cLoad cState, _) _ = pure $ (JunctionSheetCorrector cLoad cState, ()) + invitationForm _ (InvDBDataSheetCorrector cLoad cState, _) _ = pure (JunctionSheetCorrector cLoad cState, ()) invitationInsertHook _ _ _ _ _ = id invitationSuccessMsg (Entity _ Sheet{..}) _ = return . SomeMessage $ MsgCorrectorInvitationAccepted sheetName invitationUltDest (Entity _ Sheet{..}) _ = do diff --git a/src/Handler/Sheet/List.hs b/src/Handler/Sheet/List.hs index 16a3b532b..a4b7217ba 100644 --- a/src/Handler/Sheet/List.hs +++ b/src/Handler/Sheet/List.hs @@ -31,10 +31,10 @@ getSheetListR tid ssh csh = do E.where_ $ sheetEdit E.^. SheetEditSheet E.==. sheet E.^. SheetId return . E.max_ $ sheetEdit E.^. SheetEditTime - sheetData :: E.SqlExpr (Entity Sheet) `E.LeftOuterJoin` (E.SqlExpr (Maybe (Entity Submission)) `E.InnerJoin` (E.SqlExpr (Maybe (Entity SubmissionUser)))) -> E.SqlQuery () + sheetData :: E.SqlExpr (Entity Sheet) `E.LeftOuterJoin` (E.SqlExpr (Maybe (Entity Submission)) `E.InnerJoin` E.SqlExpr (Maybe (Entity SubmissionUser))) -> E.SqlQuery () sheetData (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.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 @@ -173,5 +173,5 @@ getSheetListR tid ssh csh = do let statistics = gradeSummaryWidget MsgSheetGradingSummaryTitle raw_statistics -- only over shown rows -- foldMap (\(_, E.Value sheetType, E.Value mbPts) -> sheetTypeSum sheetType (join mbPts)) - defaultLayout $ do + defaultLayout $(widgetFile "sheetList") diff --git a/src/Handler/Sheet/New.hs b/src/Handler/Sheet/New.hs index 77cbb16a5..cf0c7cb3e 100644 --- a/src/Handler/Sheet/New.hs +++ b/src/Handler/Sheet/New.hs @@ -67,8 +67,8 @@ postSheetNewR tid ssh csh = do , sfRequireExamRegistration = Nothing } _other -> Nothing - let action newSheet = -- More specific error message for new sheet could go here, if insertUnique returns Nothing - insertUnique $ newSheet + let action = -- More specific error message for new sheet could go here, if insertUnique returns Nothing + insertUnique handleSheetEdit tid ssh csh Nothing template action defaultLoads :: CourseId -> DB Loads @@ -76,7 +76,7 @@ defaultLoads :: CourseId -> DB Loads -- -- For every user, that ever was a corrector for this course, return their last `Load`. -- "Last `Load`" is taken to mean their `Load` on the `Sheet` with the most recent creation time (first edit). -defaultLoads cId = do +defaultLoads cId = fmap toMap . E.select . E.from $ \(sheet `E.InnerJoin` sheetCorrector) -> E.distinctOnOrderBy [E.asc (sheetCorrector E.^. SheetCorrectorUser)] $ do E.on $ sheet E.^. SheetId E.==. sheetCorrector E.^. SheetCorrectorSheet diff --git a/src/Handler/Sheet/Show.hs b/src/Handler/Sheet/Show.hs index 1fd3763e1..4ce503dbc 100644 --- a/src/Handler/Sheet/Show.hs +++ b/src/Handler/Sheet/Show.hs @@ -37,7 +37,7 @@ getSShowR tid ssh csh shn = do E.where_ $ sheetFile E.^. SheetFileSheet E.==. E.val sid E.&&. E.not_ (E.isNothing $ sheetFile E.^. SheetFileContent) -- don't show directories -- return desired columns - return $ (sheetFile E.^. SheetFileTitle, sheetFile E.^. SheetFileModified, sheetFile E.^. SheetFileType) + return (sheetFile E.^. SheetFileTitle, sheetFile E.^. SheetFileModified, sheetFile E.^. SheetFileType) let colonnadeFiles = widgetColonnade $ mconcat [ sortable (Just "type") (i18nCell MsgSheetFileTypeHeader) $ \(_,_, E.Value ftype) -> let link = CSheetR tid ssh csh shn $ SZipR ftype in