From 0cecd7e07d0acc185e470490722ec65558e02bd5 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Thu, 23 Feb 2023 17:56:05 +0100 Subject: [PATCH] chore(users): filter by avsno --- src/Handler/Users.hs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Handler/Users.hs b/src/Handler/Users.hs index 25570eba1..eabf9452e 100644 --- a/src/Handler/Users.hs +++ b/src/Handler/Users.hs @@ -296,6 +296,12 @@ postUsersR = do E.where_ $ (spvr E.^. UserSupervisorUser E.==. user E.^.UserId) E.&&. E.any (E.hasInfix (usrSpvr E.^. UserDisplayName)) (E.val <$> Set.toList criteria) ) + , ( "avs-number", FilterColumn $ E.mkExistsFilter $ \user criterion -> + E.from $ \usrAvs -> -- do + E.where_ $ usrAvs E.^. UserAvsUser E.==. user E.^.UserId + E.&&. ((E.val criterion :: E.SqlExpr (E.Value (CI Text))) `E.isInfixOf` + (E.explicitUnsafeCoerceSqlExprValue "citext" (usrAvs E.^. UserAvsNoPerson) :: E.SqlExpr (E.Value (CI Text))) ) + ) ] , dbtFilterUI = \mPrev -> mconcat [ prismAForm (singletonFilter "user-search") mPrev $ aopt textField (fslI MsgName) @@ -303,6 +309,7 @@ postUsersR = do , prismAForm (singletonFilter "user-email") mPrev $ aopt textField (fslI MsgAdminUserEmail) -- , prismAForm (singletonFilter "matriculation") mPrev $ aopt matriculationField (fslI MsgTableMatrikelNr) , prismAForm (singletonFilter "personal-number" ) mPrev $ aopt textField (fslI MsgCompanyPersonalNumber) + , prismAForm (singletonFilter "avs-number" ) mPrev $ aopt textField (fslI MsgAvsPersonNo) , prismAForm (singletonFilter "company-department" ) mPrev $ aopt textField (fslI MsgCompanyDepartment) , prismAForm (singletonFilter "user-company") mPrev $ aopt textField (fslI MsgTableCompany) , prismAForm (singletonFilter "user-supervisor") mPrev $ aopt textField (fslI MsgTableSupervisor)