From b203ededaa255600f239f2778b151b99d52ce9e1 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Tue, 20 Dec 2022 09:54:19 +0100 Subject: [PATCH] chore(avs): fix avs synch rowkey ident problem --- src/Handler/Admin/Avs.hs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Handler/Admin/Avs.hs b/src/Handler/Admin/Avs.hs index b945c7793..feaadc911 100644 --- a/src/Handler/Admin/Avs.hs +++ b/src/Handler/Admin/Avs.hs @@ -344,9 +344,9 @@ getProblemAvsSynchR = do >> redirect ProblemAvsSynchR ((r0,tb0),(r1,tb1),(r2,tb2)) <- runDB $ (,,) - <$> mkLicenceTable AvsNoLicence setTo0 (Just LicenceTableChangeAvs) - <*> mkLicenceTable AvsLicenceVorfeld setTo1 (Just LicenceTableChangeAvs) - <*> mkLicenceTable AvsLicenceRollfeld setTo2 (Just LicenceTableChangeAvs) + <$> mkLicenceTable "driveSynchNoLicence" AvsNoLicence setTo0 (Just LicenceTableChangeAvs) + <*> mkLicenceTable "driveSynchVorfeld" AvsLicenceVorfeld setTo1 (Just LicenceTableChangeAvs) + <*> mkLicenceTable "driveSynchRollfeld" AvsLicenceRollfeld setTo2 (Just LicenceTableChangeAvs) -- for debugging let sres x = case x of @@ -402,12 +402,11 @@ instance HasUser LicenceTableData where hasUser = resultUser . _entityVal -mkLicenceTable :: AvsLicence -> Set AvsPersonId -> Maybe LicenceTableAction -> DB (FormResult (LicenceTableActionData, Set AvsPersonId), Widget) -mkLicenceTable aLic apids defAct = do +mkLicenceTable :: Text -> AvsLicence -> Set AvsPersonId -> Maybe LicenceTableAction -> DB (FormResult (LicenceTableActionData, Set AvsPersonId), Widget) +mkLicenceTable dbtIdent aLic apids defAct = do currentRoute <- fromMaybe (error "mkLicenceTable called from 404-handler") <$> liftHandler getCurrentRoute now <- liftIO getCurrentTime - let nowaday = utctDay now - dbtIdent = "drivingLicenceSynch" :: Text + let nowaday = utctDay now dbtStyle = def fltrLic qual = if -- | aLic == AvsNoLicence -> E.true -- could be R, F, both or none at all, but has licence in AVS @@ -420,7 +419,8 @@ mkLicenceTable aLic apids defAct = do E.on $ user E.^. UserId E.==. usrAvs E.^. UserAvsUser E.where_ $ fltrLic qual E.&&. (usrAvs E.^. UserAvsPersonId `E.in_` E.vals apids) return (user, qualUser, usrAvs E.^. UserAvsPersonId, qual) - dbtRowKey = queryUserAvs >>> (E.^. UserAvsPersonId) + dbtRowKey = (queryUserAvs >>> (E.^. UserAvsPersonId)) + &&& (queryQualification >>> (E.?. QualificationId)) --dbtProj = dbtProjSimple $ \(user, qualUsr, E.Value api, quali) -> return (user, qualUsr, api, quali) dbtProj = dbtProjSimple $ pure . over _3 E.unValue dbtColonnade = mconcat