From 9ab469311cd23337232914c779daaf46dc139164 Mon Sep 17 00:00:00 2001
From: SJost <jost@tcs.ifi.lmu.de>
Date: Wed, 11 Jul 2018 12:38:16 +0200
Subject: [PATCH] MatrikelNr display in UserList

---
 ChangeLog.md         |  3 +++
 src/Handler/Users.hs | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/ChangeLog.md b/ChangeLog.md
index 09b99076d..fbe1b5009 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,6 @@
+  * Version 10.07.2018
+    Bugfixes, wählbares Format für Datum
+
   * Version 04.07.2018
 
     Hinweis eingefügt, dass alle Daten des Systems spätestens im Dezember 2018
diff --git a/src/Handler/Users.hs b/src/Handler/Users.hs
index 9d3965c57..47a27cbaa 100644
--- a/src/Handler/Users.hs
+++ b/src/Handler/Users.hs
@@ -34,6 +34,12 @@ getUsersR = do
       , sortable (Just "display-name") (i18nCell MsgName) $ \DBRow{ dbrOutput = Entity uid User{..} } -> anchorCellM
           (AdminUserR <$> encrypt uid)
           (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
           { dbCellContents = do
               schools <- E.select . E.from $ \(school `E.InnerJoin` userAdmin) -> do
@@ -78,6 +84,12 @@ getUsersR = do
         [ ( "display-name"
           , SortColumn $ \user -> user E.^. UserDisplayName
           )
+        , ( "matriculation"
+          , SortColumn $ \user -> user E.^. UserMatrikelnummer
+          )
+--         , ( "last-name"
+--           , SortColumn $ \user -> (last . impureNonNull . words) <$> (user E.^. UserDisplayName)
+--           )
         ]
     , dbtFilter    = mempty
     , dbtStyle     = def