@datarailsshared/dr_renderer 1.2.127 → 1.2.130

package/package.json

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

package/src/highcharts_renderer.js

@@ -422,6 +422,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
 
         const labelOptions = lodash.get(opts.chartOptions, 'label') || lodash.get(opts.chartOptions, 'label_pie');
+        const othersName = opts.total_value_options ?
+            lodash.get(opts, "total_value_options.filter_options.filteredOutFieldName") || 'Others' :
+            undefined;
+        var drOthersInColumn = lodash.find(pivotData.getColKeys(), keys => keys.length && (keys.includes('DR_Others') || keys.includes(othersName)));
 
         var func = function () {
             var value = parseFloat(this.y);
@@ -447,8 +451,19 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     cols = this.point.name;
                 }
                 
-                var drOthersInColumn = lodash.find(pivotData.getColKeys(), keys => keys.length && lodash.includes(keys, 'DR_Others')) || [];
-                if (!lodash.isArray(cols) && drOthersInColumn[0] !== 'DR_Others') {
+                if (drOthersInColumn) {
+                    if (!lodash.isArray(cols) && othersName === cols) {
+                        cols = ['DR_Others'];
+                    } else if (lodash.isArray(cols)) {
+                        var index = cols.indexOf(othersName);
+
+                        if (index !== -1) {
+                            cols[index] = 'DR_Others';
+                        }
+                    }
+                }
+
+                if (!lodash.isArray(cols)) {
                     cols = [cols];
                 }
 
@@ -1109,7 +1124,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             ob.dataLabels = {
                 allowOverlap: additionOptions && additionOptions.label ? additionOptions.label.overlap : false,
                 enabled: additionOptions && additionOptions.label ? additionOptions.label.show : true,
-                formatter: highchartsRenderer.defaultDataLabelFormatter(pivotData, {'chartOptions': additionOptions}),
+                formatter: highchartsRenderer.defaultDataLabelFormatter(pivotData, {'chartOptions': additionOptions, total_value_options: opts.total_value_options}),
                 style: highchartsRenderer.getDataLabelsStyle(additionOptions)
             }
 
@@ -3563,6 +3578,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     if (this.ignoreValue) {
                         return null;
                     }
+                    if (useTotalsCalculation) {
+                        return this.sum;
+                    }
                     return this.sum / this.len;
                 },
                 format: function (x, only_formats) {
@@ -7873,6 +7891,19 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return sorters;
     };
 
+    highchartsRenderer.getSorters = function (field, values) {
+        if (field.sorting && field.sorting.type === 'DateString') {
+            return $.pivotUtilities.sortDateStrings(field.sorting.month_order);
+        } else if (field.sorting && field.sorting.type === 'largestToSmallest') {
+            if (field.sorting.is_absolute)
+                return $.pivotUtilities.largeToSmallSortByAbsolute;
+
+            return $.pivotUtilities.largeToSmallSort;
+        } else {
+            return $.pivotUtilities.sortAs(values);
+        }
+    };
+
     //highchartsRenderer.getGraphOptions(scope.data, override_values, res, scope.dataModel.templatesWithOutData, scope.openDrillDownList, drillDownFunction)
     highchartsRenderer.getGraphOptions = function (widget_obj, override_values, row_data, templates, openDrillDownListFunction, drillDownFunction) {
         let res = highchartsRenderer.updateSelectedOverrideValues(widget_obj, override_values, row_data);