logitude-dashboard-library 3.2.23 → 3.2.25

package/dist/index.js

@@ -736,14 +736,20 @@ var getGlobalNumberFormatting = function getGlobalNumberFormatting() {
 
 var getNumberInSystemLocalFormat = function getNumberInSystemLocalFormat(value, decimalDigitsCount) {
   if (decimalDigitsCount === void 0) {
-    decimalDigitsCount = 20;
+    decimalDigitsCount = -1;
   }
 
   if (isNaN(value) || value == null || value == undefined) return value + "";
+  var decimalParts = value.toString().split(".");
+  var maxFractionDigits = decimalParts[1] ? decimalParts[1].length : 0;
+  decimalDigitsCount = decimalDigitsCount == -1 ? maxFractionDigits : decimalDigitsCount;
 
   var _numberSeparatorSettings = getGlobalNumberFormatting();
 
-  var _val = value.toLocaleString('en-US', {
+  var factor = Math.pow(10, decimalDigitsCount);
+  var truncatedValue = Math.floor(value * factor) / factor;
+
+  var _val = truncatedValue.toLocaleString('en-US', {
     minimumFractionDigits: 0,
     maximumFractionDigits: decimalDigitsCount
   });
@@ -1822,11 +1828,29 @@ var PivotTable = React.forwardRef(function (props, comRef) {
           dataField: measure.PivotMeasureCode,
           area: 'data',
           dataType: 'number',
-          summaryType: 'sum',
           wordWrapEnabled: true,
           caption: measure.MeasureCode == 'Sum' && typeof measure.DisplayName == 'string' ? ConvertStringToPascalCaseHelper(measure.DisplayName.replace("Sum of ", "")) : ConvertStringToPascalCaseHelper(measure.DisplayName),
+          summaryType: 'custom',
+          calculateCustomSummary: function calculateCustomSummary(options) {
+            if (options.summaryProcess == 'calculate') {
+              var _value = !isNullOrUndefinedOrEmpty(options.value) ? options.value : 0;
+
+              var decimalParts = _value.toString().split(".");
+
+              var firstPart = decimalParts[0] ? decimalParts[0] : 0;
+              var secondPart = decimalParts[1] ? decimalParts[1] : 0;
+              secondPart = secondPart.toString().substr(0, 2);
+
+              var _finalVal = firstPart + "." + secondPart;
+
+              options.value = Number(_finalVal);
+              options.totalValue = (!isNullOrUndefinedOrEmpty(options.totalValue) ? options.totalValue : 0) + options.value;
+            }
+          },
           format: function format(value) {
-            return getNumberInSystemLocalFormat(value);
+            var _value = isNullOrUndefinedOrEmpty(value) ? 0 : value;
+
+            return getNumberInSystemLocalFormat(_value, 2);
           }
         };
       });
@@ -2052,9 +2076,48 @@ function buildDataSource(values, widget) {
   return data;
 }
 
+var reorder = function reorder(values, referenceOrder) {
+  return referenceOrder.map(function (groupById) {
+    return values.find(function (v) {
+      return v.GroupById === groupById;
+    }) || {
+      GroupById: groupById,
+      Value: 0
+    };
+  });
+};
+
+var getOrderedSeriesMeasures = function getOrderedSeriesMeasures(seriesMeasures, widget) {
+  if (!seriesMeasures || seriesMeasures.length < 2) {
+    return seriesMeasures;
+  }
+
+  var referenceOrder;
+
+  if (widget.SortBy == 1) {
+    referenceOrder = seriesMeasures[0].Values.map(function (v) {
+      return v.Label;
+    });
+    seriesMeasures[1].Values = reorder(seriesMeasures[1].Values, referenceOrder);
+  } else if (widget.SortBy == 2) {
+    referenceOrder = seriesMeasures[1].Values.map(function (v) {
+      return v.Label;
+    });
+    seriesMeasures[0].Values = reorder(seriesMeasures[0].Values, referenceOrder);
+  } else {
+    referenceOrder = seriesMeasures[0].Values.map(function (v) {
+      return v.GroupById;
+    });
+    seriesMeasures[1].Values = reorder(seriesMeasures[1].Values, referenceOrder);
+  }
+
+  return seriesMeasures;
+};
+
 function buildDataSet(seriesMeasures, widget) {
   var dataSet = [];
-  seriesMeasures.forEach(function (seriesMeasure) {
+  var orderedSeriesMeasures = getOrderedSeriesMeasures(seriesMeasures, widget);
+  orderedSeriesMeasures.forEach(function (seriesMeasure) {
     var datas = seriesMeasure.Values.map(function (e, index) {
       return {
         value: e.Value,