From 06d905ae5794e3bec8a5e5dcd49fdf2401d1cd62 Mon Sep 17 00:00:00 2001
From: jeanGaston <paul@jeangaston.xyz>
Date: Thu, 2 May 2024 03:37:48 +0200
Subject: [PATCH] updates

---
 Program/Webserver.py                         |   6 +-
 Program/__pycache__/database.cpython-311.pyc | Bin 9379 -> 10428 bytes
 Program/__pycache__/mail.cpython-311.pyc     | Bin 4516 -> 4509 bytes
 Program/database.py                          |  63 +++++++++++++++----
 Program/templates/index.html                 |  13 ++--
 5 files changed, 63 insertions(+), 19 deletions(-)

diff --git a/Program/Webserver.py b/Program/Webserver.py
index 57d9b57..47dfac8 100644
--- a/Program/Webserver.py
+++ b/Program/Webserver.py
@@ -49,9 +49,9 @@ def dashboard():
     data = fetch_all_data()[:5]
 
     # Convert figure to JSON for rendering in template
-    graph_json = history_graph('Home')
-
-    return render_template('index.html', data=data, temperature=None,  graph_json=graph_json)
+    temp_graph_json = history_graph_temp()
+    HR_graph_json = history_graph_HR()
+    return render_template('index.html', data=data, temperature=None,  temp_graph_json=temp_graph_json, HR_graph_json=HR_graph_json)
 
 #Route to display the sensor history
 @app.route('/history')
diff --git a/Program/__pycache__/database.cpython-311.pyc b/Program/__pycache__/database.cpython-311.pyc
index 6213e20df08451f44bbcb040c4434a46efe3c8f9..d1a0e1ef6ca696088305db4e9c9602e71dcc821b 100644
GIT binary patch
delta 1911
zcmeH|PfXiZ9LL{tY$q|809h!1<~B5|Ae%PUPLnED7^t*O5NbObMuE00!Ui&t1U;Jx
zkWn&e2O}X>)JXKOL)2A_s2r%;!wx&3opzaIOVNa^RqBP)E=*c)JM8xo5)|59cGzi8
zdEfkg`TgGS{rv2Y^Ii1E&+5JxMFGL+|NX-BX3KhAGk&n%u~t+64H|EfnOi8_@brgY
z85}b2yM8eT*v4msz1M1fAl90{o%VWu#t3a94Vxd<v}Di>lJO(Ff@Nlf(a`|9d;1Q9
z(28q?)m(Is($Lv0SoH*EX{>M>SGE!QvXZHDP|x)U@331?<q6EAd|vaGZOE^z&FH+$
zwNxVD@yDL**4Z7;77K-7mWGaX<`S4XBYT%cXp~tSt18WxGi5>Zm2HINnw{F}ODIN7
zHu&y@yQ+Yvyhw*LIc^3#Z<Xge_GVnVd#C=y6?=3~&THCY=xwj=rT64|-sK>21Im|#
z9!}o8AMD8FvE!af&n+ZVD!E1DF%XBFOQaMv&pLR~!AlOCOv?&srr`+4a^p1;pPvoJ
zl;nJHHlb>10y(inQh{ommeA&ug+|DuafQUS1)>BKso+n$m-8<21q2*!F}|2k9d79i
z{U%ZPEzgiH8sg{TOX&qIFOZMHHE*}~y`L8xK~+*}nhe2a4i_WwDaFAFatbm^Z55X?
z@-$J*z4kzcKBB?OAoRGL#-mOrXK3@28Z<|~g1`n$^)HYtI%sIO8$yMKP<C*?w%Hgm
zhO$@o-JWd!e&Ea@@^E5NR=tMHh#mMsxdGc3F8IO*dm#GO?mT?Q>KreAGUJvwVT%(5
zal&8@{DF<`9FzOxv2XXn?)3BSy=&I+=azre_Kz0)qXuWhS3NI1UgP{KYhVMv;!$1w
z+L$Gse<8JR^On?QOI-!23p}gyk|p)nQcpqZIpmnSPyaw5e^SX_eI=k8aV`AtTn=}C
z+nKwv-TpYTt?c&i%vvoM_nIsrY75bV5Y1jb<WXZ_v+Y6Ky0jr>2Vd3%EH*&e;0UIW
zX`g=Ue@x*hVEkv8X3Ch7>#!}MbdsA?MyV9B9HG`2m2oOX4C_l6Muy7}l6y2Z39{^u
zEF=?hLR$(B$F(AU=Yk|o!xT0mQ<<ic2Fa*z0;awin8+|$gxsevRSa+A6Sy=PgT^4>
z;_+tt;Q?z39wIjd2ILLEyr=>u1Kj)*F!J+@dmYxznB^a_{UZhc$m_reN5D`-P6E?o
zNxinzTabDwFnyR3(}yWCeYnC*FNNmcG7~;!I%hwsOTf7}{Cqqm$5k?8wuSn6`gS3U
i=G{=MkOh<egQ?+XUx#@7UMp@oL>1|lsQbDUnfx1e8oG)A

delta 936
zcmZWoPe|KP7=KBVG)-x1-4tyNcGxXsFe(*qLpP_c6PbS|%FwloCjBG*$4d&WtJs}a
z*jxmA@K78$#|m?}gNJSGICe^*>=2NhygSg#PJ3ys!}%re%lGH^d*A!MM?O!zd0>BQ
zvoQb(ec}%%+SctISaF>zlK3OQw|xBi6DK$f0QC#uR`*RGh>`mv)BB4=+NJi>ZOk@G
zZ34vr1nCa{DyEo>ts1h7H?2Gt0V1}IRq!1Ydw(8Z#nk~zyFZVMrp_i7AdmRxiKIwX
z%sT|4q1BL8lR+E5M58azESG46Vs35$z%tpiMMkly^IjISsX6bhe)0n9oRK%>i3px2
zD~|tqpz>6iR-fB?EM^fHLwm@pKRnzTkLl*6R6LVN%5W0Zf>TK8WIUFXWZgO=CDIZU
zlnj)3LdUW?meYwuN|a!Sft^Nb#TLjUVq#3md8P$LTDdwd$ciVB%0N#l><PqVB?S>_
zCYF#;EmDaoaY-j<g?L8dO|WOaUM?$SW3o=>j1P}PpAn?uLN1k2c#Hb-+MP9?hCN2f
zdI}fAI-@{gNeU_GggV`@qY#D+rYRhY=u89(>1b$KP9<d;MLlN%jq&TYXyag^ItnIG
zYy&M>L#hCdtled*YUOHHt}uLPu@<}5UWuA__UyIHRV{Nh%UogT$a!VMRaz{&w^Dnp
zd!wIR-#BgZiRKJeoxz$jSQtBWIEyQ#q0+OhiCwtotz-`(-zPN3Le;TQb1W1BrxdWa
z6d!AB-ywT#m(o~YmG#wFpW&G`wztam*4W--au~P!e*>gW3{@CCWq{RI<V!cpQLWQ=
zKxxcil^LutgN1v?6liVRbia15vm0z-%y^(1wZ*rqzi#x|7m=w`X(1^JGJL9fxVzVl
p?%#nrs6L%P^lfy<nYc6nGbn}r8z8&(UvL!G<;1#=!DUtF{sqJx^ppSq

diff --git a/Program/__pycache__/mail.cpython-311.pyc b/Program/__pycache__/mail.cpython-311.pyc
index 6187601c99073b66c7592bd66e02bf75626d1f9f..173d6748c1e4670b8458764a8aa7acab7cf106ea 100644
GIT binary patch
delta 141
zcmZ3YJXe`_IWI340}xnM8mHN8<Xz0j%EipUFn#lO##5{u{frC@4GdpJHutelWYp(%
zGInKTILg52#=vltk;~PZ`6#!Vs~PiALspQ887oM{ni<GG#=zvpwAqi7iJ8%Pb0AL%
g6JyNgV|+%8jES3n^2agqt26R`V1N@LlhXw40AC~`l>h($

delta 148
zcmbQMyhNFIIWI340}!ZJ8mArK$h(-4orjr$VLAin=B<pUSb3)~GB7kSd=Oz~mHEoC
zxt)C?qduRLu`3h9QAS2LMuwwIT&_0EM|sp-&6$rHv4TX*SwSK;%s}=rMkY7r&F-8`
o%#7}vy?9EP7!x+{=QCntOx^s6KaP=Ko00be1DuGN94}}G09BJDL;wH)

diff --git a/Program/database.py b/Program/database.py
index 13e5cc2..5fb05f8 100644
--- a/Program/database.py
+++ b/Program/database.py
@@ -27,7 +27,7 @@ def create_database(db_name):
                 Sensor TEXT,
                 Timestamp TEXT,
                 Temp INT,
-                HR INTEGER,
+                HR INT,
                 Bat INT,
                 FOREIGN KEY (Sensor) REFERENCES Sensors(Name))''')
     
@@ -145,21 +145,62 @@ def print_email_settings():
     # Close the connection
     conn.close()
 
-def history_graph(sensor):
+def history_graph_temp():
     # Fetch sensor data
-    data = fetch_data_by_sensor(sensor)
-    df = pd.DataFrame(data, columns=['ID', 'Sensor', 'Timestamp', 'Temp', 'HR', 'Bat'])
-    # Create traces for temperature and HR
-    trace_temp = go.Scatter(x=df['Timestamp'], y=df['Temp'], mode='lines', name='Temperature')
-    trace_hr = go.Scatter(x=df['Timestamp'], y=df['HR'], mode='lines', name='Humidity Rate')
+    sensorList = fetch_all_sensor()
+    Trace = ['','' ,'' ]
+    i =0
+    for mac, name in sensorList:
 
+        data = fetch_data_by_sensor(name)
+        #print(data)
+        df = pd.DataFrame(data, columns=['ID', 'Sensor', 'Timestamp', 'Temp', 'HR', 'Bat'])
+        # Create traces for temperature
+        Trace[i] = go.Scatter(x=df['Timestamp'], y=df['Temp'], mode='lines', name=name)
+        #print(Trace[i])
+        i+=1
+        #print(trace_temp)
     # Create layout
-    layout = go.Layout(title='Last Hour of History',
+    layout = go.Layout(title='Graph Temp history',
                        xaxis=dict(title='Time'),
-                       yaxis=dict(title='Value'))
+                       yaxis=dict(title='Temperature in °C'))
 
     # Create figure
-    fig = go.Figure(data=[trace_temp, trace_hr], layout=layout)
+    fig = go.Figure(data=[Trace[0], Trace[1], Trace[2] ], layout=layout )
 
     # Convert figure to JSON for rendering in template
-    graph_json = fig.to_json()
\ No newline at end of file
+    graph_json = fig.to_json()
+    #print(graph_json)
+    return graph_json
+
+
+def history_graph_HR():
+    # Fetch sensor data
+    sensorList = fetch_all_sensor()
+    Trace = ['','','']
+    i = 0
+    
+  
+    for mac, name in sensorList:
+        
+        data = fetch_data_by_sensor(name)
+        df = pd.DataFrame(data, columns=['ID', 'Sensor', 'Timestamp', 'Temp', 'HR', 'Bat'])
+        # Create traces for temperature
+        Trace[i] = go.Scatter(x=df['Timestamp'], y=df['HR'], mode='lines', name=name)
+        #print(Trace[i])
+        i+=1
+
+        
+        #print(trace_temp)
+    # Create layout
+    layout = go.Layout(title='Graph HR history',
+                       xaxis=dict(title='Time'),
+                       yaxis=dict(title='Humidity Rate in % '))
+
+    # Create figure
+    fig = go.Figure(data=[Trace[0], Trace[1], Trace[2] ], layout=layout )
+
+    # Convert figure to JSON for rendering in template
+    graph_json = fig.to_json()
+    #print(graph_json)
+    return graph_json
\ No newline at end of file
diff --git a/Program/templates/index.html b/Program/templates/index.html
index 1e5bac1..0d6374e 100644
--- a/Program/templates/index.html
+++ b/Program/templates/index.html
@@ -3,6 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <script src="https://cdn.plot.ly/plotly-latest.min.js"></script>
     <title>Sensor Data Dashboard</title>
     <!-- <link rel="stylesheet" href="/css"> -->
     <style>body {
@@ -85,14 +86,16 @@
     <p>Unable to fetch weather data.</p>
     {% endif %}
     </div>
-    <h1>Last Hour of History</h1>
-    <div id="graph"></div>
+    <h1>History in graphs</h1>
+    <div id="graph_temp"></div>
+    <div id="graph_hr"></div>
     <script>
         // Parse JSON data
-        var graphData = {{ graph_json | safe }};
-        
+        var temp_graphData = {{ temp_graph_json | safe }};
+        var HR_graphData = {{ HR_graph_json | safe }};
         // Render graph
-        Plotly.newPlot('graph', graphData.data, graphData.layout);
+        Plotly.newPlot('graph_temp', temp_graphData.data, temp_graphData.layout);
+        Plotly.newPlot('graph_hr', HR_graphData.data, HR_graphData.layout);
     </script>
     <script>
         // Refresh the page every 10 seconds