@datarailsshared/dr_renderer 1.2.50 → 1.2.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.2.50",
+  "version": "1.2.54",
   "description": "DataRails charts and tables renderer",
   "keywords": [
     "datarails",

package/src/dataformatter.js

@@ -1004,7 +1004,7 @@ var DataFormatterImpl = function () {
                 // Call function
                 result = this.memoized[pattern].call(this, n, type);
 
-                if (result.value === result.pattern) {
+                if (result.value === result.pattern && !(String(n) === '0' && result.value.includes('0'))) {
                     result.value = n;
                 }
             }

package/src/dr_pivottable.js

@@ -3,7 +3,7 @@ let initDRPivotTable = function($, window, document) {
     var slice = [].slice;
     var extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
-    var DRPivotData, sortDateStrings, getSort, processKey, SubtotalRenderer, getFormattedNumber, largeToSmallSort, NovixRenderer;
+    var DRPivotData, sortDateStrings, getSort, processKey, SubtotalRenderer, getFormattedNumber, largeToSmallSort, largeToSmallSortByAbsolute, NovixRenderer;
 
     var delim = " , ";
     const newTableColors = ['rgb(127, 196, 255)', 'rgb(200, 243,243)', 'rgb(247, 161, 173)', 'rgb(255, 237, 178)', 'rgb(221, 239, 255)',
@@ -133,75 +133,88 @@ let initDRPivotTable = function($, window, document) {
             return key;
         };
 
-        let newProcessKey = function (record, totals, keys, attrs, getAggregator) {
-            var addKey, attr, flatKey, k, key, len, ref;
-            key = [];
-            addKey = false;
-            for (k = 0, len = attrs.length; k < len; k++) {
-                attr = attrs[k];
-                if (record.hasOwnProperty(attr)) {
-                    key.push((ref = record[attr]));
-                    flatKey = key.join(delim);
-                }
-                if (totals[flatKey] && totals[flatKey].isChangeable) {
-                    continue;
-                }
-                if (!flatKey) return [];
-                if (!totals[flatKey]) {
-                    totals[flatKey] = getAggregator(key.slice());
-                    addKey = true;
-                } else {
-                    totals[flatKey] = getAggregator(key.slice());
-                    totals[flatKey].push(record);
-                }
-            }
-            if (addKey) {
-                keys.push(key);
-            }
-            return key;
-        };
-
         DRPivotData.prototype.processRecord = function(record, useTotalsCalculation) {
-            var colKey, fColKey, fRowKey, flatColKey, flatRowKey, i, j, k, m, n, ref, results, rowKey;
-            rowKey = [];
-            colKey = [];
             if (useTotalsCalculation) {
-                rowKey = newProcessKey(record, this.rowTotals, this.rowKeys, this.rowAttrs, (function(_this) {
+                if (!this.notFirst) {
+                    this.keysLength = Object.keys(record).length - 1;
+                    this.notFirst = true;
+                }
+                let getRowAggregator = (function(_this) {
                     return function(key) {
                         return _this.aggregator(_this, key, []);
                     };
-                })(this));
-                colKey = newProcessKey(record, this.colTotals, this.colKeys, this.colAttrs, (function(_this) {
+                })(this);
+                let getColAggregator = (function(_this) {
                     return function(key) {
                         return _this.aggregator(_this, [], key);
                     };
-                })(this));
+                })(this);
 
-                if (!colKey.length && !rowKey.length) {
-                    this.allTotal.push(record);
+                let rowKey = [];
+                for (k = 0; k < this.rowAttrs.length; k++) {
+                    let attr = this.rowAttrs[k];
+                    if (record.hasOwnProperty(attr)) {
+                        rowKey.push((ref = record[attr]) != null ? ref : "null");
+                    }
                 }
-                if (!colKey.length && rowKey.length === 1) {
-                    this.rowTotals[rowKey[0]].push(record);
-                    this.rowTotals[rowKey[0]].isChangeable = true;
+
+                let colKey = [];
+                for (k = 0; k < this.colAttrs.length; k++) {
+                    let attr = this.colAttrs[k];
+                    if (record.hasOwnProperty(attr)) {
+                        colKey.push((ref = record[attr]) != null ? ref : "null");
+                    }
                 }
-                if (!rowKey.length && colKey.length === 1) {
-                    this.colTotals[colKey[0]].push(record);
-                    this.colTotals[colKey[0]].isChangeable = true;
+
+                let flatRowKey = rowKey.join(delim);
+                let flatColKey = colKey.join(delim);
+
+                if (this.keysLength === rowKey.length + colKey.length) {
+                    if (!this.rowKeys.some(rKey => rKey.join(delim) === flatRowKey)) {
+                        this.rowKeys.push(rowKey);
+                    }
+                    if (!this.colKeys.some(cKey => cKey.join(delim) === flatColKey)) {
+                        this.colKeys.push(colKey);
+                    }
                 }
-            } else {
-                this.allTotal.push(record);
-                rowKey = processKey(record, this.rowTotals, this.rowKeys, this.rowAttrs, (function(_this) {
-                    return function(key) {
-                        return _this.aggregator(_this, key, []);
-                    };
-                })(this));
-                colKey = processKey(record, this.colTotals, this.colKeys, this.colAttrs, (function(_this) {
-                    return function(key) {
-                        return _this.aggregator(_this, [], key);
-                    };
-                })(this));
+
+                if (!colKey.length && !rowKey.length) {
+                    this.allTotal.push(record);
+                } else if (!colKey.length && rowKey.length) {
+                    if (!this.rowTotals[flatRowKey]) {
+                        this.rowTotals[flatRowKey] = getRowAggregator(rowKey.slice());
+                        this.rowTotals[flatRowKey].push(record);
+                    }
+                } else if (!rowKey.length && colKey.length) {
+                    if (!this.colTotals[flatColKey]) {
+                        this.colTotals[flatColKey] = getColAggregator(rowKey.slice());
+                        this.colTotals[flatColKey].push(record);
+                    }
+                } else {
+                    if (!this.tree[flatRowKey]) {
+                        this.tree[flatRowKey] = {};
+                    }
+                    this.tree[flatRowKey][flatColKey] = this.aggregator(this, rowKey, colKey);
+                    this.tree[flatRowKey][flatColKey].push(record);
+                }
+                return;
             }
 
+            var colKey, fColKey, fRowKey, flatColKey, flatRowKey, i, j, k, m, n, ref, results, rowKey;
+            rowKey = [];
+            colKey = [];
+            this.allTotal.push(record);
+            rowKey = processKey(record, this.rowTotals, this.rowKeys, this.rowAttrs, (function(_this) {
+                return function(key) {
+                    return _this.aggregator(_this, key, []);
+                };
+            })(this));
+            colKey = processKey(record, this.colTotals, this.colKeys, this.colAttrs, (function(_this) {
+                return function(key) {
+                    return _this.aggregator(_this, [], key);
+                };
+            })(this));
+
             m = rowKey.length - 1;
             n = colKey.length - 1;
             if (m < 0 || n < 0) {
@@ -340,7 +353,11 @@ let initDRPivotTable = function($, window, document) {
         };
     };
 
-    largeToSmallSort = function(as, bs) {
+    largeToSmallSortByAbsolute = function (as, bs) {
+        return largeToSmallSort(as , bs, true);
+    }
+
+    largeToSmallSort = function(as, bs, is_abs = false) {
         var a, a1, b, b1, rd, rx, rz;
         rx = /(\d+)|(\D+)/g;
         rd = /\d/;
@@ -352,6 +369,11 @@ let initDRPivotTable = function($, window, document) {
             if (isNaN(bs)) {
                 return 1;
             }
+
+            if (is_abs) {
+                return Math.abs(bs) - Math.abs(as);
+            }
+
             return bs - as;
         }
         a = String(as).toLowerCase();
@@ -2217,6 +2239,7 @@ let initDRPivotTable = function($, window, document) {
     $.pivotUtilities.getFormattedNumber = getFormattedNumber;
     $.pivotUtilities.sortDateStrings = sortDateStrings;
     $.pivotUtilities.largeToSmallSort = largeToSmallSort;
+    $.pivotUtilities.largeToSmallSortByAbsolute = largeToSmallSortByAbsolute;
     $.pivotUtilities.getPivotDataModel = function(input, opts){ return new DRPivotData(input, opts); }
     $.pivotUtilities.getPivotTableFormula = function(rowData, opts, func, colFields, rowFields, aggregationDefaults, utils) {
         let totalStr = 'Grand Totals';