fleetmap-reports 1.0.974 → 1.0.976

package/package.json

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

package/src/speeding-report.js

@@ -533,7 +533,7 @@ async function exportSpeedingReportToPDF (userData, reportData) {
         doc.text(name, 20, space + 20)
         doc.setFontSize(11)
         doc.text(group ? translations.report.group + ': ' + group.name : '', 150, space + 20)
-        doc.text(convertToLocaleString(d.from, lang, timezone) + ' - ' + convertToLocaleString(d.to, lang, timezone), 20, space + 25)
+        doc.text(convertToLocaleString(d.from, lang, timezone, userData.user) + ' - ' + convertToLocaleString(d.to, lang, timezone, userData.user), 20, space + 25)
         if (d.alerts[0] && !userData.byDriver) {
           doc.text(translations.report.speedLimit + ': ' + ((userData.useVehicleSpeedLimit || !userData.customSpeed) ? Math.round(d.alerts[0].attributes.speedLimit * 1.85200) + ' Km/h' : (userData.roadSpeedLimits ? translations.report.roadSpeedLimit : userData.customSpeed + ' Km/h')), 20, space + 30)
         }

package/src/trip-report.js

@@ -180,12 +180,16 @@ async function processDevices (from, to, devices, data, userData, traccar) {
 
       if (userData.includeTemperature) {
         const tripRoute = deviceRoute.filter(p => trip.startTime <= p.fixTime && trip.endTime >= p.fixTime && p.attributes.temp1 !== 175)
-        trip.maxTemp = tripRoute.reduce((a, b) => {
-          return a && a > b.attributes.temp1 ? a : b.attributes.temp1
-        })
-        trip.minTemp = tripRoute.reduce((a, b) => {
-          return a && a < b.attributes.temp1 ? a : b.attributes.temp1
-        })
+        trip.maxTemp = tripRoute.length > 0
+          ? tripRoute.reduce((a, b) => {
+            return a && a > b.attributes.temp1 ? a : b.attributes.temp1
+          })
+          : 0
+        trip.minTemp = tripRoute.length > 0
+          ? tripRoute.reduce((a, b) => {
+            return a && a < b.attributes.temp1 ? a : b.attributes.temp1
+          })
+          : 0
         trip.avgTemp = tripRoute.length > 0
           ? (tripRoute.reduce((a, b) => {
               return a + b.attributes.temp1

package/src/util/utils.js

@@ -157,12 +157,14 @@ function isClientSide () { return (typeof window !== 'undefined') }
 function convertToLocaleString (value, lang, timezone, user) {
   if (isClientSide()) {
     return new Date(value).toLocaleString()
-  } else {
+  }
+  if ((lang && timezone) || user) {
     return new Date(value).toLocaleString(lang || getUserPartner(user).lang, {
       timeZone: timezone || getUserPartner(user).timezone,
       hour12: false
     })
   }
+  return new Date(value).toISOString()
 }
 
 function convertToLocaleDateString (value, lang, timezone, user) {