ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Fixed null points in charts

Browse source
This commit is contained in:
Ziver Koc 2016-06-02 20:45:24 +02:00
parent 74c49244e7
commit 6c11751720
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/se/hal/page/PCOverviewHttpPage.java
View file

@ -37,10 +37,6 @@ public class PCOverviewHttpPage extends HalHttpPage implements HalHttpPage.HalJs
DBConnection db = HalContext.getDB(); DBConnection db = HalContext.getDB();
List<User> users = User.getUsers(db); List<User> users = User.getUsers(db);
ArrayList<AggregateData> minDataList = new ArrayList<>();
ArrayList<AggregateData> hourDataList = new ArrayList<>();
ArrayList<AggregateData> dayDataList = new ArrayList<>();
ArrayList<AggregateData> weekDataList = new ArrayList<>();
List<Sensor> sensors = getSensorList(db); List<Sensor> sensors = getSensorList(db);
Templator tmpl = new Templator(FileUtil.find(TEMPLATE)); Templator tmpl = new Templator(FileUtil.find(TEMPLATE));
@ -103,7 +99,7 @@ public class PCOverviewHttpPage extends HalHttpPage implements HalHttpPage.HalJs
for (AggregateDataListSqlResult.AggregateData data : dataList) { for (AggregateDataListSqlResult.AggregateData data : dataList) {
DataNode dataNode = new DataNode(DataNode.DataType.Map); DataNode dataNode = new DataNode(DataNode.DataType.Map);
dataNode.set("time", data.timestamp); dataNode.set("time", data.timestamp);
if (data.data == Float.NaN) if (Float.isNaN(data.data))
dataNode.set("" + data.id, (String)null); dataNode.set("" + data.id, (String)null);
else else
dataNode.set("" + data.id, data.data); dataNode.set("" + data.id, data.data);