@sme.up/ketchup 4.3.0-SNAPSHOT → 5.1.0-SNAPSHOT

package/dist/collection/components/kup-data-table/kup-data-table-helper.js

@@ -1,10 +1,7 @@
-import numeral from 'numeral';
 import { SortMode, TotalMode, } from './kup-data-table-declarations';
 import { isEmpty, stringToNumber } from '../../utils/utils';
 import { getCellValueForDisplay, getColumnByName, compareCell, } from '../../utils/cell-utils';
 import { FiltersRows } from '../../utils/filters/filters-rows';
-import { kupManagerInstance } from '../../utils/kup-manager/kup-manager';
-import { KupDebugCategory } from '../../utils/kup-debug/kup-debug-declarations';
 const dom = document.documentElement;
 export function sortRows(rows = [], sort = []) {
   if (!rows || rows.length === 0) {
@@ -236,7 +233,7 @@ function updateGroupTotal(groupRow, totals, addedRow, distinctObj) {
     return;
   }
   keys.forEach((key) => {
-    const currentTotalValue = groupRow.group.totals[key] || 0;
+    const currentTotalValue = dom.ketchup.math.numberify(groupRow.group.totals[key] || 0);
     const cell = addedRow.cells[key];
     if (cell) {
       let _isNumber = dom.ketchup.objects.isNumber(cell.obj);
@@ -255,7 +252,7 @@ function updateGroupTotal(groupRow, totals, addedRow, distinctObj) {
         case TotalMode.DISTINCT:
           let cellValue;
           if (_isNumber) {
-            cellValue = numeral(stringToNumber(cell.value)).value();
+            cellValue = dom.ketchup.math.numberify(stringToNumber(cell.value));
           }
           else {
             cellValue = cell.value;
@@ -307,17 +304,15 @@ function updateGroupTotal(groupRow, totals, addedRow, distinctObj) {
         case TotalMode.SUM:
         case TotalMode.AVERAGE:
           if (_isNumber) {
-            const cellValue = numeral(stringToNumber(cell.value));
-            groupRow.group.totals[key] = numeral(cellValue)
-              .add(currentTotalValue)
-              .value();
+            const cellValue = dom.ketchup.math.numberify(stringToNumber(cell.value));
+            groupRow.group.totals[key] =
+              cellValue + currentTotalValue;
             // updating parents
             let parent = groupRow.group.parent;
             while (parent != null) {
-              const currentParentSum = parent.group.totals[key] || 0;
-              parent.group.totals[key] = numeral(cellValue)
-                .add(currentParentSum)
-                .value();
+              const currentParentSum = dom.ketchup.math.numberify(parent.group.totals[key] || 0);
+              parent.group.totals[key] =
+                cellValue + currentParentSum;
               parent = parent.group.parent;
             }
           }
@@ -326,7 +321,7 @@ function updateGroupTotal(groupRow, totals, addedRow, distinctObj) {
         case TotalMode.MIN:
           if (_isNumber) {
             const currentTotalValue = groupRow.group.totals[key];
-            const cellValue = numeral(stringToNumber(cell.value)).value();
+            const cellValue = dom.ketchup.math.numberify(stringToNumber(cell.value));
             if (currentTotalValue) {
               groupRow.group.totals[key] = Math.min(currentTotalValue, cellValue);
             }
@@ -389,7 +384,7 @@ function updateGroupTotal(groupRow, totals, addedRow, distinctObj) {
         case TotalMode.MAX:
           if (_isNumber) {
             const currentTotalValue = groupRow.group.totals[key];
-            const cellValue = numeral(stringToNumber(cell.value)).value();
+            const cellValue = dom.ketchup.math.numberify(stringToNumber(cell.value));
             if (currentTotalValue) {
               groupRow.group.totals[key] = Math.max(currentTotalValue, cellValue);
             }
@@ -530,40 +525,17 @@ function adjustGroupAverageOrFormula(row, type, toAdjustKeys, totals) {
   // adjust average/formulas
   toAdjustKeys.forEach((key) => {
     if (type == TotalMode.AVERAGE) {
-      row.group.totals[key] = numeral(row.group.totals[key])
-        .divide(numberOfLeaf)
-        .value();
+      row.group.totals[key] =
+        dom.ketchup.math.numberify(row.group.totals[key]) /
+          numberOfLeaf;
     }
     if (type == TotalMode.MATH) {
       let formula = totals[key].substring(TotalMode.MATH.length);
-      row.group.totals[key] = evaluateFormula(formula, row.group.totals);
+      row.group.totals[key] = dom.ketchup.math.formulas.custom(formula, row.group.totals);
     }
   });
   return numberOfLeaf;
 }
-export function evaluateFormula(formula, row) {
-  const kupManager = kupManagerInstance();
-  let formula1 = formula;
-  const keys = Object.keys(row);
-  for (let i = 0; i < keys.length; i++) {
-    let key = keys[i];
-    let value = row[key];
-    if (value != null && !isNaN(value)) {
-      let re = new RegExp(key, 'g');
-      formula1 = formula1.replace(re, value.toString());
-    }
-  }
-  try {
-    return evaluateString(formula1);
-  }
-  catch (e) {
-    kupManager.debug.logMessage('kup-data-table-helper', 'Error during evaluate formula [' + formula1 + ']', KupDebugCategory.ERROR);
-    return NaN;
-  }
-}
-export function evaluateString(f) {
-  return Function('"use strict"; return (' + f + ')')();
-}
 export function normalizeRows(columns, rows) {
   if (rows) {
     const normalizedrows = Object.assign(rows);
@@ -611,7 +583,7 @@ export function calcTotals(rows = [], totals = {}) {
           if (totals[key] === TotalMode.DISTINCT) {
             let cellValue;
             if (dom.ketchup.objects.isNumber(cell.obj)) {
-              cellValue = numeral(stringToNumber(cell.value)).value();
+              cellValue = dom.ketchup.math.numberify(stringToNumber(cell.value));
             }
             else {
               cellValue = cell.value;
@@ -628,32 +600,32 @@ export function calcTotals(rows = [], totals = {}) {
             }
           }
           else if (dom.ketchup.objects.isNumber(cell.obj)) {
-            const cellValue = numeral(stringToNumber(cell.value));
+            const cellValue = dom.ketchup.math.numberify(stringToNumber(cell.value));
             let currentFooterValue = footerRow[key];
             switch (true) {
               // TODO DRY the MIN and MAX functions
               case totals[key] === TotalMode.MIN:
                 if (currentFooterValue) {
-                  footerRow[key] = Math.min(currentFooterValue, cellValue.value());
+                  footerRow[key] = Math.min(currentFooterValue, cellValue);
                 }
                 else {
-                  footerRow[key] = cellValue.value();
+                  footerRow[key] = cellValue;
                 }
                 break;
               case totals[key] === TotalMode.MAX:
                 if (currentFooterValue) {
-                  footerRow[key] = Math.max(currentFooterValue, cellValue.value());
+                  footerRow[key] = Math.max(currentFooterValue, cellValue);
                 }
                 else {
-                  footerRow[key] = cellValue.value();
+                  footerRow[key] = cellValue;
                 }
                 break;
               default:
                 // SUM
                 currentFooterValue = footerRow[key] || 0;
-                footerRow[key] = cellValue
-                  .add(currentFooterValue)
-                  .value();
+                footerRow[key] =
+                  cellValue +
+                    dom.ketchup.math.numberify(currentFooterValue);
             }
             // TODO DRY the MIN and MAX functions
           }
@@ -709,21 +681,21 @@ export function calcTotals(rows = [], totals = {}) {
         case totals[key] === TotalMode.AVERAGE:
           const sum = footerRow[key];
           if (sum && rows.length > 0) {
-            footerRow[key] = numeral(sum)
-              .divide(rows.length)
-              .value();
+            footerRow[key] = sum / rows.length;
           }
           break;
         case totals[key] === TotalMode.COUNT:
           footerRow[key] = rows.length;
           break;
         case totals[key].indexOf(TotalMode.MATH) == 0:
-          let formula = totals[key].substring(TotalMode.MATH.length);
-          footerRow[key] = evaluateFormula(formula, footerRow);
+          footerRow[key] = dom.ketchup.math.formulas.custom(totals[key].substring(TotalMode.MATH.length), footerRow);
           break;
         default:
           break;
       }
+      if (footerRow[key]) {
+        footerRow[key] = +footerRow[key].toFixed(2);
+      }
     }
   }
   return footerRow;

package/dist/collection/components/kup-data-table/kup-data-table.css

@@ -370,6 +370,10 @@ th.obj:hover span:not(.overlay-action) {
   color: var(--kup_datatable_color);
 }
 
+.group-wrapper {
+  --kup-chip-margin: 0 4px;
+}
+
 .totals-value {
   font-weight: bold;
 }