@datarailsshared/dr_renderer 1.2.229-dragons → 1.2.230-dragons

package/package.json

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

package/src/highcharts_renderer.js

@@ -623,6 +623,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         var func = function () {
             const isWaterfallBreakdown = this.series.options.className === SERIES_CLASSNAMES.WATERFALL_BREAKDOWN;
             const isWaterfallWalkthrough = this.series.options.className === SERIES_CLASSNAMES.WATERFALL_WALKTHROUGH;
+            const isTrendSeries = this.series.options.className === SERIES_CLASSNAMES.TREND_SERIES;
+
             var y = parseFloat(this.y);
             if (pivotData) {
                 let series_name = (this.series.name || '') + "";
@@ -632,7 +634,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 }
                 if (pivotData.rowAttrs.length == 0
                     || this.series.options.className === 'totalSeries'
-                    || this.series.options.className === 'trendSeries') {
+                    || isTrendSeries) {
                     rows = [];
                 }
 
@@ -672,7 +674,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         series_text += ': '
                     }
 
-                    if (pivotData.rowAttrs.length == 0) {
+                    if (pivotData.rowAttrs.length == 0 && !isTrendSeries) {
                         series_text = ': ';
                     }
 
@@ -686,7 +688,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
                     let formatted_value_to_return = $.pivotUtilities.getFormattedNumber(y, null, opts);
                     if (aggr.value() || isWaterfallBreakdown) {
-                        formatted_value_to_return = $.pivotUtilities.getFormattedNumber(isWaterfallBreakdown ? y : aggr.value(), aggr, opts);
+                        formatted_value_to_return = $.pivotUtilities.getFormattedNumber(
+                            isWaterfallBreakdown || isTrendSeries ? y : aggr.value(), aggr, opts
+                        );
                     }
 
                     let wrappedFormattedValue = highchartsRenderer.getSpanWrapper(formatted_value_to_return);
@@ -1093,7 +1097,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
                 const trendSeries = lodash.clone(chart_series[chart_series.length - 1]);
                 trendSeries.className = 'trendSeries';
-                trendSeries.name = 'Trend Line (' + trendSeries.name + ')';
+                trendSeries.name = highchartsRenderer.getTrendSeriesName(trendSeries);
                 trendSeries.dashStyle = 'shortdot';
                 trendSeries.type = 'line';
                 trendSeries.data = trendSeries.data.map((el, index) => a + b * (index + 1));
@@ -1262,7 +1266,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
                 const trendSeries = lodash.clone(chart_series[chart_series.length - 1]);
                 trendSeries.className = 'trendSeries';
-                trendSeries.name = 'Trend Line (' + trendSeries.name + ')';
+                trendSeries.name = highchartsRenderer.getTrendSeriesName(trendSeries);
                 trendSeries.dashStyle = 'shortdot';
                 trendSeries.type = 'line';
                 trendSeries.data = trendSeries.data.map((data, index) => ({name: data.name, y: a + b * (index + 1)}));
@@ -9018,7 +9022,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
     }
 
+    highchartsRenderer.getTrendSeriesName = function(series) {
+        return series.name ? 'Trend Line (' + series.name + ')' : 'Trend Line';
+    }
+
     return highchartsRenderer;
+
 };
 
 module.exports = getHighchartsRenderer;