diff --git a/__pycache__/test.cpython-38.pyc b/__pycache__/test.cpython-38.pyc index 4fe90b1..2b0639f 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 deleted file mode 100644 index 707351b..0000000 --- a/alarms.json +++ /dev/null @@ -1,18 +0,0 @@ -[ - { - "datetime": "05.03.2024 21:16", - "message": "lkjasdf" - }, - { - "datetime": "05.03.2024 21:16", - "message": "lkjasdf" - }, - { - "datetime": "05.03.2024 20:20", - "message": "gestern" - }, - { - "datetime": "04.03.2024 23:22", - "message": "nachher" - } -] \ No newline at end of file diff --git a/logs.json b/logs.json deleted file mode 100644 index 5eb71b9..0000000 --- a/logs.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "datetime": "04.03.2024 18:44", - "message": "j\u00f6lasdf" - }, - { - "datetime": "04.03.2024 18:44", - "message": "lkjasdf" - } -] \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index 7569c64..4a0b3c4 100644 --- a/templates/base.html +++ b/templates/base.html @@ -22,7 +22,7 @@ About diff --git a/templates/help.html b/templates/help.html new file mode 100644 index 0000000..397f3c2 --- /dev/null +++ b/templates/help.html @@ -0,0 +1,12 @@ + +{% extends 'base.html' %} + +{% block content %} +

{% block title %} Hilfe! {% endblock %}

+* schreib am besten was ins log vor dem ersten Alarm, sonst gibt's doppelten Alarm, wenn was abstürzt. + +

Debugging Hilfe

+* Schau in den Code, da sind zwar auch keine Kommentare, aber er existiert + + +{% endblock %} \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index 08051d6..5b0f512 100644 --- a/templates/index.html +++ b/templates/index.html @@ -45,7 +45,7 @@
+ value="{{ request.form['time'] }}" style="width: 80px;" required>
diff --git a/test.py b/test.py index dafa666..49698f9 100644 --- a/test.py +++ b/test.py @@ -11,20 +11,33 @@ previousAlarms = list() logs = list() def preprocess(): - logsFile = json.load(open("./logs.json")) - alarmsFile = json.load(open("./alarms.json")) + + print('start init alarms and logs') + #versuch beide files zu laden, wenn das fehlschlägt, initiiere beide files als json + try: + logsFile = json.load(open("./logs.json")) + alarmsFile = json.load(open("./alarms.json")) + except: + print("initiate logs.json") + logsFile=json.load(open("./logs.json","w").write("{}")) + print("initiate alarms.json") + alarmsFile=json.load(open("./alarms.json","w").write("{}")) + # schreib alle alarme im File in previousAlarms, wenn sie älter als 2 mins sind + # alle anderen in active alarms for alarm in alarmsFile: if datetime.strptime(alarm['datetime'],"%d.%m.%Y %H:%M") <= datetime.now()-timedelta(minutes=2): previousAlarms.append(alarm) else: activeAlarms.append(alarm) + # lies alle log aus dem file ein for log in logsFile: logs.append(log) - + print("init of alarms and logs done") @app.route("/", methods=('GET', 'POST')) def index(): - # reload sendet alle paramenter neu und die werden neu drangeflanscht + # wenn die logs leer sind, gehen wir davon aus, dass noch nicht initialisiert wurde + # alarme werden gedoppelt, sollten schon welche da sein if len(logs) <= 0: preprocess() @@ -33,7 +46,9 @@ def index(): @app.route('/setAlarm', methods=('GET', 'POST')) def setAlarm(): if request.method == 'POST': - print(request.form['date']+' '+request.form['time']) + # wenn Datum leer: + # default Datum ist heute + # wenn heute + angegebene Uhrzeit vor jetzt ist -> Alarm für morgen zu der Uhrzeit gesetzt if request.form['date'] !="" and request.form['time']!="": time = datetime.strptime(request.form['date']+' '+request.form['time'], "%Y-%m-%d %H:%M") elif request.form['date'] == "": @@ -43,6 +58,7 @@ def setAlarm(): content = request.form['alarmMessage'] activeAlarms.append({'datetime':datetime.strftime(time,"%d.%m.%Y %H:%M"),'message':content}) + # ja, wir schreiben einfach das ganze File neu, ist aber einfacher allAlarms = activeAlarms+previousAlarms with open('alarms.json', 'w') as f: json.dump(allAlarms, f, indent=2) @@ -86,6 +102,6 @@ def processAlarm(): def processpAlarm(): return render_template('palarms.html', previousAlarms=previousAlarms) -@app.route("/refresh") -def refresh(): - return render_template('index.html', logs = logs, alarms = activeAlarms, previousAlarms=previousAlarms) \ No newline at end of file +@app.route("/help") +def help(): + return render_template('help.html', logs = logs, alarms = activeAlarms, previousAlarms=previousAlarms) \ No newline at end of file