Fixed empty dataset not added in Chart at createGraph
This commit is contained in:
@ -458,15 +458,17 @@ let graphs = (function (){
|
|||||||
for(let e of data.graph[key]){
|
for(let e of data.graph[key]){
|
||||||
pdata.push({x: e[0]*1000, y: e[1]});
|
pdata.push({x: e[0]*1000, y: e[1]});
|
||||||
}
|
}
|
||||||
if(pdata.length > 0){
|
|
||||||
addDataset(gindex, key, pdata, dict[key])
|
addDataset(gindex, key, pdata, dict[key])
|
||||||
/*console.log(timeRange);
|
// if(pdata.length > 0){
|
||||||
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
|
// addDataset(gindex, key, pdata, dict[key])
|
||||||
d = data[data.length-1].x-data[0].x
|
// /*console.log(timeRange);
|
||||||
max = data[data.length-1].x;
|
// 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
|
||||||
min = data[0].x;
|
// d = data[data.length-1].x-data[0].x
|
||||||
}*/
|
// max = data[data.length-1].x;
|
||||||
}
|
// min = data[0].x;
|
||||||
|
// }*/
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
graph.setMinMax(currentMinTime,currentMaxTime);
|
graph.setMinMax(currentMinTime,currentMaxTime);
|
||||||
graph.autoScaleIf();
|
graph.autoScaleIf();
|
||||||
|
@ -98,9 +98,9 @@ class InfluxDataGetter:
|
|||||||
variable_name_for_query = var_param[0]
|
variable_name_for_query = var_param[0]
|
||||||
parameter = "value" if len(var_param) == 1 else var_param[1]
|
parameter = "value" if len(var_param) == 1 else var_param[1]
|
||||||
curve = self._get_curve(variable_name_for_query, parameter, time, interval)
|
curve = self._get_curve(variable_name_for_query, parameter, time, interval)
|
||||||
if len(curve) > 0:
|
# if len(curve) > 0:
|
||||||
res[variable] = curve
|
res[variable] = curve
|
||||||
|
|
||||||
return res
|
return res
|
||||||
|
|
||||||
def poll_last_values(self, variables, lastvalues, end_time):
|
def poll_last_values(self, variables, lastvalues, end_time):
|
||||||
|
Reference in New Issue
Block a user