@datarailsshared/dr_renderer 1.2.75 → 1.2.76

package/package.json

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

package/src/dataformatter.js

@@ -497,11 +497,11 @@ var DataFormatterImpl = function () {
             var minutes = n.getMinutes();
             var seconds = n.getSeconds();
 
-            var adjustMinutesValue = function(minutes) {
-                if (minutes < 10) {
-                    return '0' + minutes;
+            var padStartTime = function(time) {
+                if (time < 10) {
+                    return '0' + time;
                 }
-                return minutes;
+                return time;
             }
 
             // Build res
@@ -513,11 +513,11 @@ var DataFormatterImpl = function () {
                 }
 
                 if (fmin) {
-                    return fmin + _this3.applyNumberPattern(adjustMinutesValue(minutes), '00');
+                    return fmin + _this3.applyNumberPattern(padStartTime(minutes), '00');
                 }
 
                 if (fmin2) {
-                    return _this3.applyNumberPattern(adjustMinutesValue(minutes), '00') + fmin2;
+                    return _this3.applyNumberPattern(padStartTime(minutes), '00') + fmin2;
                 }
 
                 if (mmin) {
@@ -534,7 +534,7 @@ var DataFormatterImpl = function () {
             return res.replace(/(ss)|(s)|(hh)|(h)|(dddd)|(ddd)|(dd)|(d)|(mmmmm)|(mmmm)|(mmm)|(mm)|(m)|(yyyy)|(yy)|(\[\])/gi, function (a, ss, s, hh, h, dddd, ddd, dd, d, mmmmm, mmmm, mmm, mm, m, yyyy, yy, ampm) {
 
                 if (ss) {
-                    return _this3.applyNumberPattern(seconds, '00');
+                    return _this3.applyNumberPattern(padStartTime(seconds), '00');
                 }
 
                 if (s) {
@@ -542,7 +542,7 @@ var DataFormatterImpl = function () {
                 }
 
                 if (hh) {
-                    return _this3.applyNumberPattern(foundAMPM ? hours % 12 : hours, '00');
+                    return _this3.applyNumberPattern(padStartTime(foundAMPM ? hours % 12 : hours), '00');
                 }
 
                 if (h) {

package/src/highcharts_renderer.js

@@ -4307,6 +4307,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 format = format.replace('dd', 'DD');
                 format = format.replace('yyyy', 'YYYY');
                 format = format.replace('yy', 'YY');
+                format = lodash.replace(format, /h/g, 'H');
                 return moment_lib(tryParse).utcOffset(0).format(format) + "";
             } else {
                 return 'Wrong date format';