@datarailsshared/dr_renderer 1.2.203-dragons → 1.2.205

package/package.json

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

package/src/highcharts_renderer.js

@@ -87,10 +87,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         EXCEL_VIEWER: 'excel_viewer',
     };
 
-    highchartsRenderer.VIRTUAL_FIELDS = {
-        WATERFALL_VARIANCE: 'DR_WATERFALL_VARIANCE',
-    };
-
     highchartsRenderer.highcharts_theme = {
         "colors": highchartsRenderer.defaults_colors,
         "chart": {
@@ -1343,12 +1339,15 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return chart_series;
     }
 
-    highchartsRenderer.ptCreateWaterfallBreakdownSeries = function (pivotData, additionOptions, opts) {
+    highchartsRenderer.ptCreateWaterfallBreakdownSeries = function (pivotData, onlyNumbers, additionOptions, opts) {
         const colorOptions = opts.breakdown_options.colors;
-        const chart_series = [];
-        const row_n_keys = pivotData.getRowKeys();
-        const col_n_keys = pivotData.getColKeys();
-        const hasBreakdownValues = lodash.some(pivotData.getRowKeys(), rowKey => !rowKey || lodash.isArray(rowKey) && !rowKey.length);
+        var chart_series = [],
+            row_n_keys = pivotData.getRowKeys(),
+            col_n_keys = pivotData.getColKeys();
+
+        if (row_n_keys.length === 0) {
+            row_n_keys.push([]);
+        }
 
         let resultObject = {
             data: [],
@@ -1364,46 +1363,56 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         };
         resultObject = highchartsRenderer.getDataLabelsOptions(additionOptions, resultObject);
 
+        const breakdownValues = [];
         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();
 
-            const totalColumnValue = pivotData.colTotals[col_n_value].sum;
-            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 (val != null && $.isNumeric(val)) {
+                    val = parseFloat(val);
+                } else if (onlyNumbers) {
+                    val = NaN;
+                } else {
+                    val = 0;
+                }
 
-            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()
-                        : nextTotalColumnValue - totalColumnValue;
-
-                    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);
+                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];
+                        }
+                        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 = val;
+                        tmoobj.y = value;
                         tmoobj.colKeys = [lodash.unescape(col_n_keys[col_index - 1]), lodash.unescape(col_n_value)];
                         resultObject.data.push(tmoobj);
                     }
-                });
-            }
+                }
+            });
+
+            resultObject.data.push({
+                y: pivotData.colTotals[col_n_value].sum,
+                name: lodash.unescape(col_n_value).replace('DR_Others', highchartsRenderer.getOthersName(opts)),
+                isSum: !!col_index,
+                isTotal: true,
+                color: colorOptions.total,
+            });
         });
 
         chart_series.push(resultObject);
@@ -3181,8 +3190,6 @@ 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',
@@ -3233,7 +3240,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             chartOptions.colors = opts.paletteOptions.dashboardPalette.colors;
         }
         chartOptions.series = highchartsRenderer
-            .ptCreateWaterfallBreakdownSeries(pivotData, additionOptions, opts);
+            .ptCreateWaterfallBreakdownSeries(pivotData, null, additionOptions, opts);
 
         chartOptions = highchartsRenderer.prepareAxisX(chartOptions, additionOptions, pivotData.getColKeys());
         chartOptions.plotOptions = {
@@ -4958,28 +4965,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             }
         });
 
-        // add virtual fields to rows if required
-        let rows = widgetOptions.rows;
-        if (!lodash.get(widgetOptions, 'rows.length') && widgetOptions.options.breakdown_options) {
-            rows = [
-                {
-                    id: -1,
-                    name: highchartsRenderer.VIRTUAL_FIELDS.WATERFALL_VARIANCE,
-                    type: 'Text',
-                },
-            ];
-        }
-
         // fill rows fields
-        lodash.forEach(rows, function (valObj) {
-            if (lodash.includes(highchartsRenderer.VIRTUAL_FIELDS, valObj.name)) {
-                legendFields.push(valObj);
-            } else {
-                fieldOb = lodash.find(fields, {id: valObj.id});
-                if (fieldOb) {
-                    legendFields.push(fieldOb);
-                    lodash.remove(fields, {id: fieldOb.id});
-                }
+        lodash.forEach(widgetOptions.rows, function (valObj) {
+            fieldOb = lodash.find(fields, {id: valObj.id});
+            if (fieldOb) {
+                legendFields.push(fieldOb);
+                lodash.remove(fields, {id: fieldOb.id});
             }
         });
 
@@ -5103,13 +5094,36 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         dynamicRangeOptions.pivot.calculatedValues = highchartsRenderer.objectCopyJsonMethod(dynamicRangeOptions.calculated_values || []);
     }
 
-    highchartsRenderer.addTemplateDataToFunctionOptions = function (selectedTemplate, functionOptions) {
+    highchartsRenderer.addTemplateDataToCalcModel = function (selectedTemplate, calcModelOptions) {
         highchartsRenderer.setWidgetFieldsToTemplate(selectedTemplate);
 
         var fields = highchartsRenderer.objectCopyJsonMethod(selectedTemplate.widget_fields);
         var fieldOb;
-        var filterFields = [];
-        var valuesFields = [];
+        var selectedFields = [];
+
+        // fill selected fields
+        lodash.forEach(calcModelOptions.fields, function (valObj) {
+            fieldOb = lodash.find(fields, {id: valObj.id});
+            if (fieldOb) {
+                selectedFields.push(fieldOb);
+                lodash.remove(fields, {id: fieldOb.id});
+            }
+        });
+
+        calcModelOptions.pivot = {
+            fieldsArray: fields,
+            selectedFieldsArray: selectedFields
+        };
+    }
+
+    highchartsRenderer.addTemplateDataToFunctionOptions = function (selectedTemplate, functionOptions) {
+        highchartsRenderer.setWidgetFieldsToTemplate(selectedTemplate);
+
+        let fieldOb;
+
+        const fields = highchartsRenderer.objectCopyJsonMethod(selectedTemplate.widget_fields);
+        const filterFields = [];
+        const valuesFields = [];
 
         lodash.forEach(functionOptions.filters, function (filterObj) {
             fieldOb = lodash.find(fields, {id: filterObj.field});
@@ -7924,7 +7938,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     };
 
     highchartsRenderer.createDateFromString = function (dateString, format) {
-        if (!(format && highchartsRenderer.isDateFormat(dateString, format) || highchartsRenderer.isDate(dateString))) {
+        if ((format && !highchartsRenderer.isDateFormat(dateString, format)) || !highchartsRenderer.isDate(dateString)) {
             return null;
         }
         const utcDate = format 
@@ -8078,7 +8092,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 filter.is_excluded = false;
             } else {
                 filter = highchartsRenderer.createDrillDownFilterObject(widget, widget.cols[0], colKey[0]);
-                filters.push(filter);
             }
             filter.values = [];
             for (let i = 0; i < colKey.length; i++) {
@@ -8681,7 +8694,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             rows = [];
         } else {
             rows = cols;
-            cols = [point.colKeys[1]];
+            cols = [];
         }
         return { rows, cols };
     }