diff --git a/pyweb.py b/pyweb.py index 34c4f3c..41b974d 100755 --- a/pyweb.py +++ b/pyweb.py @@ -312,8 +312,16 @@ def show_graph(mid,kind): if (nrow>0): row=numpy.array(mycursor.fetchall()) print(str(time.time()-starttime)+' sql fetched') + nirow=mycursor.execute('select id,varname,device,sensor,i2c from ids where id='+str(mid)) + gdata=mycursor.fetchall() mycursor.close() mydb.close() + kanal_info={"varname":"","device":"","sensor":"","i2c":0,"count":nrow} + for ids,varname,device,sensor,i2c in gdata: + kanal_info["varname"]=varname + kanal_info["device"]=device + kanal_info["sensor"]=sensor + kanal_info["i2c"]=int(i2c) print(str(time.time()-starttime)+' sql closed') plt.figure(figsize=[6,8]) plt.plot(row[:,0],row[:,1]) @@ -321,7 +329,7 @@ def show_graph(mid,kind): plt.savefig("svg/"+mid+".svg") print(str(time.time()-starttime)+' saved') if len(row)>0: - return template('verlauf.tpl',measdata=row,mid=mid) + return template('verlauf.tpl',measdata=row,mid=mid,kanal_info=kanal_info) else: return ''' diff --git a/verlauf.tpl b/verlauf.tpl index ba07576..43082a9 100644 --- a/verlauf.tpl +++ b/verlauf.tpl @@ -1,9 +1,10 @@ -Verlauf +Verlauf {{kanal_info['varname']}} +

{{kanal_info['varname']}} {{kanal_info['device']}} {{kanal_info['sensor']}} {{kanal_info['i2c']}} {{kanal_info['count']}}

Übersicht
Letzte Stunde
Letzter Tag