fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MatrikelNr display in UserList

Browse Source
This commit is contained in:
SJost 2018-07-11 12:38:16 +02:00
parent 6f7fdeb374
commit 9ab469311c
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog.md
View File

@ -1,3 +1,6 @@
* Version 10.07.2018
Bugfixes, wählbares Format für Datum
* Version 04.07.2018 * Version 04.07.2018
Hinweis eingefügt, dass alle Daten des Systems spätestens im Dezember 2018 Hinweis eingefügt, dass alle Daten des Systems spätestens im Dezember 2018

12
src/Handler/Users.hs
View File

@ -34,6 +34,12 @@ getUsersR = do
, sortable (Just "display-name") (i18nCell MsgName) $ \DBRow{ dbrOutput = Entity uid User{..} } -> anchorCellM , sortable (Just "display-name") (i18nCell MsgName) $ \DBRow{ dbrOutput = Entity uid User{..} } -> anchorCellM
(AdminUserR <$> encrypt uid) (AdminUserR <$> encrypt uid)
(toWidget . display $ userDisplayName) (toWidget . display $ userDisplayName)
, sortable (Just "matriculation") (i18nCell MsgMatrikelNr) $ \DBRow{ dbrOutput = Entity uid User{..} } -> anchorCellM
(AdminUserR <$> encrypt uid)
(toWidget . display $ userMatrikelnummer)
-- , sortable (Just "last-name") (i18nCell MsgName) $ \DBRow{ dbrOutput = Entity uid User{..} } -> anchorCellM
-- (AdminUserR <$> encrypt uid)
-- (toWidget . display $ last $ impureNonNull $ words $ userDisplayName)
, sortable Nothing (i18nCell MsgAdminFor) $ \DBRow{ dbrOutput = Entity uid _ } -> mempty , sortable Nothing (i18nCell MsgAdminFor) $ \DBRow{ dbrOutput = Entity uid _ } -> mempty
{ dbCellContents = do { dbCellContents = do
schools <- E.select . E.from $ \(school `E.InnerJoin` userAdmin) -> do schools <- E.select . E.from $ \(school `E.InnerJoin` userAdmin) -> do
@ -78,6 +84,12 @@ getUsersR = do
[ ( "display-name" [ ( "display-name"
, SortColumn $ \user -> user E.^. UserDisplayName , SortColumn $ \user -> user E.^. UserDisplayName
) )
, ( "matriculation"
, SortColumn $ \user -> user E.^. UserMatrikelnummer
)
-- , ( "last-name"
-- , SortColumn $ \user -> (last . impureNonNull . words) <$> (user E.^. UserDisplayName)
-- )
] ]
, dbtFilter = mempty , dbtFilter = mempty
, dbtStyle = def , dbtStyle = def