diff --git a/client/jsFiles/SEAWebClientGraphics.js b/client/jsFiles/SEAWebClientGraphics.js index 37f372d..0f1b742 100644 --- a/client/jsFiles/SEAWebClientGraphics.js +++ b/client/jsFiles/SEAWebClientGraphics.js @@ -458,15 +458,17 @@ let graphs = (function (){ for(let e of data.graph[key]){ pdata.push({x: e[0]*1000, y: e[1]}); } - if(pdata.length > 0){ - addDataset(gindex, key, pdata, dict[key]) - /*console.log(timeRange); - if(data[data.length-1].x-data[0].x > d && data[data.length-1].x-data[0].x < (30*60+10)*1000){ // Adjust to requested time - d = data[data.length-1].x-data[0].x - max = data[data.length-1].x; - min = data[0].x; - }*/ - } + + addDataset(gindex, key, pdata, dict[key]) + // if(pdata.length > 0){ + // addDataset(gindex, key, pdata, dict[key]) + // /*console.log(timeRange); + // if(data[data.length-1].x-data[0].x > d && data[data.length-1].x-data[0].x < (30*60+10)*1000){ // Adjust to requested time + // d = data[data.length-1].x-data[0].x + // max = data[data.length-1].x; + // min = data[0].x; + // }*/ + // } } graph.setMinMax(currentMinTime,currentMaxTime); graph.autoScaleIf(); diff --git a/influxdb.py b/influxdb.py index a0c36d4..370fb90 100644 --- a/influxdb.py +++ b/influxdb.py @@ -98,9 +98,9 @@ class InfluxDataGetter: variable_name_for_query = var_param[0] parameter = "value" if len(var_param) == 1 else var_param[1] curve = self._get_curve(variable_name_for_query, parameter, time, interval) - if len(curve) > 0: - res[variable] = curve - + # if len(curve) > 0: + res[variable] = curve + return res def poll_last_values(self, variables, lastvalues, end_time):