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

---
 .gitignore                                   |   2 ++
 Install.sh                                   |  15 +++++++++++++
 Program/Webserver.py                         |   8 +++++--
 Program/__pycache__/database.cpython-311.pyc | Bin 8068 -> 9379 bytes
 Program/__pycache__/mail.cpython-311.pyc     | Bin 4427 -> 4516 bytes
 Program/database.py                          |  22 +++++++++++++++++++
 Program/mail.py                              |  14 +++++-------
 Program/templates/index.html                 |   9 ++++++++
 8 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 84cecd8..a3ff884 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@ data.db
 Program/__pycache__/database.cpython-311.pyc
 Program/__pycache__/database.cpython-311.pyc
 Program/__pycache__/database.cpython-311.pyc
+Program/__pycache__/database.cpython-311.pyc
+Program/__pycache__/mail.cpython-311.pyc
diff --git a/Install.sh b/Install.sh
index c083082..79b92d9 100644
--- a/Install.sh
+++ b/Install.sh
@@ -16,6 +16,21 @@ db_file=${db_file:-data.db}
 
 echo -e "DB_FILE = '$db_file'" > Program/env.py
 
+# Create env.py file
+echo -n "Enter database file name (default: data.db): "
+read db_file
+db_file=${db_file:-data.db}
+
+
+echo -e "DB_FILE = '$db_file'" > Program/env.py
+
+# Create env.py file
+echo -n "Enter database file name (default: data.db): "
+read db_file
+db_file=${db_file:-data.db}
+
+
+echo -e "DB_FILE = '$db_file'" > Program/env.py
 # Execute main.py
 cd Program
 python3 main.py
diff --git a/Program/Webserver.py b/Program/Webserver.py
index 9dbf94b..57d9b57 100644
--- a/Program/Webserver.py
+++ b/Program/Webserver.py
@@ -47,8 +47,11 @@ def fetch_outdoor_temperature():
 @app.route('/')
 def dashboard():
     data = fetch_all_data()[:5]
-    
-    return render_template('index.html', data=data, temperature=None)
+
+    # 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)
 
 #Route to display the sensor history
 @app.route('/history')
@@ -63,6 +66,7 @@ def history():
     """ S1 = fetch_data_by_sensor("DEMO1")
     S2 = fetch_data_by_sensor("DEMO2")
     S3 = fetch_data_by_sensor("DEMO3") """
+
     
     return render_template('history.html', S1=disp_data[0], S2=disp_data[1], S3=disp_data[2])
 
diff --git a/Program/__pycache__/database.cpython-311.pyc b/Program/__pycache__/database.cpython-311.pyc
index e9c9ad8bcfbbff52d624500e98888baf283147a3..6213e20df08451f44bbcb040c4434a46efe3c8f9 100644
GIT binary patch
delta 1549
zcmaKsO=ufO6o6+|tCe>3FaK1sy0VfQj9eNy3A82@TwLQgAx&J{#Mt#u*PfLuSJH~v
z5!kL=sWg{@3USsDL){=!aMM}`7xiE$fgXBDZY!!nS@1E(7MCXX&PtYw6X?^-x9`1q
z^XARlMR$h3z2^ST<q`lD`}0fjbl0{!0888bZ^qNsISv8@5R<aa*&9!Oj;BvHB}@Zk
zy#wYPh@*5O8>I``Dcy*t^dN!KiyV|b<fQZ?7i9->Q+6T`Wfx+mK-Bx=gPR<5RsZA$
zEbwAAAbi2VcdL8O5CgAPkK7&xPE?<Gk0G4Zj@+^8@BZH)T&{lK*}=e1w8z~lyslk*
z?Wq?r#A9BeDQkAk2fG7b17!KevJU|`ptC6ukPgk~4q2>aLHnHP;}D=#u-Z@{ejbZ7
zW;3`D`9MmhBC1SCGLujvxh#^1j3QT}4y_yrJ8>@!!xj?}?dO2T5vr;`Xph|k+GoM>
zFs}>me6?CieVHj`sM;JgcBsw{>FiMT*WgtP+^RZ7Ka8xj>!K-abedWJc}TtY0io3X
z5`qOtOz)|zF)b|*69B=7u)^$9-$C2I#Sk;osjRUrEzclJuw?*hvHw}finxkxpT-`v
z<F_o$JcZ_-|4C#&lZbyM5qqW}YpVt%5LZhF068kov#;uOb)gZ1TrV$I-21dI2kqW$
zS<f8P?m^y?XA?}`TJgNpCoa#G?V1G77q)DTufTgV${EbHQG=V3Gpd3Oema?!RU)Oc
z20JZNGUJnmWke!TXxLViR4$!S@dT|8e@J0iQ^}018V)m5#uCY4Im#Mv-GCbgn^usF
z17_?b#inaKmrkN2*@#R^1tM>D-jGxh8CP;RqQoQPNtGy=?lKFYhgnIIq-4W-TT12R
zs0Dx2IBs29PpXD>!+b;;95bC<O4?9zB+BE<rpaWH!H-Hr8pBdrHkgEB*rrw_LS$@k
zHyWV^TR_PbVsK;01g+Sx5oKvjRWeaKeuJiHre#pv5D1o5<RxM@!rs(ZF<vr{vBZ-J
zLr7pLyV}^R+Nn2kD%kuy4A*M&PD_m_oTk1VI#nHj0w{uKj@~j?bM)68{l(E^-cfq}
zF4FsMpALSe#?RFGnc~PZU&l_*?s7S_ryTkZ$A0ShrC*;|(0z+F-(uajSiFAh@s&1r
zM|MBmyY&bk_Epx85>IaFp81+*zV4YXj=$i5+gqB|#mmRyxksEX#%i--tS-h()254q
zHF2;m4xU&U_ocr9#d8zIu@?exxJuF8f%2*zj2&^hFkBOc>%wsH{SyxOyY7eXg|@{V
zv3TA5;SjxBv|EdWJKyqUQwm9KTxhmOSzc3Htul4IY<7psN*N@n_+xD_{2qhTS~}e0
z$k7$^4?^vM+P(1G=fXNTGyVV_dTY=cpi_GqzI(+6eJ7v|f0t>talr?BPr$2a)cY?;
C1c`|N

delta 346
zcmZY2Jxc>Y5C-6#z2x?Cm%YoanomUGKuLlKDO79}f}jutQJWMZxG1P#xD?u|sjLjs
z+F95MvW<-p@DJFDl0s~4Z0wzDY@FhOnU|TlUF$9RcT&2HYVWhLFIC?!LfoIOx7sPq
zbm}<0#dNyI+P1byp#|w^hs@{<>1vnsv`1!jmXunOzV^vL^G#L_9v;_i$QU7N7R;E2
zd&$KDee51Glw#5hvp)b$9H?0X!3Wr_Bs;=kzGlMk9$?!H6z8yGo<~PG9N=rdi%mI?
z=LN(?6+#*({3(3#9K0!NUUjgOFY#DmtAutZxpkG?!l1lrPRlD6oSCO_1*)2hElOiS
syz`T8oWe@9jJr|6+n^C7n_mnsqB-#JExNAT5Pq{ia$`yRpSVJczndvkbN~PV

diff --git a/Program/__pycache__/mail.cpython-311.pyc b/Program/__pycache__/mail.cpython-311.pyc
index ba56e5387a241755e6cf073dfb9193f480ff07b0..6187601c99073b66c7592bd66e02bf75626d1f9f 100644
GIT binary patch
delta 832
zcmZWnT}TvB6ux(6cAee%S=S^;1t$$lEh(2!Vs}AvRwARq2+TyMoiR7pG4IT_Dq8er
zQH0zTB9VNEB7&gyrN;=if?iheX+Y?u_l*b^pE`FJCF<OB&i&4u@1Aq-o%^ljMXT~k
zQGy8M=t5-j%RA*6mTDm4!G6hn{ylEtRJV~4s&Y%EKjniB>&O&0_?H-=H(*u4Xi3@(
z(Ye3@dQk{>+p$*UYI{k9jv#V!S$6m72$_NZD-S^B;F7$KHiUnxk04W8mhZ~8Se>&t
zi{|+el*Ohrj9SrN)Gp_r3NhTqX`_n`W12o=q|%yW*{<efl1a;PCNt^u!r@&!y4XCX
z(UPwjhiR>UqLHvud%QiH^@O=h%Jl;JeA2q@re<w=-~S=l3F$*%PL7_fdCu4R6#Apa
zycb*R%|%z^xp+~HRdq{@Z;SDw82>J+Po#&^1Lcvj0;9Ym)t3<VCGg*VM^uXHz}m6g
z@zt(e7eLUD;p)64>f54T{7=guC7x9(4+8R|fU+W#SA^<tPQflesr?b1Lj{Zz7!|mn
z9_0&io8H40x?veA^!V79C=d8E<`R7Vx0vK`CmoR@xQ;%S&TAd)I_i^CR&sjWu+4F}
zLv!3>*Gc*yHJC3;O<XT&0!-={H{ebY%P>>+P0xR&0xLw%=eP!O+i`{Juos|_4mzYZ
z`OX2Jpfl<<+)ux%Z#!808j*gONTq$<F!VPwY3l;C?Mqw4b;xDNT68lMfkoS)=;#T?
zPB1qF&f_injwhOiYuqp#i?HWRPBYiT9Q%otT@lu+Qj1(-Xus#K7@e7AE#u@Wovx*!
RPOOyBzPnD9@EL)z{{Ty~){OuF

delta 750
zcmZWmPiWIn7=N#6vZP6xRYqxbVz*9clnHCurA%9;0cH4K!75l|lG<XI>Pu?p*c3cX
z5k%fi5f#Kg2!iXyqm1gsO9wjzi{Qa?!AtezdnubkzkJ{C`}ccaKHhtg{4y@TlI0K}
z(*2e$KYTAgf+9yUhS<;Vfz}Ef4^&=40NxTC2n4p81n%~Y9DoUcMwcXalL3IqFG`QW
zlfb_xi@+3?q+62B4}23g!8}t0O}HpN3*+a)xC9C1G)RIig$<4xYOMzM!yPegPOsJy
zj%B+Er(qbD<CGh<+Rd?rop?953o2OSE=4>+n>Va$ZnbWE!Rw8xi$8K7LMmB1PRv=r
zcZQxa3LC`}ym>pd#;fbR+VQpD6-RmivYEfo<>gLz>a|XQ=o+71=hL14v`?hRkb~6o
zKu{it_r$yMeR<jc`pewb0wFn5WR=zMp~+Ao4%#uO#XvhAD&&}Ua$6zGw5M5G$+EPP
zV@Uid7S;B(jtNEps(3}rzzF^!&L&c1j5lIbEaPfPx6Kl{8na~4TS7U~(po2_(Lm8-
z?0OSLC|7VR$kNTKeZ}L>_@PhqSjW|ot3p&DEQh{m0{O$EryBMVdq6E6C4&#vEaW=q
zFri$;pTp;29*-&SWSYMLC{G+p;jc=JJwZYP|57r9F*!VQVJ~fI6lMu{jAh^OcvE-v
z%erHsA==1Ln5ICV%iqlZ5u&ruaSC|~bhF?5%v{}U)T{&OEN%~DWe<$@z$To-<w!P2
G*?#~a=EkW2

diff --git a/Program/database.py b/Program/database.py
index 46ead2b..13e5cc2 100644
--- a/Program/database.py
+++ b/Program/database.py
@@ -1,6 +1,10 @@
 from datetime import datetime
 import sqlite3
 from os import path
+import plotly.graph_objs as go
+import pandas as pd
+
+
 import time
 
 from env import *
@@ -141,3 +145,21 @@ def print_email_settings():
     # Close the connection
     conn.close()
 
+def history_graph(sensor):
+    # 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')
+
+    # Create layout
+    layout = go.Layout(title='Last Hour of History',
+                       xaxis=dict(title='Time'),
+                       yaxis=dict(title='Value'))
+
+    # Create figure
+    fig = go.Figure(data=[trace_temp, trace_hr], layout=layout)
+
+    # Convert figure to JSON for rendering in template
+    graph_json = fig.to_json()
\ No newline at end of file
diff --git a/Program/mail.py b/Program/mail.py
index 6ada2bc..523aae3 100644
--- a/Program/mail.py
+++ b/Program/mail.py
@@ -32,10 +32,6 @@ def email(recipient_email, message, ReachedVal, Sensor, TimeStamp):
         - The sensor on wich the values are maxed out
         - the time stamp
     """
-    """     port = SMTP_PORT # For SSL
-    smtp_server = SMTP
-    sender_email = SMTP_ID  # Enter your address
-    password = SMTP_PWD """
     print(fetch_email_settings())
     sender_email, password, smtp_server, port, recipient_email = fetch_email_settings()
 
@@ -59,12 +55,14 @@ def email(recipient_email, message, ReachedVal, Sensor, TimeStamp):
 
         # Send the email
         server.sendmail(sender_email, recipient_email, msg.as_string())
-        print("Email sent successfully!")
-    except Exception as e:
-        print(f"Failed to send email. Error: {e}")
-    finally:
+        print(f" [{datetime.now()}] Email sent successfully!")
         # Close the connection
         server.quit()
+    except Exception as e:
+        print(f"[{datetime.now()}] Failed to send email. Error: {e}")
+    finally:
+        None
+
 
 def check_and_send_email():
     # Connect to the database
diff --git a/Program/templates/index.html b/Program/templates/index.html
index 19d4e3d..1e5bac1 100644
--- a/Program/templates/index.html
+++ b/Program/templates/index.html
@@ -85,6 +85,15 @@
     <p>Unable to fetch weather data.</p>
     {% endif %}
     </div>
+    <h1>Last Hour of History</h1>
+    <div id="graph"></div>
+    <script>
+        // Parse JSON data
+        var graphData = {{ graph_json | safe }};
+        
+        // Render graph
+        Plotly.newPlot('graph', graphData.data, graphData.layout);
+    </script>
     <script>
         // Refresh the page every 10 seconds
         setTimeout(function(){