linse/seweb
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Export : added API call + fixed route issues

Browse Source
This commit is contained in:
l_samenv
2024-08-27 10:20:48 +02:00
parent f469208c0d
commit 30bdd1f832
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/jsFiles/SEAWebClientGraphics.js
View File

@ -285,7 +285,14 @@ function loadExportPopup(){
} }
function exportCallback(selectedVariables, startDateTimeMs, endDateTimeMs, binning=null){ function exportCallback(selectedVariables, startDateTimeMs, endDateTimeMs, binning=null){
console.log(selectedVariables, startDateTimeMs, endDateTimeMs, binning);
let binningParam = "None";
if (binning !== null)
binningParam = binning
let exportURL = "http://" + hostPort + "/export?time=" + startDateTimeMs/1000 + "," + endDateTimeMs/1000 + "&variables=" + selectedVariables + "&interval=" + binningParam + "&id=" + clientID
let a = document.createElement('a');
a.href = exportURL
a.click()
} }
let graphs = (function (){ let graphs = (function (){

5
influxdb.py
View File

@ -197,7 +197,10 @@ class InfluxDataGetter:
data_frame_last_known = self._db.query_data_frame(query_last_known) data_frame_last_known = self._db.query_data_frame(query_last_known)
row_to_insert = None row_to_insert = None
for index, row in data_frame_last_known.iterrows(): for index, row in data_frame_last_known.iterrows():
if row_to_insert == None or row["timestamp"] > row_to_insert["timestamp"]: try: #needed because row_to_insert == None is not possible
if row_to_insert.empty or row["timestamp"] > row_to_insert["timestamp"]:
row_to_insert = row
except:
row_to_insert = row row_to_insert = row
try: try:
if not row_to_insert.empty : if not row_to_insert.empty :

13
influxgraph.py
View File

@ -176,12 +176,19 @@ class InfluxGraph:
Returns : Returns :
io.BytesIO : an BytesIO object containing the dataframe to retrieve io.BytesIO : an BytesIO object containing the dataframe to retrieve
""" """
df = self.influx_data_getter.get_curves_data_frame(variables, time, interval)
time = [float(t) for t in time.split(',')]
start, end = self.get_abs_time(time)
start, end = int(start), int(end)
queried_variables = variables.split(',')
if interval != "None" : interval = self.milliseconds_to_nano(int(interval))
df = self.influx_data_getter.get_curves_data_frame(queried_variables, [start, end], interval)
mem = io.BytesIO() mem = io.BytesIO()
mem.write(bytes(df.to_csv(sep="\t", index=False), "utf-8")) df.to_csv(mem, sep="\t", index=False)
mem.seek(0) mem.seek(0)
return mem return mem
def graphpoll(self): def graphpoll(self):