From e9f8d3ad2802cca0d0dd8ca07d3ed9c86e174fb4 Mon Sep 17 00:00:00 2001 From: Anika Date: Mon, 4 Mar 2024 23:20:43 +0100 Subject: [PATCH] started adding docs/comments --- __pycache__/test.cpython-38.pyc | Bin 3077 -> 3085 bytes alarms.json | 18 ------------------ logs.json | 10 ---------- templates/base.html | 2 +- templates/help.html | 12 ++++++++++++ templates/index.html | 2 +- test.py | 32 ++++++++++++++++++++++++-------- 7 files changed, 38 insertions(+), 38 deletions(-) delete mode 100644 alarms.json delete mode 100644 logs.json create mode 100644 templates/help.html diff --git a/__pycache__/test.cpython-38.pyc b/__pycache__/test.cpython-38.pyc index 4fe90b192703b204d1a08af2a20ed490dd4b7118..2b0639fbb0e5aa3be078e3330e704bf8e1b2f6db 100644 GIT binary patch delta 262 zcmZpb=#}6N<>lpK0D=gYXQ`?ic^eq(tAM-`h6RizOeu^hOwCLS8EavDW+Btr`8LJ*I2AwvmU3R?<$FQWuQHe*p(3Ht($8lV}B423EsoCtOe z1JDG%TILcipcpe)J}reIm_bvR!>@{4Pd_I=y;v`+I6tq7DN%c}IMZ)t0Y-t%qRa)1 z{01cqSwNS7?965=nznfg%R5F!#?8%ak&KLHoA0u>GBUbMPUf7;7&w`cYXW2FlpK00K4ZXQ?V1c^eq(%YeKRh6RizOeu`bj0+iSVLT=23bQ0b3d=$ek98qK30n$l3R^Fu1Vc7sQBVo{0*)G{g^Y|0g$gB{2zCtv z&;-6(<`OQT7&BNtDTN`JL6hCDikn+cKPNxESTCzMKX0-;({E-zM!wCm%ms}6UL_1! z%qdJj`&hG?iZ*PX!}5-ik!f=`TO=c+`R1qWt&EJWle0PJG6qfNAbout
  • - Reload + Hilfe
    • 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