@datarailsshared/dr_renderer 1.2.186-dragons → 1.2.187-dragons

package/package.json

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

package/src/highcharts_renderer.js

@@ -1339,15 +1339,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return chart_series;
     }
 
-    highchartsRenderer.ptCreateWaterfallBreakdownSeries = function (pivotData, onlyNumbers, additionOptions, opts) {
+    highchartsRenderer.ptCreateWaterfallBreakdownSeries = function (pivotData, additionOptions, opts) {
         const colorOptions = opts.breakdown_options.colors;
-        var chart_series = [],
-            row_n_keys = pivotData.getRowKeys(),
-            col_n_keys = pivotData.getColKeys();
-
-        if (row_n_keys.length === 0) {
-            row_n_keys.push([]);
-        }
+        const chart_series = [];
+        const row_n_keys = pivotData.getRowKeys();
+        const col_n_keys = lodash.map(lodash.keys(pivotData.colTotals), key => [key]);
+        const hasBreakdownValues = lodash.get(opts, 'breakdown_options.values.breakdown.length');
 
         let resultObject = {
             data: [],
@@ -1363,51 +1360,39 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         };
         resultObject = highchartsRenderer.getDataLabelsOptions(additionOptions, resultObject);
 
-        const breakdownValues = [];
+        let previousTotalValue = 0;
         lodash.forEach(col_n_keys, function(col_n_value, col_index) {
-            breakdownValues.push([]);
-            lodash.forEach(row_n_keys, function (row_n_value, row_index) {
-                var agg = pivotData.getAggregator(row_n_value, col_n_value);
-                var val = agg.value();
-
-                if (val != null && $.isNumeric(val)) {
-                    val = parseFloat(val);
-                } else if (onlyNumbers) {
-                    val = NaN;
-                } else {
-                    val = 0;
-                }
-
-                breakdownValues[col_index][row_index] = val;
 
-                if (col_index) {
-                    const value = val - breakdownValues[col_index - 1][row_index];
-
-                    if (value) {
-                        var tmoobj = {};
-                        var key = row_n_value;
-                        if (lodash.isArray(row_n_value)) {
-                            key = row_n_value[0];
-                        }
+            const totalColumnValue = pivotData.colTotals[col_n_value].sum;
+            if (col_index) {
+                lodash.forEach(row_n_keys, function (row_n_value) {
+                    const agg = pivotData.getAggregator(row_n_value, col_n_value);
+                    let val = hasBreakdownValues
+                        ? agg.value()
+                        : totalColumnValue - previousTotalValue;
+                    val = $.isNumeric(val) ? parseFloat(val) : 0;
+                    if (val) {
+                        const tmoobj = {};
+                        const key = lodash.isArray(row_n_value) ? row_n_value[0] : row_n_value;
                         tmoobj.name = lodash.unescape(key);
-        
+
                         if (tmoobj.name) {
                             tmoobj.name = tmoobj.name.replace('DR_Others', highchartsRenderer.getOthersName(opts));
                         }
-        
                         if (lodash.isEmpty(String(tmoobj.name))) {
                             tmoobj.name = lodash.unescape(col_n_value);
                             tmoobj.visible = false;
                         }
-                        tmoobj.y = value;
+
+                        tmoobj.y = val;
                         tmoobj.colKeys = [lodash.unescape(col_n_keys[col_index - 1]), lodash.unescape(col_n_value)];
                         resultObject.data.push(tmoobj);
                     }
-                }
-            });
-
+                });
+            }
+            previousTotalValue = totalColumnValue;
             resultObject.data.push({
-                y: pivotData.colTotals[col_n_value].sum,
+                y: totalColumnValue,
                 name: lodash.unescape(col_n_value).replace('DR_Others', highchartsRenderer.getOthersName(opts)),
                 isSum: !!col_index,
                 isTotal: true,
@@ -3240,7 +3225,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             chartOptions.colors = opts.paletteOptions.dashboardPalette.colors;
         }
         chartOptions.series = highchartsRenderer
-            .ptCreateWaterfallBreakdownSeries(pivotData, null, additionOptions, opts);
+            .ptCreateWaterfallBreakdownSeries(pivotData, additionOptions, opts);
 
         chartOptions = highchartsRenderer.prepareAxisX(chartOptions, additionOptions, pivotData.getColKeys());
         chartOptions.plotOptions = {
@@ -8668,7 +8653,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             rows = [];
         } else {
             rows = cols;
-            cols = [];
+            cols = [point.colKeys[1]];
         }
         return { rows, cols };
     }