@datarailsshared/dr_renderer 1.2.167 → 1.2.168-tigers

package/package.json

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

package/src/dr_pivottable.js

@@ -2604,7 +2604,7 @@ let initDRPivotTable = function($, window, document) {
                 headerRow.push(colAttrs[i]);
                 // Add row keys
                 _.forEach(colKeys, function (keys) {
-                    headerRow.push(utils.getHeaderValue(keys[i], colFields[i].type));
+                    headerRow.push(utils.getHeaderValue(keys[i], colFields[i].type, opts.dateValuesDictionary));
                     // Calc formulas in first time
                     if (i === 0) {
                         colFormulas.push(utils.createKeysFormula(colFields, keys, colFormulas.length + 1, true));
@@ -2622,7 +2622,7 @@ let initDRPivotTable = function($, window, document) {
                 // Formatting row keys
                 let keysFormatted = [];
                 for (let k = 0; k < rowKeys[i].length; k++) {
-                    keysFormatted.push(utils.getHeaderValue(rowKeys[i][k], rowFields[k].type))
+                    keysFormatted.push(utils.getHeaderValue(rowKeys[i][k], rowFields[k].type, opts.dateValuesDictionary))
                 }
                 // Add row keys
                 matrix.push(keysFormatted.concat(null));
@@ -2646,7 +2646,7 @@ let initDRPivotTable = function($, window, document) {
                 let headerRow = [colAttrs[i]];
                 // Add keys
                 _.forEach(colKeys, function (keys) {
-                    headerRow.push(utils.getHeaderValue(keys[i], colFields[i].type));
+                    headerRow.push(utils.getHeaderValue(keys[i], colFields[i].type, opts.dateValuesDictionary));
                     // Calc formulas in first time
                     if (i === 0) {
                         colFormulas.push(utils.createKeysFormula(colFields, keys, colFormulas.length + 1, true));
@@ -2676,7 +2676,7 @@ let initDRPivotTable = function($, window, document) {
                 // Formatting row keys
                 let keysFormatted = [];
                 for (let k = 0; k < rowKeys[i].length; k++) {
-                    keysFormatted.push(utils.getHeaderValue(rowKeys[i][k], rowFields[k].type))
+                    keysFormatted.push(utils.getHeaderValue(rowKeys[i][k], rowFields[k].type, opts.dateValuesDictionary))
                 }
                 // Add row keys
                 matrix.push(keysFormatted);

package/src/highcharts_renderer.js

@@ -4227,7 +4227,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             sorters: pivotOptions ? pivotOptions.sorters : null,
             cols: lodash.map(pivotOptions.axisArray, 'name'),
             rows: lodash.map(pivotOptions.legendArray, 'name'),
-            rendererOptions: widget.options
+            rendererOptions: widget.options,
+            dateValuesDictionary: pivotOptions ? pivotOptions.dateValuesDictionary : null,
         };
 
         if (!subopts.rendererOptions) {
@@ -7843,10 +7844,17 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 for (var i in datesFields) {
                     if (element.hasOwnProperty(datesFields[i].name)) {
                         datesFields[i].values.push(element[datesFields[i].name]);
-                        element[datesFields[i].name] = highchartsRenderer.returnRawDataValue(
+                        const dateStringValue = highchartsRenderer.returnRawDataValue(
                             datesFields[i].type, element[datesFields[i].name],
                             defaultDateFormat ? defaultDateFormat : datesFields[i].format,
-                            datesFields[i].name, datesFields[i].val_not_convert) + "";
+                            datesFields[i].name, datesFields[i].val_not_convert);
+                        if (widget.pivot) {
+                            if (!widget.pivot.dateValuesDictionary) {
+                                widget.pivot.dateValuesDictionary = {}
+                            }
+                            widget.pivot.dateValuesDictionary[dateStringValue] = element[datesFields[i].name];
+                        }
+                        element[datesFields[i].name] = dateStringValue;
                     }
                 }
             });

package/src/pivottable.js

@@ -690,6 +690,7 @@ let initPivotTable = function($, window, document) {
             this.colTotals = {};
             this.allTotal = this.aggregator(this, [], []);
             this.sorted = false;
+            this.dateValuesDictionary = opts.dateValuesDictionary;
             PivotData.forEachRecord(this.input, this.derivedAttributes, (function(_this) {
                 return function(record) {
                     if (_this.filter(record)) {