diff --git a/__pycache__/test.cpython-38.pyc b/__pycache__/test.cpython-38.pyc index 721c46a..3bb781f 100644 Binary files a/__pycache__/test.cpython-38.pyc and b/__pycache__/test.cpython-38.pyc differ diff --git a/alarms.json b/alarms.json index de8bee0..3078929 100644 --- a/alarms.json +++ b/alarms.json @@ -1,10 +1,14 @@ [ { - "datetime": "02.12.2024 18:00", - "message": "Hallo" + "datetime": "05.04.2025 06:33", + "message": "Test" }, { - "datetime": "12.02.2024 18:00", - "message": "helpo" + "datetime": "05.04.2025 06:57", + "message": "EEh" + }, + { + "datetime": "04.03.2024 18:40", + "message": "PREVIOUS" } ] \ No newline at end of file diff --git a/logs.json b/logs.json index 0459110..9b7792e 100644 --- a/logs.json +++ b/logs.json @@ -6,5 +6,17 @@ { "datetime": "12.02.2024 15:03", "message": "Lololol" + }, + { + "datetime": "22.02.2024 11:14", + "message": "Seitenschneider an Leon" + }, + { + "datetime": "04.03.2024 13:02", + "message": "hkjaflksaflksafl kisafjdbsafdo\u00f6ijar\u00f6oirpijwfeij" + }, + { + "datetime": "04.03.2024 18:02", + "message": "hdhdh" } ] \ No newline at end of file diff --git a/templates/alarms.html b/templates/alarms.html new file mode 100644 index 0000000..a4e459d --- /dev/null +++ b/templates/alarms.html @@ -0,0 +1,6 @@ +

Upcoming Alarms

+{% for alarm in alarms %} +
+ {{ alarm.datetime }}: {{ alarm.message }} +
+{% endfor %} \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index d5b832e..b40c6bd 100644 --- a/templates/index.html +++ b/templates/index.html @@ -2,6 +2,7 @@ {% block content %}

{% block title %} Partey! {% endblock %}

+

Logs

@@ -11,7 +12,7 @@
{% endfor %}
-
+

Upcoming Alarms

{% for alarm in alarms %}
@@ -48,44 +49,53 @@
-
+

Previous Alarm

{% for alarm in previousAlarms %}
diff --git a/templates/logs.html b/templates/logs.html new file mode 100644 index 0000000..18f90d7 --- /dev/null +++ b/templates/logs.html @@ -0,0 +1,5 @@ + diff --git a/templates/palarms.html b/templates/palarms.html new file mode 100644 index 0000000..a4ce47b --- /dev/null +++ b/templates/palarms.html @@ -0,0 +1,6 @@ +

Previous Alarms

+{% for alarm in previousAlarms %} +
+ {{ alarm.datetime }}: {{ alarm.message }} +
+{% endfor %} \ No newline at end of file diff --git a/test.py b/test.py index 1761c10..cb0bf16 100644 --- a/test.py +++ b/test.py @@ -1,6 +1,6 @@ import json import subprocess -from flask import request, Flask, render_template +from flask import redirect, request, Flask, render_template, url_for from datetime import datetime, timedelta @@ -43,8 +43,7 @@ def setAlarm(): # Closing file f.close() - - return render_template('index.html', logs = logs, alarms = activeAlarms, previousAlarms=previousAlarms) + return redirect(url_for('index')) @app.route('/sendLog', methods=('GET', 'POST')) def sendLog(): @@ -58,7 +57,7 @@ def sendLog(): # Closing file f.close() - return render_template('index.html', logs = logs, alarms = activeAlarms, previousAlarms=previousAlarms) + return redirect(url_for('index')) @app.route('/alarms', methods=('GET','POST')) def alarm(): @@ -71,8 +70,15 @@ def alarm(): data = json.loads(request.data.decode('UTF-8')) previousAlarms.append(data) activeAlarms.remove(data) - # render_template übergibt argumente komisch -> force reload - return render_template('index.html', logs = logs, alarms = activeAlarms, previousAlarms=previousAlarms) + return redirect(url_for('index')) + +@app.route('/processAlarm') +def processAlarm(): + return render_template('alarms.html', alarms=activeAlarms) + +@app.route('/processpAlarm') +def processpAlarm(): + return render_template('palarms.html', previousAlarms=previousAlarms) @app.route("/refresh") def refresh():