@datarailsshared/dr_renderer 1.2.36 → 1.2.38

package/package.json

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

package/src/highcharts_renderer.js

@@ -30,7 +30,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     // in lib it will not work
     highchartsRenderer.elem1 = document.createElement('textarea');
 
-    highchartsRenderer.defaults_colors = default_colors;
+    if (lodash.isArray(default_colors)) {
+        highchartsRenderer.defaults_colors = default_colors;
+    } else {
+        highchartsRenderer.defaults_colors = default_colors.colors;
+        highchartsRenderer.variance_color = default_colors.variance_color;
+    }
 
     highchartsRenderer.highcharts_theme = {
         "colors": highchartsRenderer.defaults_colors,
@@ -1044,7 +1049,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     };
 
     highchartsRenderer.getVariantSeries = function (series, delta_column_options) {
-        const varianceColor = delta_column_options.color ? delta_column_options.color : Highcharts.getOptions().colors[7];
+        const varianceColor = delta_column_options.color || highchartsRenderer.variance_color || Highcharts.getOptions().colors[7];
         series.name = delta_column_options.name.replace('_', '');
         series.color = varianceColor;
 
@@ -1403,10 +1408,13 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         var __ret = highchartsRenderer.getSingleValueAgg(gaugeopts, aggfunc, base);
         aggfunc = __ret.aggfunc;
         base = __ret.base;
-        if (total.length > 0)
+        var aggregator = pivotData.getAggregator([], []);
+        if (total.length > 0) {
             value = total.reduce(aggfunc, base);
+        } else {
+            value = aggregator.value();
+        }
         var gauge_series = [value]
-        var aggregator = pivotData.getAggregator([], []);
         var valuef = lodash.isNumber(value) ? aggregator.format(value, true) : value;
 
         chartOptions.yAxis = {
@@ -1541,13 +1549,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         aggfunc = __ret.aggfunc;
         base = __ret.base;
 
+        var aggregator = pivotData.getAggregator([], []);
         if (total.length > 0) {
-
             value = total.reduce(aggfunc, base);
+        } else {
+            value = aggregator.value();
         }
         var gauge_series = [value]
 
-        var aggregator = pivotData.getAggregator([], []);
         var valuef = lodash.isNumber(value) ? aggregator.format(value, true) : value;
 
         chartOptions.yAxis = {
@@ -1635,8 +1644,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         aggfunc = __ret.aggfunc;
         base = __ret.base;
 
-        if (total.length > 0)
+        var aggregator = pivotData.getAggregator([], []);
+        if (total.length > 0) {
             value = total.reduce(aggfunc, base);
+        } else {
+            value = aggregator.value();
+        }
 
         chartOptions.title = kpioptions.hideChartHeader ? null : {
             text: kpioptions.name.name,
@@ -1649,8 +1662,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
         }
 
-        var aggregator = pivotData.getAggregator([], []);
-
         value = lodash.isNumber(value) ? aggregator.format(value, true) : value;
         chartOptions.subtitle = {
             text: value,
@@ -1951,7 +1962,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 labels_formatter = highchartsRenderer.persantageValueLabelsFormatter(pivotData, opts);
             }
 
-            const varianceColor = additionOptions.delta_column.color ? additionOptions.delta_column.color : Highcharts.getOptions().colors[7];
+            const varianceColor = additionOptions.delta_column.color || highchartsRenderer.variance_color || Highcharts.getOptions().colors[7];
             chartOptions.yAxis[1] = {
                 title: {
                     text: additionOptions.delta_column.name.replace('_', ''),
@@ -5515,7 +5526,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             label: 'Stacked Bar',
             title: 'Good for explaining part-to-whole comparisons across a given category.',
             description: 'For example, compare between sales-rep contributions to the total Revenue in different regions.',
-            axisName: 'Y - Axis Categories',
+            axisName: 'Y - Axis',
             legendName: 'Data series',
             startedMessage: 'To get started, drag one field to the y-axis section, and one field to the value section. Best practice: add one field to the Categories section too.',
             axisTooltipTitle: 'Drag one or more fields here to create your y-axis.',