fleetmap-reports 2.0.347 → 2.0.348

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "2.0.347",
+  "version": "2.0.348",
   "description": "",
   "main": "src/index.js",
   "scripts": {

package/src/util/utils.js

@@ -113,11 +113,13 @@ function convertToFeature (geofence) {
 function getDates (startDate, endDate, timezone) {
   const dates = []
   let currentDate = new Date(startDate.getFullYear(), startDate.getMonth(), startDate.getDate(), 12, 0, 0, 0)
-  const _endDate = new Date(endDate.getFullYear(), endDate.getMonth(), endDate.getDate(), 23, 59, 59, 0)
+  let _endDate = new Date(endDate.getFullYear(), endDate.getMonth(), endDate.getDate(), 23, 59, 59, 0)
 
   if (!isClientSide() && timezone) {
     const startDateUserTimezone = convertFromUTC(startDate, timezone)
     currentDate = new Date(startDateUserTimezone.getFullYear(), startDateUserTimezone.getMonth(), startDateUserTimezone.getDate(), 12, 0, 0, 0)
+    const endDateUserTimezone = convertFromUTC(endDate, timezone)
+    _endDate = new Date(endDateUserTimezone.getFullYear(), endDateUserTimezone.getMonth(), endDateUserTimezone.getDate(), 23, 59, 59, 0)
   }
   const addDays = function (days) {
     const date = new Date(this.valueOf())
@@ -193,12 +195,12 @@ function convertToLocaleTimeString (value, lang, timezone, user) {
   }
 }
 
-function getTimezoneOffset (timezone) {
+function getTimezoneOffset (timezone, date = new Date()) {
   if (isClientSide()) {
-    return new Date().getTimezoneOffset()
+    return date.getTimezoneOffset()
   } else {
-    const utcDate = new Date(new Date().toLocaleString('en-US', { timeZone: 'UTC' }))
-    const tzDate = new Date(new Date().toLocaleString('en-US', { timeZone: timezone }))
+    const utcDate = new Date(date.toLocaleString('en-US', { timeZone: 'UTC' }))
+    const tzDate = new Date(date.toLocaleString('en-US', { timeZone: timezone }))
     return (utcDate.getTime() - tzDate.getTime()) / 6e4
   }
 }
@@ -208,16 +210,15 @@ function convertFromUTC (value, timezone) {
     return new Date(value)
   }
 
-  const offset = getTimezoneOffset(timezone)
   const valueDate = new Date(value)
+  const offset = getTimezoneOffset(timezone, valueDate)
   valueDate.setTime(valueDate.getTime() - (offset * 60 * 1000))
   return valueDate
 }
 
 exports.convertFromLocal = (value, timezone) => {
-  const offset = getTimezoneOffset(timezone)
-
   const valueDate = new Date(value)
+  const offset = getTimezoneOffset(timezone, valueDate)
   valueDate.setTime(valueDate.getTime() + (offset * 60 * 1000))
   return valueDate
 }