dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: Minor fixes for widgets.

Browse Source
This commit is contained in:
Igor Kulikov 2017-02-03 10:02:26 +02:00
parent 2c28b4f639
commit e0c366614e
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dao/src/main/resources/system-data.cql
View File

File diff suppressed because one or more lines are too long

14
ui/src/app/api/datasource.service.js
View File

@ -465,6 +465,18 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic
} }
} }
function isNumeric(val) {
return (val - parseFloat( val ) + 1) >= 0;
}
function convertValue(val) {
if (val && isNumeric(val)) {
return Number(val);
} else {
return val;
}
}
function onData(sourceData, type) { function onData(sourceData, type) {
for (var keyName in sourceData) { for (var keyName in sourceData) {
var keyData = sourceData[keyName]; var keyData = sourceData[keyName];
@ -487,7 +499,7 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic
for (var i in keyData) { for (var i in keyData) {
series = keyData[i]; series = keyData[i];
time = series[0]; time = series[0];
value = Number(series[1]); value = convertValue(series[1]);
if (dataKey.postFunc) { if (dataKey.postFunc) {
value = dataKey.postFunc(time, value, prevSeries[1]); value = dataKey.postFunc(time, value, prevSeries[1]);
} }