@datarailsshared/dr_renderer 1.2.193-dragons → 1.2.195-dragons

package/package.json

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

package/src/highcharts_renderer.js

@@ -1343,7 +1343,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         const colorOptions = opts.breakdown_options.colors;
         const chart_series = [];
         const row_n_keys = pivotData.getRowKeys();
-        const col_n_keys = lodash.map(lodash.keys(pivotData.colTotals), key => [key]);
+        const col_n_keys = pivotData.getColKeys();
         const hasBreakdownValues = lodash.get(opts, 'breakdown_options.values.breakdown.length');
 
         let resultObject = {
@@ -1360,16 +1360,26 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         };
         resultObject = highchartsRenderer.getDataLabelsOptions(additionOptions, resultObject);
 
-        let previousTotalValue = 0;
         lodash.forEach(col_n_keys, function(col_n_value, col_index) {
 
             const totalColumnValue = pivotData.colTotals[col_n_value].sum;
-            if (col_index) {
+            const nextTotalColumnKey = col_n_keys[col_index + 1];
+            const nextTotalColumnValue = nextTotalColumnKey ? pivotData.colTotals[nextTotalColumnKey].sum : null;
+            resultObject.data.push({
+                y: totalColumnValue,
+                name: lodash.unescape(col_n_value).replace('DR_Others', highchartsRenderer.getOthersName(opts)),
+                isSum: !!col_index,
+                isTotal: true,
+                color: colorOptions.total,
+            });
+
+            if (col_index !== col_n_keys.length - 1) {
                 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;
+                        : nextTotalColumnValue - totalColumnValue;
+
                     val = $.isNumeric(val) ? parseFloat(val) : 0;
                     if (val) {
                         const tmoobj = {};
@@ -1390,14 +1400,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     }
                 });
             }
-            previousTotalValue = totalColumnValue;
-            resultObject.data.push({
-                y: totalColumnValue,
-                name: lodash.unescape(col_n_value).replace('DR_Others', highchartsRenderer.getOthersName(opts)),
-                isSum: !!col_index,
-                isTotal: true,
-                color: colorOptions.total,
-            });
         });
 
         chart_series.push(resultObject);
@@ -3175,6 +3177,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             ? opts.chartOptions
             : highchartsRenderer.getDefaultValueForChart(highchartsRenderer.CHART_TYPES.WATERFALL_BREAKDOWN);
 
+        pivotData.colKeys = lodash.map(lodash.keys(pivotData.colTotals), key => [key]);
+
         chartOptions.chart = {
             type: 'waterfall',
             zoomType: additionOptions && additionOptions.chart && additionOptions.chart.zoom_type ? additionOptions.chart.zoom_type : 'None',
@@ -4356,15 +4360,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             );
 
             if (uniqueCategories && (uniqueCategories.length > maxCategories || uniqueCategories.length < minCategories )) {
-                const commonErrorSentence = `Please choose ${ minCategories }-${ maxCategories } items in the Category section.`
                 options.error_has_occurred = true;
                 options.error_params = {
-                    title: uniqueCategories.length > maxCategories
-                        ? `There is too much data. ${ commonErrorSentence }`
-                        : `Not enough data. ${ commonErrorSentence }`,
-                    text: '',
-                    btnText: 'Edit Widget',
-                    class: 'too-much-data',
+                    title: 'Data Conflict',
+                    text: `Please adjust your dashboard's reference date and filter selections as \
+                        the quantity of data doesn't match the chart's ${ minCategories }-${ maxCategories } value limit.`,
+                    class: 'nodata' ,
                 }
                 return highchartsRenderer.getNoDataResult(options.rendererOptions, true);
             }