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

Display timestamp option for digital gauges.

Browse Source
This commit is contained in:
Igor Kulikov 2017-08-07 18:02:21 +03:00
parent ac3e4429b8
commit f5b42f098f
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/src/app/widget/lib/CanvasDigitalGauge.js
View File

@ -180,7 +180,9 @@ export default class CanvasDigitalGauge extends canvasGauges.BaseGauge {
drawDigitalTitle(context, options); drawDigitalTitle(context, options);
drawDigitalLabel(context, options); if (!options.showTimestamp) {
drawDigitalLabel(context, options);
}
drawDigitalMinMax(context, options); drawDigitalMinMax(context, options);
@ -198,6 +200,10 @@ export default class CanvasDigitalGauge extends canvasGauges.BaseGauge {
drawDigitalValue(context, options, this.value); drawDigitalValue(context, options, this.value);
if (options.showTimestamp) {
drawDigitalLabel(context, options);
}
this.elementValueClone.initialized = true; this.elementValueClone.initialized = true;
this.elementValueClone.renderedValue = this.value; this.elementValueClone.renderedValue = this.value;
} }

22
ui/src/app/widget/lib/canvas-digital-gauge.js
View File

@ -45,6 +45,9 @@ export default class TbCanvasDigitalGauge {
(settings.unitTitle && settings.unitTitle.length > 0 ? (settings.unitTitle && settings.unitTitle.length > 0 ?
settings.unitTitle : dataKey.label) : ''); settings.unitTitle : dataKey.label) : '');
this.localSettings.showTimestamp = settings.showTimestamp == true ? true : false;
this.localSettings.timestampFormat = settings.timestampFormat && settings.timestampFormat.length ? settings.timestampFormat : 'yyyy-MM-dd HH:mm:ss';
this.localSettings.gaugeWidthScale = settings.gaugeWidthScale || 0.75; this.localSettings.gaugeWidthScale = settings.gaugeWidthScale || 0.75;
this.localSettings.gaugeColor = settings.gaugeColor || tinycolor(keyColor).setAlpha(0.2).toRgbString(); this.localSettings.gaugeColor = settings.gaugeColor || tinycolor(keyColor).setAlpha(0.2).toRgbString();
@ -167,6 +170,7 @@ export default class TbCanvasDigitalGauge {
symbol: this.localSettings.units, symbol: this.localSettings.units,
label: this.localSettings.unitTitle, label: this.localSettings.unitTitle,
showTimestamp: this.localSettings.showTimestamp,
hideValue: this.localSettings.hideValue, hideValue: this.localSettings.hideValue,
hideMinMax: this.localSettings.hideMinMax, hideMinMax: this.localSettings.hideMinMax,
@ -193,6 +197,12 @@ export default class TbCanvasDigitalGauge {
if (cellData.data.length > 0) { if (cellData.data.length > 0) {
var tvPair = cellData.data[cellData.data.length - var tvPair = cellData.data[cellData.data.length -
1]; 1];
if (this.localSettings.showTimestamp) {
var timestamp = tvPair[0];
var filter= this.ctx.$scope.$injector.get('$filter');
var timestampDisplayValue = filter('date')(timestamp, this.localSettings.timestampFormat);
this.gauge.options.label = timestampDisplayValue;
}
var value = tvPair[1]; var value = tvPair[1];
this.gauge.value = value; this.gauge.value = value;
} }
@ -269,6 +279,16 @@ export default class TbCanvasDigitalGauge {
"type": "boolean", "type": "boolean",
"default": false "default": false
}, },
"showTimestamp": {
"title": "Show value timestamp",
"type": "boolean",
"default": false
},
"timestampFormat": {
"title": "Timestamp format",
"type": "string",
"default": "yyyy-MM-dd HH:mm:ss"
},
"showValue": { "showValue": {
"title": "Show value text", "title": "Show value text",
"type": "boolean", "type": "boolean",
@ -477,6 +497,8 @@ export default class TbCanvasDigitalGauge {
"showTitle", "showTitle",
"unitTitle", "unitTitle",
"showUnitTitle", "showUnitTitle",
"showTimestamp",
"timestampFormat",
"showValue", "showValue",
"showMinMax", "showMinMax",
"gaugeWidthScale", "gaugeWidthScale",