@datarailsshared/dr_renderer 1.2.69 → 1.2.73

package/package.json

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

package/src/dr_pivottable.js

@@ -146,7 +146,7 @@ let initDRPivotTable = function($, window, document) {
         DRPivotData.prototype.processRecord = function(record, useTotalsCalculation) {
             if (useTotalsCalculation) {
                 if (!this.notFirst) {
-                    this.keysLength = _.keys(record).length - 1;
+                    this.keysLength = _.filter(_.keys(record), key => !['data_types', 'formats', 'values_formats'].includes(key)).length - 1;
                     this.notFirst = true;
                 }
                 let getRowAggregator = (function(_this) {

package/src/highcharts_renderer.js

@@ -465,7 +465,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         rows = temp;
                     }
 
-                    if (opts && opts.chartOptions && opts.chartOptions.label && opts.chartOptions.label.show_percentage) {
+                    if (opts && opts.chartOptions && opts.chartOptions.label && opts.chartOptions.label.percentage) {
+                        return (Math.round((this.y / this.total) * 10000) / 100) + '%';
+                    } else if (opts && opts.chartOptions && opts.chartOptions.label && opts.chartOptions.label.show_percentage) {
                         let aggrPercentages = pivotData.getAggregator(rows, [])
                         let total = aggrPercentages.value()
                         percentages = total ? ' (' + Math.round(value/total * 100) + '%)' : '';
@@ -917,6 +919,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         const n = col_n_keys.length;
         const xSum = (1 + n) / 2 * n;
         const trendSerieses = [];
+        const othersName = lodash.get(opts, "total_value_options.filter_options.filteredOutFieldName") || 'Others';
 
         lodash.forEach(row_n_keys, function (row_n_value) {
             var ob = {};
@@ -925,7 +928,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             let squareXSum = 0;
             ob.data = [];
             if (row_n_value && row_n_value.length > 0) {
-                let othersName = lodash.get(opts, "total_value_options.filter_options.filteredOutFieldName") || 'Others';
                 ob.name = row_n_value.join(highchartsRenderer.delimer).replace('DR_Others', othersName);
             }
 
@@ -933,6 +935,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 var agg = pivotData.getAggregator(row_n_value, col_n_value);
                 var val = agg.value();
 
+                if (col_n_value[0] === 'DR_Others') {
+                    col_n_value[0] = othersName;
+                }
+
                 if (isUniqueVals && agg.uniq)
                     val = agg.uniq.join('<br>');
 
@@ -1105,8 +1111,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 }
                 tmoobj.name = lodash.unescape(key);
 
-                if (key && key.length > 0) {
-                    tmoobj.name = lodash.unescape(col_n_value.join(highchartsRenderer.delimer).replace('DR_Others', othersName));
+                if (tmoobj.name) {
+                    tmoobj.name = tmoobj.name.replace('DR_Others', othersName);
                 }
 
                 if (lodash.isEmpty(String(tmoobj.name))) {