@datarailsshared/dr_renderer 1.2.71 → 1.2.75

package/package.json

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

package/src/dataformatter.js

@@ -497,6 +497,13 @@ var DataFormatterImpl = function () {
             var minutes = n.getMinutes();
             var seconds = n.getSeconds();
 
+            var adjustMinutesValue = function(minutes) {
+                if (minutes < 10) {
+                    return '0' + minutes;
+                }
+                return minutes;
+            }
+
             // Build res
             var res = pattern.replace(/((?:am\/pm)|(?:a\/p))|(?:(h[^ydsap]*?)mm)|(?:mm([^ydh]*?s))|(?:(h[^ydsap]*?)m)|(?:m([^ydh]*?s))/gi, function (a, ampm, fmin, fmin2, mmin, mmin2) {
 
@@ -506,11 +513,11 @@ var DataFormatterImpl = function () {
                 }
 
                 if (fmin) {
-                    return fmin + _this3.applyNumberPattern(minutes, '00');
+                    return fmin + _this3.applyNumberPattern(adjustMinutesValue(minutes), '00');
                 }
 
                 if (fmin2) {
-                    return _this3.applyNumberPattern(minutes, '00') + fmin2;
+                    return _this3.applyNumberPattern(adjustMinutesValue(minutes), '00') + fmin2;
                 }
 
                 if (mmin) {

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) + '%)' : '';

package/src/published_items_renderer.js

@@ -88,9 +88,7 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
     }
   }
 
-  publishedItemsRenderer.changedAutoResize = function (new_auto_resize, options, window, document) {
-    if (options.autoResize !== new_auto_resize) {
-      options.autoResize = new_auto_resize;
+  publishedItemsRenderer.changedAutoResize = function (options, window, document) {
       if (!options.autoResize) {
         publishedItemsRenderer.resetTableZoom(document);
       } else {
@@ -100,7 +98,6 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
           }, 100);
         }
       }
-    }
   }
 
   publishedItemsRenderer.changedInputValue = function (firstTime, scope, options) {