From 1c46c989d4df277ece79abf541721d06eec31cc0 Mon Sep 17 00:00:00 2001 From: Oskar Date: Wed, 2 Dec 2020 22:37:01 +0100 Subject: [PATCH] Add data view to resolve #13 --- ftracker/__main__.py | 4 + ftracker/core.py | 8 +- web/viewdata.html | 204 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 212 insertions(+), 4 deletions(-) create mode 100644 web/viewdata.html diff --git a/ftracker/__main__.py b/ftracker/__main__.py index 48620c6..3cfb9de 100644 --- a/ftracker/__main__.py +++ b/ftracker/__main__.py @@ -7,6 +7,10 @@ if __name__ == "__main__": def get_root(): return app.send_static_file('index.html') + @app.route('/view') + def get_view(): + return app.send_static_file('viewdata.html') + @app.route('/') def get_file(path): return app.send_static_file(path) diff --git a/ftracker/core.py b/ftracker/core.py index 2414b97..e6122d8 100644 --- a/ftracker/core.py +++ b/ftracker/core.py @@ -62,11 +62,11 @@ def post_arrival(): 'message': "Error: Undeparted arrival exists" }, indent=SPACES), 409 - now = datetime.utcnow() + now = datetime.utcnow().isoformat() + 'Z' db.insert({ 'name': name, 'room': data['room'], - 'arrival': data.get('arrival') or now.isoformat(), + 'arrival': data.get('arrival') or now, 'departure': None }) @@ -102,9 +102,9 @@ def post_departure(): 'message': "Error: No arrival exists" }, indent=SPACES), 409 - now = datetime.utcnow() + now = datetime.utcnow().isoformat() + 'Z' db.update( - operations.set('departure', data.get('departure') or now.isoformat()), + operations.set('departure', data.get('departure') or now), (Entry.name == name) & (Entry.departure == None) ) diff --git a/web/viewdata.html b/web/viewdata.html new file mode 100644 index 0000000..d32b446 --- /dev/null +++ b/web/viewdata.html @@ -0,0 +1,204 @@ + + + + FTracker Data + + + + + +
+ Start: + Ende: + Raum: +
+
+
+
+ + +