From 5f31e101193772e141057328afef55c31d90c9a0 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Thu, 14 Apr 2022 11:55:33 +0200 Subject: [PATCH] refactor(lms): fix build --- src/Handler/LMS.hs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Handler/LMS.hs b/src/Handler/LMS.hs index e9d18bbd9..9c59ed71e 100644 --- a/src/Handler/LMS.hs +++ b/src/Handler/LMS.hs @@ -171,7 +171,7 @@ mkLmsTable (Entity qid quali) = do now <- liftIO getCurrentTime let nowaday = utctDay now - mbRenewal = addGregorianDurationClip <$> qualificationRefreshWithin quali <*> Just nowaday + _mbRenewal = addGregorianDurationClip <$> qualificationRefreshWithin quali <*> Just nowaday resultDBTable = DBTable{..} where dbtSQLQuery = runReaderT $ do @@ -182,8 +182,8 @@ mkLmsTable (Entity qid quali) = do lift $ do E.on $ user E.^. UserId E.==. qualUser E.^. QualificationUserUser E.on $ user E.^. UserId E.=?. lmsUser E.?. LmsUserUser - E.where_ $ E.val qid E.==. qualUser E.^. QualificationUserQualification - E.&&. E.val qid E.=?. lmsUser E.?. LmsUserQualification + E.&&. E.val qid E.=?. lmsUser E.?. LmsUserQualification + E.where_ $ E.val qid E.==. qualUser E.^. QualificationUserQualification return (qualUser, user, lmsUser) dbtRowKey = queryUser >>> (E.^. UserId) dbtProj = dbtProjFilteredPostId -- TODO: or dbtProjSimple what is the difference? @@ -218,9 +218,10 @@ mkLmsTable (Entity qid quali) = do [ single $ fltrUserNameEmail queryUser , single ("lms-ident" , FilterColumn . E.mkContainsFilterWith (Just . LmsIdent) $ views (to queryLmsUser) (E.?. LmsUserIdent)) , single ("validity" , FilterColumn . E.mkExactFilterLast $ views (to queryQualUser) ((E.>=. E.val nowaday) . (E.^. QualificationUserValidUntil))) - , maybe mempty (\renewal -> - single ("renewal-due" , FilterColumn . E.mkExactFilterLast $ views (to queryQualUser) ((E.<=. E.val renewal) . E.just . (E.^. QualificationUserValidUntil)))) - mbRenewal + , mempty + --, maybe mempty (\renewal -> + -- single ("renewal-due" , FilterColumn . E.mkExactFilterLast $ views (to queryQualUser) ((E.<=. E.val renewal) . E.just . (E.^. QualificationUserValidUntil)))) + -- mbRenewal -- , single $ fltrUserNameEmail queryUser --("user" , FilterColumn . E.mkContainsFilterWith Just $ views (to queryUser) (E.^. UserDisplayName)) -- , ("email" , FilterColumn . E.mkContainsFilterWith Just $ views (to queryUser) (E.^. UserEmail)) @@ -231,8 +232,9 @@ mkLmsTable (Entity qid quali) = do [ fltrUserNameEmailHdrUI MsgTableLmsUser mPrev , prismAForm (singletonFilter "lms-ident" . maybePrism _PathPiece) mPrev $ aopt (hoistField lift textField) (fslI MsgTableLmsIdent) , prismAForm (singletonFilter "validity" . maybePrism _PathPiece) mPrev $ aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgFilterLmsValid) - , if isNothing mbRenewal then mempty - else prismAForm (singletonFilter "renewal-due" . maybePrism _PathPiece) mPrev $ aopt checkBoxField (fslI MsgFilterLmsRenewal) + , mempty + --, if isNothing mbRenewal then mempty + -- else prismAForm (singletonFilter "renewal-due" . maybePrism _PathPiece) mPrev $ aopt checkBoxField (fslI MsgFilterLmsRenewal) -- , fltrUserNameEmailUI mPrev -- prismAForm (singletonFilter "user" . maybePrism _PathPiece) mPrev $ aopt (hoistField lift textField) (fslI MsgTableLmsUser) --, prismAForm (singletonFilter "email" . maybePrism _PathPiece) mPrev $ aopt (hoistField lift textField) (fslI MsgTableEmail)