Browse Source

fixed units and decimals settings in cards-bundle

pull/1106/head
Sergey Tarnavskiy 8 years ago
parent
commit
ac1de4d12e
  1. 4
      application/src/main/data/json/system/widget_bundles/cards.json
  2. 16
      ui/src/app/widget/lib/entities-table-widget.js
  3. 4
      ui/src/app/widget/lib/timeseries-table-widget.js

4
application/src/main/data/json/system/widget_bundles/cards.json

File diff suppressed because one or more lines are too long

16
ui/src/app/widget/lib/entities-table-widget.js

@ -367,7 +367,9 @@ function EntitiesTableWidgetController($element, $scope, $filter, $mdMedia, $tra
content = strContent;
}
} else {
content = defaultContent(key, value);
var decimals = (contentInfo.decimals || contentInfo.decimals === 0) ? contentInfo.decimals : vm.widgetConfig.decimals;
var units = contentInfo.units || vm.widgetConfig.units;
content = vm.ctx.utils.formatValue(value, decimals, units, true);
}
return content;
} else {
@ -375,14 +377,6 @@ function EntitiesTableWidgetController($element, $scope, $filter, $mdMedia, $tra
}
}
function defaultContent(key, value) {
if (angular.isDefined(value)) {
return value;
} else {
return '';
}
}
function defaultStyle(/*key, value*/) {
return {};
}
@ -477,7 +471,9 @@ function EntitiesTableWidgetController($element, $scope, $filter, $mdMedia, $tra
vm.contentsInfo[dataKey.label] = {
useCellContentFunction: useCellContentFunction,
cellContentFunction: cellContentFunction
cellContentFunction: cellContentFunction,
units: dataKey.units,
decimals: dataKey.decimals
};
var columnWidth = angular.isDefined(keySettings.columnWidth) ? keySettings.columnWidth : '0px';

4
ui/src/app/widget/lib/timeseries-table-widget.js

@ -217,7 +217,9 @@ function TimeseriesTableWidgetController($element, $scope, $filter, $timeout) {
content = strContent;
}
} else {
content = vm.ctx.utils.formatValue(value, contentInfo.decimals, contentInfo.units);
var decimals = (contentInfo.decimals || contentInfo.decimals === 0) ? contentInfo.decimals : vm.widgetConfig.decimals;
var units = contentInfo.units || vm.widgetConfig.units;
content = vm.ctx.utils.formatValue(value, decimals, units, true);
}
return content;
}

Loading…
Cancel
Save