From 062361dc8a26a141158f431ce2ff76bc7e3636e1 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 26 Jul 2019 12:06:13 +0200 Subject: [PATCH] refactor: fix hlint --- src/Handler/Exam/AddUser.hs | 10 +++++----- src/Handler/Exam/RegistrationInvite.hs | 2 +- src/Handler/Exam/Show.hs | 2 +- src/Handler/Exam/Users.hs | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Handler/Exam/AddUser.hs b/src/Handler/Exam/AddUser.hs index 22e45d557..b34b52288 100644 --- a/src/Handler/Exam/AddUser.hs +++ b/src/Handler/Exam/AddUser.hs @@ -93,23 +93,23 @@ postEAddUserR tid ssh csh examn = do -- register known users execWriterT $ mapM (registerUser examCourse eid registerCourse occId) uids - when (not $ null emails) $ + unless (null emails) $ tell . pure <=< messageI Success . MsgExamParticipantsInvited $ length emails - when (not $ null alreadyRegistered) $ + unless (null alreadyRegistered) $ tell . pure <=< messageI Success . MsgExamRegistrationParticipantsRegistered $ length registeredOneField - when (not $ null registeredNoField) $ do + unless (null registeredNoField) $ do let modalTrigger = [whamlet|_{MsgExamRegistrationRegisteredWithoutField (length registeredNoField)}|] modalContent = $(widgetFile "messages/examRegistrationInvitationRegisteredWithoutField") tell . pure <=< messageWidget Warning $ msgModal modalTrigger (Right modalContent) - when (not $ null noCourseRegistration) $ do + unless (null noCourseRegistration) $ do let modalTrigger = [whamlet|_{MsgExamRegistrationNotRegisteredWithoutCourse (length noCourseRegistration)}|] modalContent = $(widgetFile "messages/examRegistrationInvitationNotRegisteredWithoutCourse") tell . pure <=< messageWidget Error $ msgModal modalTrigger (Right modalContent) - when (not $ null registeredOneField) $ + unless (null registeredOneField) $ tell . pure <=< messageI Success . MsgExamRegistrationAndCourseParticipantsRegistered $ length registeredOneField registerUser :: CourseId -> ExamId -> Bool -> Maybe ExamOccurrenceId -> UserId -> WriterT AddRecipientsResult (YesodJobDB UniWorX) () diff --git a/src/Handler/Exam/RegistrationInvite.hs b/src/Handler/Exam/RegistrationInvite.hs index 2552bc9d4..81cf98774 100644 --- a/src/Handler/Exam/RegistrationInvite.hs +++ b/src/Handler/Exam/RegistrationInvite.hs @@ -81,7 +81,7 @@ examRegistrationInvitationConfig = InvitationConfig{..} | otherwise = Nothing itStartsAt = Nothing - return $ InvitationTokenConfig{..} + return InvitationTokenConfig{..} invitationRestriction _ _ = return Authorized invitationForm (Entity _ Exam{..}) (InvDBDataExamRegistration{..}, _) uid = hoistAForm liftHandlerT . wFormToAForm $ do isRegistered <- fmap (is _Just) . liftHandlerT . runDB . getBy $ UniqueParticipant uid examCourse diff --git a/src/Handler/Exam/Show.hs b/src/Handler/Exam/Show.hs index 0e34f360c..ad371d147 100644 --- a/src/Handler/Exam/Show.hs +++ b/src/Handler/Exam/Show.hs @@ -51,7 +51,7 @@ getEShowR tid ssh csh examn = do let registered | Just uid <- mUid - = E.exists . E.from $ \examRegistration -> do + = E.exists . E.from $ \examRegistration -> E.where_ $ examRegistration E.^. ExamRegistrationExam E.==. E.val eId E.&&. examRegistration E.^. ExamRegistrationUser E.==. E.val uid E.&&. examRegistration E.^. ExamRegistrationOccurrence E.==. E.just (examOccurrence E.^. ExamOccurrenceId) diff --git a/src/Handler/Exam/Users.hs b/src/Handler/Exam/Users.hs index 81d19040a..3eb9fd61b 100644 --- a/src/Handler/Exam/Users.hs +++ b/src/Handler/Exam/Users.hs @@ -518,7 +518,7 @@ postEUsersR tid ssh csh examn = do E.where_ $ courseParticipant E.^. CourseParticipantCourse E.==. E.val examCourse E.&&. courseParticipant E.^. CourseParticipantUser E.==. user E.^. UserId E.limit 2 - return $ (isCourseParticipant, user E.^. UserId) + return (isCourseParticipant, user E.^. UserId) case users of (filter . view $ _1 . _Value -> [(E.Value isPart, E.Value uid)]) -> return (isPart, uid)