dtable-statistic 4.0.7 → 4.0.9

package/es/calculator/pivot-table-calculator.js

@@ -9,7 +9,7 @@ import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import dayjs from 'dayjs';
 import { CellType, filter2SqlCondition, isDateColumn, isNumericColumn, TableUtils } from 'dtable-store';
 import BaseCalculator from './base-calculator';
-import { DTABLE_DB_SUMMARY_METHOD, MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP, SUMMARY_TYPE, TIME_COLUMN_LIST } from '../constants';
+import { DTABLE_DB_SUMMARY_METHOD, MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP, SUMMARY_METHOD_MAP, SUMMARY_TYPE, TIME_COLUMN_LIST } from '../constants';
 import { getSummaryColumnMethod } from '../utils/common-utils';
 import StatUtils from '../utils/stat-utils';
 import { getFormattedLabel } from '../utils/row-utils';
@@ -199,9 +199,7 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
         };
       }
       if (summary_columns_option) {
-        var _summarySQLColumnName2ColumnKey = {};
-        var _summaryTableColumnKey2Column = {};
-        var _summaryTableColumnKey2Method = {};
+        var _summaries = [];
         var summaryColumnOptions = [];
         var _summaryMethod = summary_method;
         var summaryColumn = TableUtils.getTableColumnByKey(table, summary_column_key);
@@ -209,10 +207,11 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
           var _this$summaryMethodCo2 = this.summaryMethodColumn2SqlColumn(_summaryMethod, summaryColumn),
             sqlSummaryMethodColumnName = _this$summaryMethodCo2.name,
             sqlSummaryMethodColumnKey = _this$summaryMethodCo2.key;
-          var summaryColumnKey = summaryColumn.key;
-          _summarySQLColumnName2ColumnKey[sqlSummaryMethodColumnKey] = summaryColumnKey;
-          _summaryTableColumnKey2Column[summaryColumnKey] = summaryColumn;
-          _summaryTableColumnKey2Method[summaryColumnKey] = _summaryMethod;
+          _summaries.push({
+            sqlSummaryMethodColumnKey: sqlSummaryMethodColumnKey,
+            summaryColumn: summaryColumn,
+            summaryMethod: _summaryMethod
+          });
           summaryColumnOptions.push(sqlSummaryMethodColumnName);
         }
         summary_columns_option.forEach(function (option) {
@@ -224,10 +223,11 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
             var _this$summaryMethodCo3 = _this.summaryMethodColumn2SqlColumn(summaryMethod, summaryColumn),
               _sqlSummaryMethodColumnName = _this$summaryMethodCo3.name,
               _sqlSummaryMethodColumnKey = _this$summaryMethodCo3.key;
-            var _summaryColumnKey = summaryColumn.key;
-            _summarySQLColumnName2ColumnKey[_sqlSummaryMethodColumnKey] = _summaryColumnKey;
-            _summaryTableColumnKey2Column[_summaryColumnKey] = summaryColumn;
-            _summaryTableColumnKey2Method[_summaryColumnKey] = summaryMethod;
+            _summaries.push({
+              sqlSummaryMethodColumnKey: _sqlSummaryMethodColumnKey,
+              summaryColumn: summaryColumn,
+              summaryMethod: summaryMethod
+            });
             summaryColumnOptions.push(_sqlSummaryMethodColumnName);
           }
         });
@@ -236,38 +236,35 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
         return {
           sql: _sql2,
           sqlGroupbyColumnKey: sqlGroupbyColumnKey,
-          summarySQLColumnName2ColumnKey: _summarySQLColumnName2ColumnKey,
-          summaryTableColumnKey2Column: _summaryTableColumnKey2Column,
-          summaryTableColumnKey2Method: _summaryTableColumnKey2Method
+          summaries: _summaries
         };
       }
-      var summarySQLColumnName2ColumnKey = {};
-      var summaryTableColumnKey2Column = {};
-      var summaryTableColumnKey2Method = {};
       var summaryMethod = summary_method;
       var statisticNumericColumnKeys = [summary_column_key].concat(_toConsumableArray(numeric_column_keys || []));
       var validStatisticNumericColumnKeys = _toConsumableArray(new Set(statisticNumericColumnKeys));
-      var statisticSummaryColumnsString = validStatisticNumericColumnKeys.map(function (key) {
+      var sqlNumericColumns = [];
+      var summaries = [];
+      validStatisticNumericColumnKeys.map(function (key) {
         return TableUtils.getTableColumnByKey(table, key);
       }).filter(function (column) {
         return column && (isDateColumn(column) || isNumericColumn(column));
-      }).map(function (column) {
+      }).forEach(function (column) {
         var _this$summaryMethodCo4 = _this.summaryMethodColumn2SqlColumn(summaryMethod, column),
           sqlNumericColumn = _this$summaryMethodCo4.name,
           sqlNumericColumnKey = _this$summaryMethodCo4.key;
-        var summaryColumnKey = column.key;
-        summarySQLColumnName2ColumnKey[sqlNumericColumnKey] = summaryColumnKey;
-        summaryTableColumnKey2Column[summaryColumnKey] = column;
-        summaryTableColumnKey2Method[summaryColumnKey] = summaryMethod;
-        return sqlNumericColumn;
-      }).join(', ');
+        summaries.push({
+          sqlSummaryMethodColumnKey: sqlNumericColumnKey,
+          summaryColumn: column,
+          summaryMethod: summaryMethod
+        });
+        sqlNumericColumns.push(sqlNumericColumn);
+      });
+      var statisticSummaryColumnsString = sqlNumericColumns.join(', ');
       var sql = "SELECT ".concat(sqlGroupbyColumnName).concat(statisticSummaryColumnsString ? ', ' + statisticSummaryColumnsString : '', " FROM ").concat(tableName, " ").concat(condition, " GROUP BY ").concat(sqlGroupbyColumnName, " LIMIT 0, 5000");
       return {
         sql: sql,
         sqlGroupbyColumnKey: sqlGroupbyColumnKey,
-        summarySQLColumnName2ColumnKey: summarySQLColumnName2ColumnKey,
-        summaryTableColumnKey2Column: summaryTableColumnKey2Column,
-        summaryTableColumnKey2Method: summaryTableColumnKey2Method
+        summaries: summaries
       };
     }
   }, {
@@ -329,8 +326,35 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
           }) : [];
           sqlSummaryColumnName = sqlSummaryMultipleNumericColumnName;
         }
+        if (summary_columns_option) {
+          var summaryColumnOptions = [];
+          summary_columns_option.forEach(function (option) {
+            var key = option.key,
+              method = option.method;
+            var summaryColumn = TableUtils.getTableColumnByKey(table, key);
+            var summaryMethod = method;
+            if (summaryColumn && (isNumericColumn(summaryColumn) || isDateColumn(summaryColumn))) {
+              var _this2$summaryMethodC2 = _this2.summaryMethodColumn2SqlColumn(summaryMethod, summaryColumn),
+                sqlSummaryMethodColumnName = _this2$summaryMethodC2.name;
+              summaryColumnOptions.push(sqlSummaryMethodColumnName);
+            }
+          });
+          var statisticSummaryColumnsString = summaryColumnOptions.join(', ');
+          if (statisticSummaryColumnsString) {
+            if (sqlSummaryColumnName) {
+              sqlSummaryColumnName += ", ".concat(statisticSummaryColumnsString);
+            } else {
+              sqlSummaryColumnName = statisticSummaryColumnsString;
+            }
+          }
+        }
+      }
+      var sql;
+      if (sqlSummaryColumnName) {
+        sql = "SELECT ".concat(sqlGroupbyColumnName, ", ").concat(sqlColumnGroupbyColumn, ", ").concat(sqlSummaryColumnName, " FROM ").concat(tableName, " ").concat(condition, " GROUP BY ").concat(sqlGroupbyColumnName, ", ").concat(sqlColumnGroupbyColumn, " ORDER BY `").concat(groupbyColumn.name, "` LIMIT 0, 5000");
+      } else {
+        sql = "SELECT ".concat(sqlGroupbyColumnName, ", ").concat(sqlColumnGroupbyColumn, " FROM ").concat(tableName, " ").concat(condition, " GROUP BY ").concat(sqlGroupbyColumnName, ", ").concat(sqlColumnGroupbyColumn, " ORDER BY `").concat(groupbyColumn.name, "` LIMIT 0, 5000");
       }
-      var sql = "SELECT ".concat(sqlGroupbyColumnName, ", ").concat(sqlColumnGroupbyColumn, ", ").concat(sqlSummaryColumnName, " FROM ").concat(tableName, " ").concat(condition, " GROUP BY ").concat(sqlGroupbyColumnName, ", ").concat(sqlColumnGroupbyColumn, " ORDER BY `").concat(groupbyColumn.name, "` LIMIT 0, 5000");
       return {
         sql: sql,
         sqlGroupbyColumnKey: sqlGroupbyColumnKey,
@@ -377,36 +401,36 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
         };
       }
       var sqlGroupbyColumnKey = statisticSQLMap.sqlGroupbyColumnKey,
-        summarySQLColumnName2ColumnKey = statisticSQLMap.summarySQLColumnName2ColumnKey,
-        summaryTableColumnKey2Column = statisticSQLMap.summaryTableColumnKey2Column,
-        summaryTableColumnKey2Method = statisticSQLMap.summaryTableColumnKey2Method;
-      var summaryColumnKeys = Object.values(summarySQLColumnName2ColumnKey);
-      var sqlSummaryColumnKeys = Object.keys(summarySQLColumnName2ColumnKey);
+        summaries = statisticSQLMap.summaries;
       var totalTemplate = {};
-      Object.values(summaryColumnKeys).forEach(function (key) {
-        var summaryMethod = summaryTableColumnKey2Method[key];
-        totalTemplate[key + summaryMethod] = _this3.initTotal(summaryMethod);
+      summaries.forEach(function (summary) {
+        var summaryColumn = summary.summaryColumn,
+          summaryMethod = summary.summaryMethod;
+        var summaryColumnKey = summaryColumn.key;
+        totalTemplate[summaryColumnKey + summaryMethod] = _this3.initTotal(summaryMethod);
         pivot_columns.push({
-          key: key,
+          key: summaryColumnKey,
           method: summaryMethod
         });
       });
       var allTotal = _objectSpread({}, totalTemplate);
       sqlRows.forEach(function (row) {
         var rowTotal = _objectSpread({}, totalTemplate);
-        sqlSummaryColumnKeys.forEach(function (key) {
-          var columnKey = summarySQLColumnName2ColumnKey[key];
-          var summaryColumn = summaryTableColumnKey2Column[columnKey];
-          var summaryMethod = summaryTableColumnKey2Method[columnKey];
-          var value = row[key] || _this3.initTotal(summaryMethod);
-          allTotal[columnKey + summaryMethod] = _this3.getSummaryValue({
+        summaries.forEach(function (summary) {
+          var sqlSummaryMethodColumnKey = summary.sqlSummaryMethodColumnKey,
+            summaryColumn = summary.summaryColumn,
+            summaryMethod = summary.summaryMethod;
+          var summaryColumnKey = summaryColumn.key;
+          var totalKey = summaryColumnKey + summaryMethod;
+          var value = row[sqlSummaryMethodColumnKey] || _this3.initTotal(summaryMethod);
+          allTotal[totalKey] = _this3.getSummaryValue({
             summaryColumn: summaryColumn,
             summaryMethod: summaryMethod
-          }, allTotal[columnKey + summaryMethod], value);
+          }, allTotal[totalKey], value);
           if (summaryColumn && isDateColumn(summaryColumn)) {
-            rowTotal[columnKey + summaryMethod] = value;
+            rowTotal[totalKey] = value;
           } else if (summaryColumn && isNumericColumn(summaryColumn)) {
-            rowTotal[columnKey + summaryMethod] = rowTotal[columnKey + summaryMethod] + value;
+            rowTotal[totalKey] = rowTotal[totalKey] + value;
           }
         });
         var originalLabel = _this3.getOriginalLabel(groupbyColumn, sqlGroupbyColumnKey, row, groupby_geolocation_granularity, groupby_date_granularity);
@@ -665,7 +689,7 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
       var summaryMethod = _ref4.summaryMethod,
         summaryColumn = _ref4.summaryColumn;
       if (summaryColumn && isDateColumn(summaryColumn)) {
-        if (summaryMethod === 'Max') {
+        if (summaryMethod === SUMMARY_METHOD_MAP.Max) {
           if (currentValue && nextValue) {
             return dayjs(currentValue).isBefore(nextValue) ? nextValue : currentValue;
           }
@@ -674,7 +698,7 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
           }
           return currentValue;
         }
-        if (summaryMethod === 'Min') {
+        if (summaryMethod === SUMMARY_METHOD_MAP.Min) {
           if (currentValue && nextValue) {
             return dayjs(currentValue).isBefore(nextValue) ? currentValue : nextValue;
           }
@@ -683,9 +707,12 @@ var PivotTableCalculator = /*#__PURE__*/function (_BaseCalculator) {
           }
           return currentValue;
         }
+        if (summaryMethod === SUMMARY_METHOD_MAP.Distinct_values) {
+          return (currentValue - 0 || 0) + (nextValue - 0 || 0);
+        }
         return currentValue;
       }
-      if (summaryMethod === 'MAX' || summaryMethod === 'MIN') {
+      if (summaryMethod === SUMMARY_METHOD_MAP.Max || SUMMARY_METHOD_MAP.Min) {
         if (currentValue === null && nextValue === null) return null;
         if (currentValue === null) return nextValue;
         if (nextValue === null) return currentValue;

package/es/calculator/workers/basic-chart-calculator-worker.js

@@ -228,7 +228,7 @@ function updateChartValue(summaryColumn, summary_type, summary_method, formula_r
     var updated = _objectSpread({}, item);
     var value = StatUtils.getTotal(summaryColumnKey, summaryColumnType, summary_type, summary_method, rows, formula_rows);
     updated.value = value;
-    updated.formatted_value = StatUtils.getFormattedValue(value, summaryColumn);
+    updated.formatted_value = StatUtils.getFormattedValue(value, summaryColumn, summary_method);
     results[index] = updated;
   });
 }
@@ -306,13 +306,18 @@ function getGroupbyNumericColumnsChartResults(rows, formulaRows, groupbyColumn,
   return getGroupChartStatResult(table, value, groupbyColumn, numericSummaryColumnKey, rows, formulaRows, includeEmpty, groupbyDateGranularity, groupbyGeolocationGranularity, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, summaryColumn, summaryType, summaryMethod, columnGroupbyMultipleNumericColumn, yAxisType);
 }
 function calculateGeolocationBasicChart(chart, value, username, userId) {
-  var table_id = chart.table_id,
+  var type = chart.type,
+    table_id = chart.table_id,
     view_id = chart.view_id,
     geo_column = chart.geo_column,
     geolocation_granularity = chart.geolocation_granularity,
     summary_type = chart.summary_type,
     summary_column = chart.summary_column,
     summary_method = chart.summary_method;
+  var geolocationGranularity = geolocation_granularity;
+  if (type === STAT_TYPE.WORLD_MAP || type === STAT_TYPE.WORLD_MAP_BUBBLE) {
+    geolocationGranularity = null;
+  }
   var table = TableUtils.getTableById(value.tables, table_id);
   var view = table && Views.getViewById(table.views, view_id);
   if (!view) {
@@ -335,16 +340,26 @@ function calculateGeolocationBasicChart(chart, value, username, userId) {
         var list = formulaRow[geoColumn.key];
         list.forEach(function (n) {
           var nameIndex = results.findIndex(function (r) {
-            return n[geolocation_granularity] === r.name;
+            if (geolocationGranularity) {
+              return n[geolocationGranularity] === r.name;
+            }
+            return n = r.name;
           });
-          updateBasicChartRows(results, nameIndex, n[geolocation_granularity], row);
+          if (geolocationGranularity) {
+            updateBasicChartRows(results, nameIndex, n[geolocationGranularity], row, null);
+          } else {
+            updateBasicChartRows(results, nameIndex, n, row, null);
+          }
         });
       } else {
-        var name = row[geoColumn.key] ? row[geoColumn.key][geolocation_granularity] : null;
+        var name = row[geoColumn.key] || null;
+        if (name && geolocationGranularity) {
+          name = name[geolocationGranularity];
+        }
         var nameIndex = results.findIndex(function (r) {
           return r.name === name;
         });
-        updateBasicChartRows(results, nameIndex, name, row);
+        updateBasicChartRows(results, nameIndex, name, row, null);
       }
     }
   });

package/es/calculator/workers/combination-calculator-worker.js

@@ -42,6 +42,7 @@ export default function calculateResult(chart, value, username, userId) {
         method: y_axis_left_summary_method,
         column_name: column1.name,
         type: column1.type,
+        data: column1.data,
         color: LABEL_COLORS[0]
       };
     }
@@ -53,6 +54,7 @@ export default function calculateResult(chart, value, username, userId) {
             method: item.summary_method,
             column_name: summaryColumn.name,
             type: summaryColumn.type,
+            data: summaryColumn.data,
             color: LABEL_COLORS[(index + 1) % 12]
           };
         }
@@ -206,37 +208,50 @@ export default function calculateResult(chart, value, username, userId) {
       var item = _step.value;
       var key = item[0];
       var leftValue = item[1];
-      var value1 = 0,
-        value2 = 0;
+      var value1 = 0;
+      var value2 = 0;
+      var formattedValueLeft = value1;
+      var formattedValueRight = value2;
       var rightValue = rightResultMap.get(key);
       if (y_axis_right_summary_type === SUMMARY_TYPE.COUNT) {
         value2 = rightValue;
+        formattedValueRight = value2;
       }
       if (y_axis_right_summary_type === SUMMARY_TYPE.ADVANCED) {
         value2 = getSummaryResult(rightValue, y_axis_right_summary_method);
+        formattedValueRight = StatUtils.getFormattedValue(value2, column2, y_axis_right_summary_method);
       }
       if (!y_axis_left_group_by_multiple_numeric_column) {
         if (y_axis_left_summary_type === SUMMARY_TYPE.COUNT) {
           value1 = leftValue;
+          formattedValueLeft = value1;
         }
         if (y_axis_left_summary_type === SUMMARY_TYPE.ADVANCED) {
           var list = leftValue[column1.key];
           value1 = getSummaryResult(list, y_axis_left_summary_method);
+          formattedValueLeft = StatUtils.getFormattedValue(value1, column1, y_axis_left_summary_method);
         }
         results.push({
           name: key,
           value_left: value1,
-          value_right: value2
+          value_right: value2,
+          formatted_value_left: formattedValueLeft,
+          formatted_value_right: formattedValueRight
         });
       } else {
         leftSummaryColumnKeys.forEach(function (columnKey) {
+          var summaryColumn = leftSummaryColumn[columnKey];
+          var summaryMethod = summaryColumn.method;
           var list = leftValue[columnKey];
-          var value = getSummaryResult(list, leftSummaryColumn[columnKey].method);
+          var value = getSummaryResult(list, summaryMethod);
+          formattedValueLeft = StatUtils.getFormattedValue(value, summaryColumn, summaryMethod);
           results.push({
             name: key,
             value_left: value,
             color: leftSummaryColumn[columnKey].color,
-            value_right: value2
+            value_right: value2,
+            formatted_value_left: formattedValueLeft,
+            formatted_value_right: formattedValueRight
           });
         });
       }

package/es/calculator/workers/compare-bar-chart-calculator-worker.js

@@ -89,14 +89,17 @@ function calculateChart(chart, value, username, userId) {
       var item = _step.value;
       var key = item[0];
       var _value = item[1];
+      var formatted_value = _value;
       if (isAdvance) {
         _value = getSummaryResult(_value, y_axis_summary_method, data.precision);
+        formatted_value = StatUtils.getFormattedValue(_value, summaryColumn, y_axis_summary_method);
       }
       dateRangeResult.push({
         name: key,
-        value: _value,
         group_name: groupName1,
-        raw_name: key
+        raw_name: key,
+        value: _value,
+        formatted_value: formatted_value
       });
     }
   } catch (err) {
@@ -112,14 +115,17 @@ function calculateChart(chart, value, username, userId) {
       var _item = _step2.value;
       var _key = _item[0];
       var _value2 = _item[1];
+      var _formatted_value = _value2;
       if (isAdvance) {
         _value2 = getSummaryResult(_value2, y_axis_summary_method, data.precision);
+        _formatted_value = StatUtils.getFormattedValue(_value2, summaryColumn, y_axis_summary_method);
       }
       comparedDateRangeResult.push({
         name: _key,
-        value: _value2,
         group_name: groupName2,
-        raw_name: _key
+        raw_name: _key,
+        value: _value2,
+        formatted_value: _formatted_value
       });
     }
   } catch (err) {
@@ -132,8 +138,8 @@ function calculateChart(chart, value, username, userId) {
     if (!comparedDateRangeResult[i]) break;
     comparedDateRangeResult[i].name = dateRangeResult[i].name;
     if (display_increase) {
-      var value1 = dateRangeResult[i].value,
-        value2 = comparedDateRangeResult[i].value || 0.001;
+      var value1 = dateRangeResult[i].value;
+      var value2 = comparedDateRangeResult[i].value || 0.001;
       if (!value2) {
         comparedDateRangeResult[i].increase_value = 1;
       } else {

package/es/calculator/workers/mirror-calculator-worker.js

@@ -3,6 +3,7 @@ import { getClientCellValueDisplayString } from '../../utils';
 import { getSummaryResult } from '../../utils/common-utils';
 import { getCellValue } from '../../utils/row-utils';
 import { SUMMARY_TYPE } from '../../constants';
+import StatUtils from '../../utils/stat-utils';
 function calculateStatItem(chart, dtableValue, username, userId) {
   var table_id = chart.table_id,
     view_id = chart.view_id,
@@ -17,6 +18,7 @@ function calculateStatItem(chart, dtableValue, username, userId) {
   var rows = Views.getViewRows(view, table, dtableValue, username, userId);
   var formulaRows = Views.getTableFormulaResults(table, rows, dtableValue);
   var groupColumn = TableUtils.getTableColumnByKey(table, group_column);
+  var numericColumn = summary_column && TableUtils.getTableColumnByKey(table, summary_column);
   var groupItems = getGroupItems(rows, groupColumn);
   if (groupColumn.length === 0) return;
   var result = {};
@@ -50,7 +52,6 @@ function calculateStatItem(chart, dtableValue, username, userId) {
       });
     });
   } else {
-    var numericColumn = TableUtils.getTableColumnByKey(table, summary_column);
     groupItems.forEach(function (groupItem) {
       rows.forEach(function (row) {
         var value = getClientCellValueDisplayString(row, columnItem.type, columnItem.key, {
@@ -79,10 +80,12 @@ function calculateStatItem(chart, dtableValue, username, userId) {
         }
       });
     });
-    var data = numericColumn.data || {};
-    result = summaryResult(result, summary_method, data.precision);
+    if (numericColumn) {
+      var data = numericColumn.data || {};
+      result = summaryResult(result, summary_method, data.precision);
+    }
   }
-  return normalizeResult(result, groupColumn);
+  return normalizeResult(result, groupColumn, numericColumn, summary_type, summary_method);
 }
 function summaryResult(result, summaryMethod, precision) {
   var newResult = {};
@@ -95,7 +98,7 @@ function summaryResult(result, summaryMethod, precision) {
   });
   return newResult;
 }
-function normalizeResult(result, groupColumn) {
+function normalizeResult(result, groupColumn, summaryColumn, summaryType, summaryMethod) {
   var data = [];
   var colorSet = [];
   Object.keys(result).forEach(function (groupId, index) {
@@ -105,9 +108,15 @@ function normalizeResult(result, groupColumn) {
     if (!groupItem) return;
     colorSet[index] = groupItem.color;
     Object.keys(result[groupId]).forEach(function (name) {
+      var value = result[groupId][name];
+      var formattedValue = value;
+      if (summaryType === SUMMARY_TYPE.ADVANCED) {
+        formattedValue = StatUtils.getFormattedValue(value, summaryColumn, summaryMethod);
+      }
       data.push({
         name: name,
-        value: result[groupId][name],
+        value: value,
+        formatted_value: formattedValue,
         group_name: groupItem.name,
         color: groupItem.color
       });