fleetmap-reports 1.0.818 → 1.0.819

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.818",
+  "version": "1.0.819",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -18,7 +18,7 @@
     "axios-cookiejar-support": "^1.0.1",
     "docx": "^7.3.0",
     "file-saver": "^2.0.5",
-    "fleetmap-partners": "^1.0.76",
+    "fleetmap-partners": "^1.0.126",
     "json-as-xlsx": "^1.2.1",
     "jspdf": "^2.5.1",
     "jspdf-autotable": "3.6.0",

package/src/trip-report.js

@@ -491,15 +491,15 @@ function exportTripReportToExcel (userData, reportData) {
 }
 
 function getTripDate (user, trip) {
-  return convertToLocaleDateString(trip.startTime, user.attributes.lang, user.attributes.timezone)
+  return convertToLocaleDateString(trip.startTime, user.attributes.lang, user.attributes.timezone, user)
 }
 
 function getTripStart (user, trip) {
-  return convertToLocaleTimeString(trip.startTime, user.attributes.lang, user.attributes.timezone)
+  return convertToLocaleTimeString(trip.startTime, user.attributes.lang, user.attributes.timezone, user)
 }
 
 function getTripEnd (user, trip) {
-  return convertToLocaleTimeString(trip.endTime, user.attributes.lang, user.attributes.timezone)
+  return convertToLocaleTimeString(trip.endTime, user.attributes.lang, user.attributes.timezone, user)
 }
 
 function getSumTotalKms (user, data) {

package/src/util/utils.js

@@ -163,23 +163,23 @@ function convertToLocaleString (value, lang, timezone) {
   }
 }
 
-function convertToLocaleDateString (value, lang, timezone) {
+function convertToLocaleDateString (value, lang, timezone, user) {
   if (isClientSide()) {
     return new Date(value).toLocaleDateString()
   } else {
-    return new Date(value).toLocaleDateString(lang, {
-      timeZone: timezone,
+    return new Date(value).toLocaleDateString(lang || getUserPartner(user).lang, {
+      timeZone: timezone || getUserPartner(user).timezone,
       hour12: false
     })
   }
 }
 
-function convertToLocaleTimeString (value, lang, timezone) {
+function convertToLocaleTimeString (value, lang, timezone, user) {
   if (isClientSide()) {
     return new Date(value).toLocaleTimeString()
   } else {
-    return new Date(value).toLocaleTimeString(lang, {
-      timeZone: timezone,
+    return new Date(value).toLocaleTimeString(lang || getUserPartner(user).lang, {
+      timeZone: timezone || getUserPartner(user).timezone,
       hour12: false
     })
   }