@datarailsshared/dr_renderer 1.2.394 → 1.2.396

package/package.json

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

package/src/highcharts_renderer.js

@@ -728,7 +728,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         destroyWhenHiding: true,
         formatter: function () {
             const rowKey = pivotData.rowAttrs.length ? lodash.get(this.point, 'series.name') || "" : "";
-            const colKey = lodash.get(this.point, 'name') || this.x.name[0] || "";
+            const colKey = lodash.get(this.point, 'initialName') || lodash.get(this.point, 'name') || this.x.name[0] || "";
+
             const insight = pivotData.getInsight(colKey, rowKey) || {};
             setTimeout(() => {
                 var aggr = highchartsRenderer.defaultFormatterToTooltip(pivotData, opts);
@@ -1520,10 +1521,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 let totalKey = columnKey;
                 if (lodash.isArray(columnKey)) {
                     key = columnKey[0];
-                    totalKey = totalKey.join(' , ');
+                    totalKey = totalKey.join(highchartsRenderer.delimer);
                 }
+
+                const initialKey = lodash.unescape(key);
+                const formattedKey = highchartsRenderer.getFormattedColKey(initialKey, pivotData);
                 const value = pivotData.colTotals[totalKey] ? pivotData.colTotals[totalKey].value() : 0;
-                totalSeries.data.push({name: lodash.unescape(key), y: value});
+
+                totalSeries.data.push({name: lodash.unescape(formattedKey), initialName: initialKey, y: value});
             });
 
             chart_series.push(totalSeries);
@@ -4797,6 +4802,13 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             var temp_cols = opts.cols;
             opts.cols = opts.rows;
             opts.rows = temp_cols;
+
+            if (highchartsRenderer.sortHasBeenDoneOnBE(lodash.get(widget.pivot, 'keysObject'))) {
+                opts.keysObject = lodash.cloneDeep(widget.pivot.keysObject);
+                const tempColKeys = opts.keysObject.col_keys;
+                opts.keysObject.col_keys = opts.keysObject.row_keys;
+                opts.keysObject.row_keys = tempColKeys;
+            }
         }
 
         optsFiltered = $.extend(defaults, opts);
@@ -4960,6 +4972,13 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             var temp_cols = opts.cols;
             opts.cols = opts.rows;
             opts.rows = temp_cols;
+
+            if (highchartsRenderer.sortHasBeenDoneOnBE(lodash.get(widget.pivot, 'keysObject'))) {
+                opts.keysObject = lodash.cloneDeep(widget.pivot.keysObject);
+                const tempColKeys = opts.keysObject.col_keys;
+                opts.keysObject.col_keys = opts.keysObject.row_keys;
+                opts.keysObject.row_keys = tempColKeys;
+            }
         }
 
         optsFiltered = $.extend(defaults, opts);
@@ -8913,6 +8932,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                                 value,
                                 highchartsRenderer.getDateFieldFormat(widget, widget.cols[0])
                             );
+                        } else if (!isNaN(value)) {
+                            value = +value;
                         }
                         break;
                     case 'Integer':
@@ -9751,11 +9772,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     const isDate = formatInfo.type === 'Date';
                     const isDateFormatting = isDate && highchartsRenderer.isFormattingDatesAsOtherAxisTypes();
                     const isNumberFormatting = !isDate && formatInfo.format && highchartsRenderer.isFormattingNumberAxis(pivotData);
-                    const isApplyingFormat = !isNaN(valueToFloat) && (isNumberFormatting || isDateFormatting);
-                    if (isApplyingFormat) {
+
+                    if (isNumberFormatting || isDateFormatting) {
                         values[key] = highchartsRenderer.returnRawDataValue(
                             formatInfo.type,
-                            valueToFloat,
+                            !isNaN(valueToFloat) ? valueToFloat : value,
                             formatInfo.format,
                             formatInfo.name,
                             formatInfo.val_not_convert,

package/src/pivottable.js

@@ -695,13 +695,6 @@ let initPivotTable = function($, window, document) {
                 this.rowKeys = opts.keysObject.row_keys;
                 this.colKeys = opts.keysObject.col_keys;
                 this.rowKeysByCols = opts.keysObject.row_keys_by_cols;
-
-                const isTransposed = _.get(opts, 'rendererOptions.chartOptions.table_options.transpose_table', false);
-                if (isTransposed) {
-                    const colKeys = this.colKeys;
-                    this.colKeys = this.rowKeys;
-                    this.rowKeys = colKeys;
-                }
             } else {
                 this.rowKeys = [];
                 this.colKeys = [];