From 2bcd17e9b22b64caa3212ca2b5525ef87ed8eb99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20G=C3=B6tz?=
 <michael-guenther.goetz@stud.uni-bamberg.de>
Date: Thu, 11 Apr 2019 20:04:26 +0200
Subject: [PATCH] Implement show admin first login, Close #36

---
 account_manager/views/user_views.py   | 12 +++++++++++-
 templates/realm/realm_user.jinja2     | 10 ++++++----
 templates/user/realm_user_list.jinja2 | 13 -------------
 3 files changed, 17 insertions(+), 18 deletions(-)
 delete mode 100644 templates/user/realm_user_list.jinja2

diff --git a/account_manager/views/user_views.py b/account_manager/views/user_views.py
index b019c92..d7cd238 100644
--- a/account_manager/views/user_views.py
+++ b/account_manager/views/user_views.py
@@ -18,7 +18,17 @@ def realm_user(request, realm_id):
     realm_obj = Realm.objects.get(id=realm_id)
     LdapUser.base_dn = realm_obj.ldap_base_dn
     realm_users = LdapUser.objects.all()
-    return render(request, 'realm/realm_user.jinja2', {'realm': realm_obj, 'realm_user': realm_users})
+    user_wrappers = []
+    for user in realm_users:
+        try:
+            django_user = User.objects.get(username=user.username)
+            if django_user.last_login:
+                user_wrappers.append({'user': user, 'active': True})
+            else:
+                user_wrappers.append({'user': user, 'active': False})
+        except ObjectDoesNotExist:
+            user_wrappers.append({'user': user, 'active': False})
+    return render(request, 'realm/realm_user.jinja2', {'realm': realm_obj, 'realm_user': user_wrappers})
 
 
 @login_required
diff --git a/templates/realm/realm_user.jinja2 b/templates/realm/realm_user.jinja2
index 2205cc4..46d58f3 100644
--- a/templates/realm/realm_user.jinja2
+++ b/templates/realm/realm_user.jinja2
@@ -14,15 +14,17 @@
             <th scope="col">E-Mail</th>
             <th scope="col">Vorname</th>
             <th scope="col">Nachname</th>
+            <th scope="col">Aktiv</th>
         </tr>
         </thead>
         <tbody>
         {% for user in realm_user %}
             <tr>
-                <td><a href="{{ url('realm-user-detail', args=[realm.id, user.dn]) }}">{{ user.username }}</a></td>
-                <td>{{ user.email }}</td>
-                <td>{{ user.first_name }}</td>
-                <td>{{ user.last_name }}</td>
+                <td><a href="{{ url('realm-user-detail', args=[realm.id, user.user.dn]) }}">{{ user.user.username }}</a></td>
+                <td>{{ user.user.email }}</td>
+                <td>{{ user.user.first_name }}</td>
+                <td>{{ user.user.last_name }}</td>
+                <td>{{ user.active }}</td>
             </tr>
         {% endfor %}
         </tbody>
diff --git a/templates/user/realm_user_list.jinja2 b/templates/user/realm_user_list.jinja2
deleted file mode 100644
index aa17e2e..0000000
--- a/templates/user/realm_user_list.jinja2
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends 'base.jinja2' %}
-{% block content %}
-    <a href="{{ url('user-add') }}">Nutzer anlegen</a> | <a href="{{ url('group-add') }}">Gruppe anlegen</a>
-    <h2>Nutzer</h2>
-    {% for user in users %}
-        <p>{{ user.username }} - <a href="{{ url('user', args=[user.dn]) }}">{{ user.dn }}</a></p>
-    {% endfor %}
-
-    <h2>Gruppen</h2>
-    {% for group in groups %}
-        <p>{{ group.name }} - <a href="{{ url('group', args=[group.dn]) }}">{{ group.dn }}</a></p>
-    {% endfor %}
-{% endblock %}