From d175fbcb385fe903f7934011b421c38475db5be9 Mon Sep 17 00:00:00 2001
From: Klaus-Uwe Mitterer <git@kumi.email>
Date: Fri, 1 Feb 2019 08:19:18 +0000
Subject: [PATCH] Implement user status display

---
 manager/templatetags/userstatus.py | 20 +++++++++++++++-----
 templates/base.html                |  3 ++-
 templates/manager/index.html       |  4 ++--
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/manager/templatetags/userstatus.py b/manager/templatetags/userstatus.py
index b2d8ab1..1026e04 100644
--- a/manager/templatetags/userstatus.py
+++ b/manager/templatetags/userstatus.py
@@ -6,8 +6,18 @@ from django.utils import timezone
 register = template.Library()
 
 @register.simple_tag
-def updateUserStatus(user):
-    try:
-        UserStatus.objects.filter(user=user)[0].last_action = timezone.now()
-    except:
-        pass
+def updateUserStatus(user, sec = False):
+    if user.is_authenticated:
+        try:
+            status = UserStatus.objects.filter(user=user)[0]
+            status.last_action = timezone.now()
+            status.save()
+            return ""
+        except IndexError:
+            if not sec:
+                UserStatus.objects.create(user=user)
+                return "<!-- %s -->" % updateUserStatus(user, True)
+            return "Unresolved IndexError"
+        except Exception as e:
+            return "<!-- %s -->" % str(e)
+    return ""
diff --git a/templates/base.html b/templates/base.html
index 63b18e5..6d7f962 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -12,7 +12,8 @@
 
     {% load static %}
     {% load repo %}
-
+    {% load userstatus %}
+    {% updateUserStatus user %}
     {% block header %}
     {% endblock %}
 
diff --git a/templates/manager/index.html b/templates/manager/index.html
index ccb94c3..57ac89c 100644
--- a/templates/manager/index.html
+++ b/templates/manager/index.html
@@ -74,7 +74,7 @@
 				<tr>
 					<th>Username</th>
 					<th>Real name</th>
-					<th>Last Login</th>
+					<th>Last Activity</th>
 					<th>Options</th>
 				</tr>
 			</thead>
@@ -83,7 +83,7 @@
 			<tr>
 				<td><div style="display:inline;" {% if user.is_superuser %}title="{% for orga in auser.organizations %}{{ orga }}&#10;{% endfor %}"{% endif %}>{% if auser.is_staff %}<b>{% endif %}{{ auser.username }}{% if auser.is_staff %}</b>{% endif %}</div></td>
 				<td>{% if auser.is_staff %}<b>{% endif %}{{ auser.first_name }} {{ auser.last_name }}{% if auser.is_staff %}</b>{% endif %}</td>
-				<td>{{ auser.last_login }}</td>
+				<td>{{ auser.userstatus.last_action }}</td>
 				<td><a href="/user/{{ auser.id }}/edit"><i class="fas fa-edit" title="Edit User"></i></a> {% if auser.email %}<a href="mailto:{{ auser.email }}"><i class="fas fa-envelope" title="Send Email"></i></a>{% endif %}</td>
 			</tr>
 			{% endfor %}