diff --git a/imaginaerraum_door_admin/door_handle.py b/imaginaerraum_door_admin/door_handle.py index fc1e32a..7435964 100644 --- a/imaginaerraum_door_admin/door_handle.py +++ b/imaginaerraum_door_admin/door_handle.py @@ -2,6 +2,7 @@ import paho.mqtt.client as mqtt import socket from pathlib import Path import logging +from datetime import datetime class DoorHandle: def __init__(self, token_file, mqtt_host, mqtt_port=1883, nfc_socket='/tmp/nfc.sock', logger=None): @@ -53,6 +54,7 @@ class DoorHandle: self.encoder_position = int(msg.payload) elif msg.topic == 'door/token/last_invalid': timestamp, token = msg.payload.decode().split(";") + timestamp = datetime.strptime(timestamp, '%Y-%m-%d %H:%M:%S') self.last_invalid = {'timestamp': timestamp, 'token': token} def get_tokens(self): diff --git a/imaginaerraum_door_admin/static/delete.png b/imaginaerraum_door_admin/static/delete.png index edb3e14..f4175c8 100644 Binary files a/imaginaerraum_door_admin/static/delete.png and b/imaginaerraum_door_admin/static/delete.png differ diff --git a/imaginaerraum_door_admin/static/demote.png b/imaginaerraum_door_admin/static/demote.png index 9483377..3e1ac57 100644 Binary files a/imaginaerraum_door_admin/static/demote.png and b/imaginaerraum_door_admin/static/demote.png differ diff --git a/imaginaerraum_door_admin/static/edit.png b/imaginaerraum_door_admin/static/edit.png index bb55476..7d60696 100644 Binary files a/imaginaerraum_door_admin/static/edit.png and b/imaginaerraum_door_admin/static/edit.png differ diff --git a/imaginaerraum_door_admin/static/promote.png b/imaginaerraum_door_admin/static/promote.png index ff3571b..2c31039 100644 Binary files a/imaginaerraum_door_admin/static/promote.png and b/imaginaerraum_door_admin/static/promote.png differ diff --git a/imaginaerraum_door_admin/static/stop.png b/imaginaerraum_door_admin/static/stop.png index 8765b93..9a94a13 100644 Binary files a/imaginaerraum_door_admin/static/stop.png and b/imaginaerraum_door_admin/static/stop.png differ diff --git a/imaginaerraum_door_admin/static/token.png b/imaginaerraum_door_admin/static/token.png new file mode 100644 index 0000000..07fda2e Binary files /dev/null and b/imaginaerraum_door_admin/static/token.png differ diff --git a/imaginaerraum_door_admin/templates/register.html b/imaginaerraum_door_admin/templates/register.html index e157fd2..d83137f 100644 --- a/imaginaerraum_door_admin/templates/register.html +++ b/imaginaerraum_door_admin/templates/register.html @@ -5,13 +5,37 @@ {% endblock %} {% block content %} -{% if not token.vars %}
Token ID: {{ token['token'] }}
+Zeitstempel: {{ token['timestamp']}}
Keine unregistrierten Tokens in MQTT Nachrichten.
+Bitte Token scannen und die Seite neu laden.
+