@datarailsshared/dr_renderer 1.2.261 → 1.2.262-dragons

package/package.json

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

package/src/highcharts_renderer.js

@@ -494,8 +494,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     cols = this.point.name;
                 }
 
-                highchartsRenderer.replaceDrOthersKeys(cols, rows, drOthersInAxis, othersName);
-
                 if (!lodash.isArray(cols)) {
                     cols = [cols];
                 }
@@ -537,6 +535,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         cols = modifiedRowsAndCols.cols;
                     }
 
+                    highchartsRenderer.replaceDrOthersKeys(cols, rows, drOthersInAxis, othersName);
+
                     var aggr = pivotData.getAggregator(rows, cols);
 
                     const formattedValue = is_drill_down_pie || labelOptions.show_value ? $.pivotUtilities.getFormattedNumber(value, aggr, opts, true) : '';
@@ -1035,6 +1035,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 ob.name = row_n_value.join(highchartsRenderer.delimer)
                     .replace(highchartsRenderer.DR_OTHERS_KEY, othersName);
             }
+
             lodash.forEach(col_n_keys, function (col_n_value, index) {
                 var agg = pivotData.getAggregator(row_n_value, col_n_value);
                 var val = agg.value();
@@ -1134,6 +1135,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             newSeries.className = 'totalSeries';
             newSeries.name = 'Total';
             newSeries.data = [];
+
+            if (colors && colors[i]) {
+                newSeries.color = colors[i];
+            }
+
             col_n_keys.forEach(columnKey => {
                 let totalKey = columnKey;
                 if (lodash.isArray(columnKey)) {
@@ -1252,6 +1258,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             if (opts.trendLine) {
                 const a = ((ySum * squareXSum) - (xSum * xySum)) / ((n * squareXSum) - (xSum * xSum));
                 const b = ((n * xySum) -  (xSum* ySum)) / ((n * squareXSum) - (xSum * xSum));
+
                 const trendSeries = lodash.clone(chart_series[chart_series.length - 1]);
                 trendSeries.className = 'trendSeries';
                 trendSeries.name = highchartsRenderer.getTrendSeriesName(trendSeries);
@@ -1262,6 +1269,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 if (colors && colors[i]) {
                     trendSeries.color = colors[i];
                 }
+
                 trendSerieses.push(trendSeries);
             }
             i++;
@@ -1278,6 +1286,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
 
         let weights = { line: 2,spline: 3 ,area:-2, areaspline: -1, scatter:4, column: 1 };
+
         if (opts.comboOptions && lodash.includes(chartType,'combo') && !lodash.isEqual(row_n_keys, EMPTY_ROW_N_KEYS)) {
             chart_series.forEach((series, seriesIndex) => {
                 const savedSeriesOption = lodash.find(opts.comboOptions.seriesOptions, {series: series.name});
@@ -1316,6 +1325,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             totalSeries.className = 'totalSeries';
             totalSeries.name = 'Total';
             totalSeries.data = [];
+
+            if (colors && colors[i]) {
+                totalSeries.color = colors[i];
+            }
+
             col_n_keys.forEach(columnKey => {
                 let key = columnKey;
                 let totalKey = columnKey;