@datarailsshared/dr_renderer 1.2.135-tigers → 1.2.137-tigers

package/package.json

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

package/src/highcharts_renderer.js

@@ -7235,15 +7235,24 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 if (fieldFilter.datetypevalues.datetype === "frame") {
                     displayname += ` (${fieldFilter.datetypevalues.val.timeframe})`;
                 } else if (fieldFilter.datetypevalues.datetype === "range") {
+                    const dates = {
+                        from: { timestamp: fieldFilter.datetypevalues.val.fromdate, displayedValue: '' },
+                        to: { timestamp: fieldFilter.datetypevalues.val.todate, displayedValue: 'Today' }
+                    };
 
-                    // range timestamps currently are set presupposing that user selects UTC dates, not his/her locale datetime
+                    // range timestamps currently are set presupposing that user selects UTC dates,
                     // that is why for consistency we also should show in filters values which user selected
                     // and not local dates, that can differ
-                    const fromDateTzOffsetInSeconds = new Date(fieldFilter.datetypevalues.val.fromdate * 1000).getTimezoneOffset() * 60;
-                    const toDateTzOffsetInSeconds = new Date(fieldFilter.datetypevalues.val.todate * 1000).getTimezoneOffset() * 60;
-                    const fromDateForDisplay = new Date((fieldFilter.datetypevalues.val.fromdate + fromDateTzOffsetInSeconds) * 1000);
-                    const toDateForDisplay= new Date((fieldFilter.datetypevalues.val.todate + toDateTzOffsetInSeconds) * 1000);
-                    displayname += ` (${fromDateForDisplay.toLocaleDateString("short")}-${'Today' || toDateForDisplay.toLocaleDateString("short")})`;
+                    _.forEach(Object.keys(dates), key => {
+                        const dateConfiguration = dates[key];
+                        const timestamp = dateConfiguration.timestamp;
+                        if (timestamp) {               
+                            const dateTzOffsetInSeconds = new Date(timestamp * 1000).getTimezoneOffset() * 60;
+                            dateConfiguration.displayedValue = new Date((timestamp + dateTzOffsetInSeconds) * 1000)
+                                .toLocaleDateString();
+                        }
+                    });
+                    displayname += ` (${ dates.from.displayedValue }-${ dates.to.displayedValue })`;
                 } else {
                     displayname += ' (All)';
                 }