@datarailsshared/dr_renderer 1.2.52 → 1.2.53

package/package.json

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

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)',
@@ -155,7 +155,7 @@ let initDRPivotTable = function($, window, document) {
                     totals[flatKey].push(record);
                 }
             }
-            if (addKey) {
+            if (addKey && key.length === attrs.length) {
                 keys.push(key);
             }
             return key;
@@ -180,13 +180,13 @@ let initDRPivotTable = function($, window, document) {
                 if (!colKey.length && !rowKey.length) {
                     this.allTotal.push(record);
                 }
-                if (!colKey.length && rowKey.length === 1) {
-                    this.rowTotals[rowKey[0]].push(record);
-                    this.rowTotals[rowKey[0]].isChangeable = true;
+                if (!colKey.length && rowKey.length) {
+                    this.rowTotals[rowKey.join(delim)].push(record);
+                    this.rowTotals[rowKey.join(delim)].isChangeable = true;
                 }
-                if (!rowKey.length && colKey.length === 1) {
-                    this.colTotals[colKey[0]].push(record);
-                    this.colTotals[colKey[0]].isChangeable = true;
+                if (!rowKey.length && colKey.length) {
+                    this.colTotals[colKey.join(delim)].push(record);
+                    this.colTotals[colKey.join(delim)].isChangeable = true;
                 }
             } else {
                 this.allTotal.push(record);
@@ -340,7 +340,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 +356,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 +2226,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';

package/src/highcharts_renderer.js

@@ -3879,11 +3879,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     pivotData.sorters = new_sorting_function;
                 }
 
-                if (totalFilters && totalFilters.filter_options) {
-                    result = highchartsRenderer.generateFilteredResult(totalFilters, optsFiltered, rowData, opts, pivotData);
-                } else {
-                    result = opts.renderer(pivotData, opts.rendererOptions);
-                }
+                result = opts.renderer(pivotData, opts.rendererOptions);
             } catch (_error) {
                 e = _error;
                 if (typeof console !== "undefined" && console !== null) {
@@ -4834,6 +4830,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     value_name: 'remove_underscores',
                     default_value: true
                 },
+                {
+                    element_type: 'checkbox',
+                    element_label: 'Use big data table',
+                    value_name: 'use_handsOnTable',
+                    default_value: false
+                },
                 {
                   element_type: 'checkbox',
                   element_label: 'Use new table design',
@@ -5385,12 +5387,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 element_type: 'checkbox',
                 element_label: 'Sort by variance',
                 value_name: 'sort_by_variance',
-                default_value: false
+                default_value: false,
+                hidden: true
             }, {
                 element_type: 'checkbox',
                 element_label: 'Sort by absolute variance',
                 value_name: 'sort_by_absolute_variance',
-                default_value: false
+                default_value: false,
+                hidden: true
             }]
         },
         'delta_column_for_drill_down': {
@@ -5456,12 +5460,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 element_type: 'checkbox',
                 element_label: 'Sort by variance',
                 value_name: 'sort_by_variance',
-                default_value: false
+                default_value: false,
+                hidden: true
             }, {
                 element_type: 'checkbox',
                 element_label: 'Sort by absolute variance',
                 value_name: 'sort_by_absolute_variance',
-                default_value: false
+                default_value: false,
+                hidden: true
             }, {
                 element_type: 'checkbox',
                 element_label: 'Filter zero values',
@@ -6661,6 +6667,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     };
 
     highchartsRenderer.setNewFieldNames = function (res) {
+        if (useTotalsCalculation) {
+            return res;
+        }
+
         if (res && res[0] && res[0]['DR_Values']) {
             lodash.forEach(res, function (item) {
                 item['DR_Values'] = highchartsRenderer.getFieldName(item['DR_Values']);
@@ -6742,7 +6752,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         "name": field.name,
                         "type": field.type,
                         "values": [],
-                        "sorting": field.sorting
+                        "sorting": field.sorting,
                     });
                 }
             } else if (field.sorting && field.sorting.type == "CustomOrder" && field.sorting.values) {
@@ -6827,6 +6837,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 if (field.sorting && field.sorting.type == "DateString") {
                     return $.pivotUtilities.sortDateStrings(field.sorting.month_order);
                 } else if (field.sorting && field.sorting.type == "largestToSmallest") {
+                    if (field.sorting.is_absolute)
+                        return $.pivotUtilities.largeToSmallSortByAbsolute;
+
                     return $.pivotUtilities.largeToSmallSort;
                 } else {
                     return $.pivotUtilities.sortAs(field.values);