From ed8fc409f8cfa08f82a61dcf2b056f5b24913886 Mon Sep 17 00:00:00 2001
From: Anika <a_luetke17@cs.uni-kl.de>
Date: Mon, 4 Mar 2024 18:45:02 +0100
Subject: [PATCH] closes #1,#3

---
 __pycache__/test.cpython-38.pyc | Bin 2502 -> 2871 bytes
 alarms.json                     |  12 ++++---
 logs.json                       |  12 +++++++
 templates/alarms.html           |   6 ++++
 templates/index.html            |  60 +++++++++++++++++++-------------
 templates/logs.html             |   5 +++
 templates/palarms.html          |   6 ++++
 test.py                         |  18 ++++++----
 8 files changed, 84 insertions(+), 35 deletions(-)
 create mode 100644 templates/alarms.html
 create mode 100644 templates/logs.html
 create mode 100644 templates/palarms.html

diff --git a/__pycache__/test.cpython-38.pyc b/__pycache__/test.cpython-38.pyc
index 721c46a9cac87ba503917501bce1ba9dec0d8378..3bb781f202e268e371a82d91e074e9d78d727b7f 100644
GIT binary patch
delta 1478
zcmaJ=&5zqu5cjj=uh?;tO|rY8Sqi)TSodQ?S+zodidv-JSXH3*V1!VV_u9?Yj-#;y
zC?M@&dqUbn^!Nkd*gFyzIB?;@k(>X3iWNfQj5sj!ob84~N#vjB{oZ)yH}mHG()wXF
zcu=cVHT->TKNsJ7^PtE6nqR$mm{^gO*pbaNu5lxF5+`yJH*%RKOi?{zkth5kEvhLD
z6xMl#n@_c<A-sbox46xnW1YLa`cy;z6~%fB*5@_FwiFvI*g9`0wk?JfqPd_~cuUb8
z;eFfW?e7@x@KwdEDrOCtb>3CXnqpo-<{a-SW}UN-v~c5uirfp$!U4fYAcpz;pV!^O
zo<jWTqZH%@`<2=9guT_V(Xnu{947fF5rr{MKL<zN(jRWG;m+Sz`uk}j`h)T4$)JB9
z(gO^Y_3w#XjAvq;!yp#&M}3EN<sbU=lQspj2Jrxr44SwIt-^@K7-$2!1SUa?fcAls
zEWtW13v)E);tTT5ECkK)nWe*~{K?p6U&-gjbSDoup2`uG>g_=feSqo!7a{Uh{trZ!
z4IYbUI@t2KvT=cq{TVAPijBHAaT(UZz*k`<BHvFrI{sGKx~8<PAYTd$$nwdp!l%ik
zFo$uP3DAkQ<fgghot3aI@0*tm1~=r)JU+~8+&yBv%DrP9h5Dt?s2Zn_7vhv&*uqdV
z7ujs*AWO$^kwTMPxI{ooPj;D7Um2!cgn^O`+q8RyK-JzL>nee2_R4KCU#N#`w7gDG
zN=GX+pijgq!5ak2rTlDNVmIaQ)&?`BWkWA-a0ko538!+nR`&iJeb$rT*tfPxD7;Cq
zix4)KRI2`&)V~Z`@=yDnU3K`><-!7yq@SI3l)hx3v@eOFpdI<KbH3d{b5`q5ARXcX
z-=Rqx&YSJS_mR&iO|Eg4Gp?(i8+$XaoW`B~Jc%*#Yv>Z{OH+83MOkV9{pIj`6q$Oa
z>2L>e7My0El<8?}-f4_pD#4%pSA)733k@&51hs{RGRcRS<5a|5`K9yTgIAG(^9W(3
ztVW&s|6eQ{#3K;d{==ncq&n=X35U03-QBXwadKqe?H-=RdvSvc6Vhoe)Lg<1QgM@j
z4o39{?vh1em&WO=x6Zps%BQiojT5b9G?fl>SdTRfN4FUMb;tKv)yAjpH(9lYM&Pij
HQ9l0yn4B<W

delta 1130
zcmaKryKWOf6oz;9?)Ci=M~Q3&#e`%b*eKj01wn)8VnsrsSb?GyGr8`1!`U@L6a*=0
zQ&{r?Kt-N_mI5fCq24#31u81$j13McaPfKOpEEQ6Idk@1{ZqBDp3ggq_)T5^%-%SI
zLW6u5T$(!|3RS2Un4#&Jq2*abVLG!9iI-u{q2gsFbCP+gQ{zbS3M{i*q$ahfeXP<9
zb&eDfUy^Eeq~>T|s%5DbMrx6kq*{?`S*Tq+qC%@uuCmOlBCWk9bb{8UQlsR);!b`;
z<6T!vEnrXjEKXA6Uf{=jX%SeDGT2C1xF7fl;}6LfV(<lZS<qLj#N>VT!IcTI{nt_l
z`n^ub=#Jm<dpmo6=dRe%>#RYv%k~o1*<@ns2MiMaLv52uKCAT~Rm4`$^aCHl7>Z)z
znyD7B9^e8@B6LI<f$M;mokCqqQ)5Tid^RP9u_>TvIby0X!+&ZE<Rx$F{Uz!og~Uv3
znmyJ<%DFB~i#RY4mVlR&9#&Z#`&;Zp1%toWo31UEPDpCv`Mm@h7~T|ci=c|X)C^g&
z9Z?ZYjMkzwS;83UG>0Q>id3ila6dI32T{z1`BeCt(aMf<sq+`cyrx2%zcr2zXhwL=
zCk5(Ax7ndv&k3Tfkwa-3&WXdHXM`HJcjKrBvv?zVh8E(iU6@049w8Gi;AjCMt1X?Q
z=@sc3TwJ+``1c814Hi+YAuc0M=keXVKstQNYKrE#X+eY9Nh#5j9L-=ZR1wv8x`1y5
z)BK}#qcwI}mPH-9lyx((ZZVX3%U-!EYl<FI6Id8M{ZmPyxCEBZ_`qqE59}FI<zF**
z*2lN#qZh!4|F@O+95#W)+p8ip#`jiKSP^t5h6TFDsng;Er@k>h=WpMp21NaY!Hn1d
pZA1rAMc^T)iYCh^8`-`UMzkNW+eAdf=LKwHlNv8&8(Q8bzX3d+<*fh!

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 @@
+<h3>Upcoming Alarms</h3>
+{% for alarm in alarms %}
+    <div>
+        {{ alarm.datetime }}: {{ alarm.message }}
+    </div>
+{% 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 %}
     <h1>{% block title %} Partey! {% endblock %}</h1>
+    <meta id="my-data" data-alarms="{{alarms}}" data-logs="{{logs}}">
     <div class="grid-container">
         <div class="savedLogs">
             <h3>Logs</h3>
@@ -11,7 +12,7 @@
                 </div>
             {% endfor %}
         </div>
-        <div class="savedAlarms" >
+        <div class="savedAlarms" id="upcomingAlarms">
             <h3>Upcoming Alarms</h3>
             {% for alarm in alarms %}
                 <div>
@@ -48,44 +49,53 @@
             </form>
         </div>
 
-        <div>
+        <div class="previousAlarms" id="previousAlarms">
             <h3>Previous Alarm</h3>
             <script>
-                async function getAlarms(){
-                    const response = await fetch("http://127.0.0.1:5000/alarms", {method:"GET"});
-                    const alarms = await response.json();
-                    return alarms
-                }
+                alarms = {{ alarms|tojson }};
+                console.log(alarms);
                 async function postAlarm(alarm){
                     var body = JSON.stringify(alarm)
                     const response = await fetch("http://127.0.0.1:5000/alarms", {
                         method: "POST",
                         body: body,
                         });
+                    fetch("/processAlarm", {
+                        method: "GET"
+                        }).then(response => {
+                        return response.text();
+                        })
+                        .then(html => {
+                        upcomingAlarms.innerHTML = html
+                        })
+                    fetch("/processpAlarm", {
+                    method: "GET"
+                    }).then(response => {
+                    return response.text();
+                    })
+                    .then(html => {
+                    previousAlarms.innerHTML = html
+                    })
                 }
-                alarms = getAlarms();
                 function checkAlarms(){
-                    alarms.then( (alarms) => {
-                        for(var i = 0; i < alarms.length; i++){
-                            
-                            const [dateComponents, timeComponents] = alarms[i].datetime.split(' ');
+                    for(var i = 0; i < alarms.length; i++){
+                        
+                        const [dateComponents, timeComponents] = alarms[i].datetime.split(' ');
 
-                            const [day, month, year] = dateComponents.split('.');
-                            const [hours, minutes] = timeComponents.split(':');
+                        const [day, month, year] = dateComponents.split('.');
+                        const [hours, minutes] = timeComponents.split(':');
 
-                            const date = new Date(+year, +month - 1, +day, +hours, +minutes);
-                            if(date <=new Date()){
-                                console.log("ALARM!");
-                                postAlarm(alarms[i]);
-                                alert(alarms[i].message);
-                            }  
-                        }
-                        setTimeout(checkAlarms, 15000);
+                        const date = new Date(+year, +month - 1, +day, +hours, +minutes);
+                        if(date <=new Date()){
+                            postAlarm(alarms[i]);
+                            alert(alarms[i].message);
+                            alarms.splice(i, 1);
+
+                        }  
                     }
-
-                    )
+                    setTimeout(checkAlarms, 15000);
                 }
-                checkAlarms();
+            checkAlarms();
             </script>
             {% for alarm in previousAlarms %}
             <div>
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 @@
+<label id="value_lable">
+    {% for log in logs %}
+        {{ log }}<br>
+    {% endfor %}
+</label>
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 @@
+<h3>Previous Alarms</h3>
+{% for alarm in previousAlarms %}
+    <div>
+        {{ alarm.datetime }}: {{ alarm.message }}
+    </div>
+{% 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():