@datarailsshared/dr_renderer 1.2.56 → 1.2.57

package/package.json

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

package/src/highcharts_renderer.js

@@ -909,6 +909,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         var variat_serias = null;
         const n = col_n_keys.length;
         const xSum = (1 + n) / 2 * n;
+        const trendSerieses = [];
 
         lodash.forEach(row_n_keys, function (row_n_value) {
             var ob = {};
@@ -973,11 +974,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     trendSeries.color = colors[i];
                 }
 
-                chart_series.push(trendSeries);
+                trendSerieses.push(trendSeries);
             }
 
             i++;
         });
+        const ethalonSeries = chart_series[chart_series.length - 1];
 
         if (has_delta && additionOptions && additionOptions.delta_column.only_variant) {
             if (variat_serias)
@@ -996,10 +998,13 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             }
         }
 
-        highchartsRenderer.moveSeriesToSecondYAxisIfNeeded(chart_series, pivotData, chartOptions, additionOptions, opts);
+        chart_series = [...chart_series, ...trendSerieses]
 
         if (opts.total) {
-            const newSeries = lodash.clone(chart_series[chart_series.length - 1]);
+            const newSeries = lodash.clone(ethalonSeries);
+            if (opts.totalSeriesSettings) {
+                newSeries.yAxis = opts.totalSeriesSettings.secondaryAxis ? 1 : undefined;
+            }
             newSeries.name = 'Total';
             newSeries.data = [];
             col_n_keys.forEach(columnKey => {
@@ -1013,6 +1018,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             chart_series.push(newSeries);
         }
 
+        highchartsRenderer.moveSeriesToSecondYAxisIfNeeded(chart_series, pivotData, chartOptions, additionOptions, opts, opts.total && opts.totalSeriesSettings && opts.totalSeriesSettings.secondaryAxis);
+
         return chart_series;
     };
 
@@ -1033,6 +1040,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         var variat_serias = null;
         const n = col_n_keys.length;
         const xSum = (1 + n) / 2 * n;
+        const trendSerieses = [];
 
         lodash.forEach(row_n_keys, function (row_n_value) {
             let ySum = 0;
@@ -1101,6 +1109,7 @@ 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));
@@ -1115,11 +1124,13 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     trendSeries.color = colors[i];
                 }
 
-                chart_series.push(trendSeries);
+                trendSerieses.push(trendSeries);
             }
             i++;
         });
 
+        const ethalonSeries = chart_series[chart_series.length - 1];
+
         if (has_delta && additionOptions.delta_column.only_variant) {
             if (variat_serias)
                 return [variat_serias];
@@ -1128,42 +1139,30 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             }
         }
 
-        highchartsRenderer.moveSeriesToSecondYAxisIfNeeded(chart_series, pivotData, chartOptions, additionOptions, opts);
-
         let weights = { line: 2,spline: 3 ,area:-2, areaspline: -1, scatter:4, column: 1 };
 
         if (opts.comboOptions && chartType.includes('combo')) {
             chart_series.forEach((series, seriesIndex) => {
                 const savedSeriesOption = lodash.find(opts.comboOptions.seriesOptions, {series: series.name});
                 if (savedSeriesOption) {
-                    switch (savedSeriesOption.chartType) {
-                        case 'line-chart':
-                            series.type = 'line';
-                            break;
-                        case 'line-chart-smooth':
-                            series.type = 'spline';
-                            break;
-                        case 'area-chart':
-                            series.type = 'area';
-                            break;
-                        case 'area-chart-smooth':
-                            series.type = 'areaspline';
-                            break;
-                        case 'scatter-chart':
-                            series.type = 'scatter';
-                            break;
-                        case 'column-chart' || 'column-chart-stacked':
-                            delete series.type;
-                            break;
-                    }
+                    highchartsRenderer.setChartTypeBySeriesType(savedSeriesOption.chartType, series);
                 } else if (seriesIndex === chart_series.length - 1 && !has_delta) {
                     series.type = 'line';
                 }
             });
         }
 
+        chart_series = [...chart_series, ...trendSerieses]
+
         if (opts.total) {
-            const totalSeries = lodash.clone(chart_series[chart_series.length - 1]);
+            const totalSeries = lodash.clone(ethalonSeries);
+            if (opts.totalSeriesSettings) {
+                if (chartType.includes('combo')) {
+                    highchartsRenderer.setChartTypeBySeriesType(opts.totalSeriesSettings.chartType, totalSeries);
+                }
+
+                totalSeries.yAxis = opts.totalSeriesSettings.secondaryAxis ? 1 : undefined;
+            }
             totalSeries.name = 'Total';
             totalSeries.data = [];
             col_n_keys.forEach(columnKey => {
@@ -1179,6 +1178,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             chart_series.push(totalSeries);
         }
 
+        highchartsRenderer.moveSeriesToSecondYAxisIfNeeded(chart_series, pivotData, chartOptions, additionOptions, opts, opts.total && opts.totalSeriesSettings && opts.totalSeriesSettings.secondaryAxis);
+
         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
         });
@@ -1186,6 +1187,22 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return chart_series;
     }
 
+    highchartsRenderer.setChartTypeBySeriesType = function (type, series) {
+        const types = {
+            'line-chart': 'line',
+            'line-chart-smooth': 'spline',
+            'area-chart': 'area',
+            'area-chart-smooth': 'areaspline',
+            'scatter-chart': 'scatter',
+        }
+
+        if (type === 'column-chart' || type === 'column-chart-stacked') {
+            delete series.type;
+        } else {
+            series.type = types[type]
+        }
+    }
+
     highchartsRenderer.getVariantSeries = function (series, delta_column_options) {
         const varianceColor = delta_column_options.color || highchartsRenderer.variance_color || Highcharts.getOptions().colors[7];
         series.name = delta_column_options.name.replace('_', '');
@@ -1357,7 +1374,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         });
     };
 
-    highchartsRenderer.moveSeriesToSecondYAxisIfNeeded = function(chartSeries, pivotData, chartOptions, additionOptions, opts) {
+    highchartsRenderer.moveSeriesToSecondYAxisIfNeeded = function(chartSeries, pivotData, chartOptions, additionOptions, opts, forceAddSecondaryAxis) {
         if (!opts || !opts.comboOptions) {
             return;
         }
@@ -1373,7 +1390,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             }
         });
 
-        if (addSecondYAxis) {
+        if (addSecondYAxis || forceAddSecondaryAxis) {
             highchartsRenderer.addSecondYAxis(pivotData, chartOptions, additionOptions, opts);
         }
     }