|
|
@@ -190,7 +190,12 @@ function (angular, app, _, TimeSeries, kbn, PanelMeta) {
|
|
|
data.flotpairs = $scope.series[0].flotpairs;
|
|
|
}
|
|
|
|
|
|
- // first check value to text mappings
|
|
|
+ var decimalInfo = $scope.getDecimalsForValue(data.value);
|
|
|
+ var formatFunc = kbn.valueFormats[$scope.panel.format];
|
|
|
+ data.valueFormated = formatFunc(data.value, decimalInfo.decimals, decimalInfo.scaledDecimals);
|
|
|
+ data.valueRounded = kbn.roundValue(data.value, decimalInfo.decimals);
|
|
|
+
|
|
|
+ // check value to text mappings
|
|
|
for(var i = 0; i < $scope.panel.valueMaps.length; i++) {
|
|
|
var map = $scope.panel.valueMaps[i];
|
|
|
// special null case
|
|
|
@@ -201,6 +206,7 @@ function (angular, app, _, TimeSeries, kbn, PanelMeta) {
|
|
|
}
|
|
|
continue;
|
|
|
}
|
|
|
+
|
|
|
// value/number to text mapping
|
|
|
var value = parseFloat(map.value);
|
|
|
if (value === data.value) {
|
|
|
@@ -212,11 +218,6 @@ function (angular, app, _, TimeSeries, kbn, PanelMeta) {
|
|
|
if (data.value === null || data.value === void 0) {
|
|
|
data.valueFormated = "no value";
|
|
|
}
|
|
|
-
|
|
|
- var decimalInfo = $scope.getDecimalsForValue(data.value);
|
|
|
- var formatFunc = kbn.valueFormats[$scope.panel.format];
|
|
|
- data.valueFormated = formatFunc(data.value, decimalInfo.decimals, decimalInfo.scaledDecimals);
|
|
|
- data.valueRounded = kbn.roundValue(data.value, decimalInfo.decimals);
|
|
|
};
|
|
|
|
|
|
$scope.removeValueMap = function(map) {
|