@datarailsshared/dr_renderer 1.2.47-beta → 1.2.49-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.2.47-beta",
+  "version": "1.2.49-beta",
   "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)',
@@ -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

@@ -897,10 +897,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             row_n_keys = pivotData.getRowKeys(),
             col_n_keys = pivotData.getColKeys();
 
-        var num_cols = col_n_keys.length;
-        var num_rows = row_n_keys.length;
-        let averages = {};
-
         var has_delta = false;
         if (additionOptions && lodash.has(additionOptions, "delta_column.field") && additionOptions.delta_column.field == "series") {
             has_delta = true;
@@ -911,22 +907,22 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
         var i = 0;
         var variat_serias = null;
+        const n = col_n_keys.length;
+        const xSum = (1 + n) / 2 * n;
 
         lodash.forEach(row_n_keys, function (row_n_value) {
             var ob = {};
+            let ySum = 0;
+            let xySum = 0;
+            let squareXSum = 0;
             ob.data = [];
             if (row_n_value && row_n_value.length > 0)
                 ob.name = row_n_value.join(highchartsRenderer.delimer);
 
-            lodash.forEach(col_n_keys, function (col_n_value) {
+            lodash.forEach(col_n_keys, function (col_n_value, index) {
                 var agg = pivotData.getAggregator(row_n_value, col_n_value);
                 var val = agg.value();
 
-                if (averages[col_n_value.toString()]) {
-                    averages[col_n_value.toString()].push(val);
-                } else {
-                    averages[col_n_value.toString()] = [val];
-                }
                 if (isUniqueVals && agg.uniq)
                     val = agg.uniq.join('<br>');
 
@@ -945,6 +941,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     else
                         val = 0;
                 }
+
+                xySum += Number(val) * (index + 1);
+                ySum += Number(val);
+                squareXSum += (index + 1) * (index + 1);
                 ob.data.push(val);
             });
 
@@ -958,6 +958,24 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             }
 
             chart_series.push(ob);
+
+            if (opts.trendLine) {
+                const a = ((ySum * squareXSum) - (xSum * xySum)) / ((n * squareXSum) - (xSum * xSum));
+                const b = ((n * xySum) -  (xSum* ySum)) / ((n * squareXSum) - (xSum * xSum));
+
+                const trendSeries = lodash.clone(chart_series[chart_series.length - 1]);
+                trendSeries.name = 'Trend Line (' + trendSeries.name + ')';
+                trendSeries.dashStyle = 'shortdot';
+                trendSeries.type = 'line';
+                trendSeries.data = trendSeries.data.map((el, index) => a + b * (index + 1));
+
+                if (colors && colors[i]) {
+                    trendSeries.color = colors[i];
+                }
+
+                chart_series.push(trendSeries);
+            }
+
             i++;
         });
 
@@ -995,51 +1013,13 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             chart_series.push(newSeries);
         }
 
-        if (opts.trendLine) {
-            const trendSeries = lodash.clone(chart_series[chart_series.length - 1]);
-            trendSeries.name = 'Trend Line';
-            trendSeries.data = [];
-            const n = col_n_keys.length;
-            const xSum = (1 + n) / 2 * n;
-            let ySum = 0;
-            let xySum = 0;
-            let squareXSum = 0;
-
-            col_n_keys.forEach((columnKey, x) => {
-                const y = averages[columnKey.toString()] = averages[columnKey.toString()].reduce((acc, el, index) => {
-                    acc += Number(el);
-                    if (index === averages[columnKey.toString()].length - 1) {
-                        acc = acc / averages[columnKey.toString()].length;
-                    }
-
-                    return acc;
-                }, 0);
-                xySum += y * (x+1);
-                ySum += y;
-                squareXSum += (x+1) * (x+1);
-            });
-
-            const a = ((ySum * squareXSum) - (xSum * xySum)) / ((n * squareXSum) - (xSum * xSum));
-            const b = ((n * xySum) -  (xSum* ySum)) / ((n * squareXSum) - (xSum * xSum));
-
-            col_n_keys.forEach((columnKey, index) => {
-                trendSeries.data.push(a + b * (index + 1));
-            });
-
-            trendSeries.type = 'line';
-
-            chart_series.push(trendSeries);
-        }
-
         return chart_series;
     };
 
-    highchartsRenderer.ptCreateColumnSeries = function (pivotData, colors, onlyNumbers, isUniqueVals, isNotDrilldown, additionOptions, opts, chartOptions) {
+    highchartsRenderer.ptCreateColumnSeries = function (pivotData, colors, onlyNumbers, isUniqueVals, isNotDrilldown, additionOptions, opts, chartOptions, chartType) {
         var chart_series = [],
             row_n_keys = pivotData.getRowKeys(),
             col_n_keys = pivotData.getColKeys();
-        var num_cols = col_n_keys.length;
-        var num_rows = row_n_keys.length;
 
         var has_delta = false;
         if (additionOptions && lodash.has(additionOptions, "delta_column.field") && additionOptions.delta_column.field == "series") {
@@ -1051,9 +1031,13 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
         var i = 0;
         var variat_serias = null;
-        let averages = {};
+        const n = col_n_keys.length;
+        const xSum = (1 + n) / 2 * n;
 
         lodash.forEach(row_n_keys, function (row_n_value) {
+            let ySum = 0;
+            let xySum = 0;
+            let squareXSum = 0;
             var ob = {};
             ob.data = [];
             if (row_n_value && row_n_value.length > 0)
@@ -1066,14 +1050,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 style: highchartsRenderer.getDataLabelsStyle(additionOptions)
             }
 
-            lodash.forEach(col_n_keys, function (col_n_value) {
+            lodash.forEach(col_n_keys, function (col_n_value, index) {
                 var agg = pivotData.getAggregator(row_n_value, col_n_value);
                 var val = agg.value();
-                if (averages[col_n_value.toString()]) {
-                    averages[col_n_value.toString()].push(val);
-                } else {
-                    averages[col_n_value.toString()] = [val];
-                }
 
                 if (val != null) {
                     if ($.isNumeric(val)) {
@@ -1105,6 +1084,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 if (!isNotDrilldown)
                     tmoobj.drilldown = true;
 
+                xySum += Number(val) * (index + 1);
+                ySum += Number(val);
+                squareXSum += (index + 1) * (index + 1);
                 ob.data.push(tmoobj);
             });
 
@@ -1118,6 +1100,23 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             }
 
             chart_series.push(ob);
+
+            if (opts.trendLine) {
+                const a = ((ySum * squareXSum) - (xSum * xySum)) / ((n * squareXSum) - (xSum * xSum));
+                const b = ((n * xySum) -  (xSum* ySum)) / ((n * squareXSum) - (xSum * xSum));
+
+                const trendSeries = lodash.clone(chart_series[chart_series.length - 1]);
+                trendSeries.name = 'Trend Line (' + trendSeries.name + ')';
+                trendSeries.dashStyle = 'shortdot';
+                trendSeries.type = 'line';
+                trendSeries.data = trendSeries.data.map((data, index) => ({name: data.name, y: a + b * (index + 1)}));
+
+                if (colors && colors[i]) {
+                    trendSeries.color = colors[i];
+                }
+
+                chart_series.push(trendSeries);
+            }
             i++;
         });
 
@@ -1133,7 +1132,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
         let weights = { line: 2,spline: 3 ,area:-2, areaspline: -1, scatter:4, column: 1 };
 
-        if (opts.comboOptions && opts.comboOptions.seriesOptions.length) {
+        if (opts.comboOptions && opts.comboOptions.seriesOptions.length && chartType.includes('combo')) {
             opts.comboOptions.seriesOptions.forEach(option => {
                 chart_series.forEach(series => {
                     if (option.series === series.name) {
@@ -1179,49 +1178,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             chart_series.push(totalSeries);
         }
 
-        if (opts.trendLine) {
-            const trendSeries = lodash.clone(chart_series[chart_series.length - 1]);
-            trendSeries.name = 'Trend Line';
-            trendSeries.data = [];
-            const n = col_n_keys.length;
-            const xSum = (1 + n) / 2 * n;
-            let ySum = 0;
-            let xySum = 0;
-            let squareXSum = 0;
-
-            col_n_keys.forEach((columnKey, x) => {
-                const y = averages[columnKey.toString()] = averages[columnKey.toString()].reduce((acc, el, index) => {
-                    acc += Number(el);
-                    if (index === averages[columnKey.toString()].length - 1) {
-                        acc = acc / averages[columnKey.toString()].length;
-                    }
-
-                    return acc;
-                }, 0);
-                xySum += y * (x+1);
-                ySum += y;
-                squareXSum += (x+1) * (x+1);
-            });
-
-            const a = ((ySum * squareXSum) - (xSum * xySum)) / ((n * squareXSum) - (xSum * xSum));
-            const b = ((n * xySum) -  (xSum* ySum)) / ((n * squareXSum) - (xSum * xSum));
-
-            col_n_keys.forEach((columnKey, index) => {
-                let key = columnKey;
-                if (lodash.isArray(columnKey)) {
-                    key = columnKey[0];
-                }
-
-                trendSeries.data.push({
-                    name: lodash.unescape(key), y: a + b * (index + 1)
-                });
-            });
-
-            trendSeries.type = 'line';
-
-            chart_series.push(trendSeries);
-        }
-
         chart_series.sort((a,b) => {
             return (weights[a.type] || 0) > (weights[b.type] || 0) ? 1 : (weights[a.type] || 0) < (weights[b.type] || 0) ? -1 : 0
         });
@@ -1263,7 +1219,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             };
         } else if (delta_column_options.chart == 'column' || delta_column_options.chart == 'combo') {
             series.type = 'column';
-        } else {
+        } else if (delta_column_options.chart == 'spline') {
             series.type = 'spline';
             series.lineWidth = 0;
             series.lineColor = varianceColor;
@@ -1303,6 +1259,16 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 }
             };
         }
+        else if (delta_column_options.chart == 'area') {
+            series.color = varianceColor;
+            series.type = 'area'
+        } else if (delta_column_options.chart == 'areaspline') {
+            series.color = varianceColor;
+            series.type = 'areaspline'
+        } else if (delta_column_options.chart == 'scatter-chart') {
+            series.color = varianceColor;
+            series.type = 'scatter-chart'
+        }
         return series;
     }
 
@@ -1412,7 +1378,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     }
 
     highchartsRenderer.addSecondYAxis = function (pivotData, chartOptions, additionOptions, opts) {
-        const varianceColor = additionOptions.delta_column.color || highchartsRenderer.variance_color || Highcharts.getOptions().colors[7];
+        const varianceColor = (additionOptions && additionOptions.delta_column.color) || (highchartsRenderer && highchartsRenderer.variance_color) || Highcharts.getOptions().colors[7];
         let labels_formatter = opts.comboOptions.secondaryAxisSettings.is_percentage ?
             highchartsRenderer.persantageValueLabelsFormatter(pivotData, opts) :
             highchartsRenderer.defaultValueLabelsFormatter(pivotData, opts);
@@ -2394,7 +2360,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return highchartsRenderer.ptCreateElementAndDraw(chartOptions, opts);
     };
 
-    highchartsRenderer.ptRenderColumn = function (pivotData, opts, drilldownFunc) {
+    highchartsRenderer.ptRenderColumn = function (pivotData, opts, drilldownFunc, chartType) {
         var chartOptions = {};
         var rowAttrs = pivotData.rowAttrs;
         var colAttrs = pivotData.colAttrs;
@@ -2462,7 +2428,13 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         highchartsRenderer.handleGridLines(additionOptions, chartOptions);
 
         var isNotDrilldown = !(colAttrs && colAttrs.length > 1);
-        chartOptions.series = highchartsRenderer.ptCreateColumnSeries(pivotData, null, null, null, isNotDrilldown, additionOptions, opts, chartOptions);
+        if (lodash.get(opts, 'paletteOptions.widgetPalette', null)) {
+            const mc_palette = lodash.find(lodash.get(opts.paletteOptions, 'monochromePalettes', []), { selected: true });
+            chartOptions.colors = mc_palette ? mc_palette.colors : opts.paletteOptions.widgetPalette;
+        } else if (lodash.get(opts, 'paletteOptions.dashboardPalette.colors', null)) {
+            chartOptions.colors = opts.paletteOptions.dashboardPalette.colors;
+        }
+        chartOptions.series = highchartsRenderer.ptCreateColumnSeries(pivotData, chartOptions.colors, null, null, isNotDrilldown, additionOptions, opts, chartOptions, chartType);
         chartOptions = highchartsRenderer.prepareAxisX(chartOptions, additionOptions, pivotData.getColKeys());
         chartOptions.plotOptions = {
             column: {
@@ -2499,7 +2471,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return highchartsRenderer.ptCreateElementAndDraw(chartOptions, opts);
     };
 
-    highchartsRenderer.ptRenderStackedColumn = function (pivotData, opts, drilldownFunc) {
+    highchartsRenderer.ptRenderStackedColumn = function (pivotData, opts, drilldownFunc, chartType) {
         var chartOptions = {};
         var rowAttrs = pivotData.rowAttrs;
         var additionOptions = opts.chartOptions ? opts.chartOptions : highchartsRenderer.getDefaultValueForChart('column-chart-stacked');
@@ -2630,7 +2602,13 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         };
         //chartOptions.xAxis = { categories: pivotData.getColKeys() };
         chartOptions = highchartsRenderer.prepareAxisX(chartOptions, additionOptions, pivotData.getColKeys());
-        chartOptions.series = highchartsRenderer.ptCreateColumnSeries(pivotData, null, null, true, true, null, opts, chartOptions);
+        if (lodash.get(opts, 'paletteOptions.widgetPalette', null)) {
+            const mc_palette = lodash.find(lodash.get(opts.paletteOptions, 'monochromePalettes', []), { selected: true });
+            chartOptions.colors = mc_palette ? mc_palette.colors : opts.paletteOptions.widgetPalette;
+        } else if (lodash.get(opts, 'paletteOptions.dashboardPalette.colors', null)) {
+            chartOptions.colors = opts.paletteOptions.dashboardPalette.colors;
+        }
+        chartOptions.series = highchartsRenderer.ptCreateColumnSeries(pivotData, chartOptions.colors, null, true, true, null, opts, chartOptions, chartType);
         //chartOptions.drilldown = {}
 
         highchartsRenderer.handleGridLines(additionOptions, chartOptions)
@@ -4002,11 +3980,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) {
@@ -5032,6 +5006,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',
@@ -5588,12 +5568,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': {
@@ -5818,12 +5800,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',
@@ -5901,7 +5885,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         },
         'combo-column-chart': {
             name: 'Column Combo Chart ',
-            label: 'Column Combo Chart ',
+            label: 'Column Chart',
             title: 'Allows for multiple chart display formats in one widget',
             description: 'For example, Revenue and Cost of goods sold as clomuns, and Gross margin as a line',
             axisName: 'X - Axis',
@@ -5912,7 +5896,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         },
         'combo-stacked-chart': {
             name: 'Stacked Column Combo Chart  ',
-            label: 'Stacked Column Combo Chart  ',
+            label: 'Stacked Column',
             title: 'Allows for multiple chart display formats in one widget.',
             description: 'For example, different department stacked clomuns, and average as a line.',
             axisName: 'X - Axis',
@@ -7103,6 +7087,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']);
@@ -7184,7 +7172,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) {
@@ -7269,6 +7257,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);