@datarailsshared/dr_renderer 1.2.241 → 1.2.242

package/package.json

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

package/src/highcharts_renderer.js

@@ -1438,7 +1438,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
             let keys = [];
             if (value.trend === 'total') {
-                keys = ['Total'];
+                keys = value.key;
             } else {
                 _.forEach(value.key, (item) => {
                     const findKeyByValue = Object.keys(pivotData.dateValuesDictionary || {}).find(key => pivotData.dateValuesDictionary[key] === item);
@@ -8827,6 +8827,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
         res = highchartsRenderer.setNewFieldNames(res);
 
+        if (widget_obj.chart_type === highchartsRenderer.CHART_TYPES.WATERFALL_WALKTHROUGH) {
+            res = highchartsRenderer.addTotalsToWalkthroughRowData(widget_obj, res);
+        }
+
         let pivot = {};
         pivot.sorters = highchartsRenderer.getWidgetDataSorters(res, widget_obj);
         pivot.rowData = res;
@@ -9113,6 +9117,39 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return series.name ? 'Trend Line (' + series.name + ')' : 'Trend Line';
     }
 
+    highchartsRenderer.addTotalsToWalkthroughRowData = function(widget, rowDataInitial) {
+        const walkthroughValues = widget.options.walkthrough_options.values.walkthrough;
+        const categoryFields = widget.cols;
+        const valueField = widget.vals[0];
+        const rowData = lodash.cloneDeep(rowDataInitial);
+        const modifiedRowData = [];
+
+        let sum = 0;
+        lodash.forEach(walkthroughValues, (value) => {
+
+            // if it is not total value - then add it as rowData data row and sum it up
+            // else - add total with calculated sum as new rowData data row (totals do not initially exist in BE response)
+            if (value.trend !== 'total') {
+                const rowIndex = lodash.findIndex(rowData, (responseRow) =>
+                    lodash.every(categoryFields, (field, fieldKey) => responseRow[field.name] === value.key[fieldKey])
+                );
+                modifiedRowData.push(rowData[rowIndex]);
+                sum += rowData[rowIndex][valueField.name];
+                rowData.splice(rowIndex, 1);
+            } else {
+                const totalRow = {};
+                _.forEach(categoryFields, (field, fieldKey) => {
+                    totalRow[field.name] = value.key[fieldKey];
+                });
+                totalRow[valueField.name] = sum;
+                modifiedRowData.push(totalRow);
+                sum = 0;
+            }
+        });
+
+        return lodash.concat(modifiedRowData, rowData);
+    }
+
     return highchartsRenderer;
 };