fleetmap-reports 1.0.818 → 1.0.820

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.818",
+  "version": "1.0.820",
   "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/automaticReports.js

@@ -8,7 +8,6 @@ function sliceArray (longArray, size) {
   const arrayToSlice = longArray.slice()
 
   const arrayOfArrays = []
-  console.log('slice', arrayToSlice.length, 'in chunks of', size)
   for (let i = 0; i < arrayToSlice.length; i += size) {
     arrayOfArrays.push(arrayToSlice.slice(i, i + size))
   }

package/src/speeding-report.js

@@ -210,13 +210,14 @@ async function processDrivers (from, to, events, routes, userData) {
 
   return driversResult
 }
+const MAX_DEVICE_SPEED = 160
 
 function processDevices (from, to, devices, events, routes, userData) {
   const devicesResult = []
   findEventsPosition(from, to, devices, events, routes, userData)
 
   for (const d of devices) {
-    const deviceEvents = events.filter(e => e.deviceId === d.id && e.position)
+    const deviceEvents = events.filter(e => e.deviceId === d.id && e.position).filter(e => e.position.speed < MAX_DEVICE_SPEED)
     if (deviceEvents.length > 0) {
       deviceEvents.sort((a, b) => a.positionId - b.positionId)
       devicesResult.push({

package/src/tests/speeding.test.js

@@ -37,10 +37,12 @@ describe('speeding tests', function () {
     userData.customSpeed = false
     userData.useVehicleSpeedLimit = true
     const data = await report.speedingReport(
-      new Date(Date.UTC(2022, 9, 22, 0, 0, 0, 0)),
-      new Date(Date.UTC(2022, 9, 23, 23, 59, 59, 0)),
+      new Date(Date.UTC(2023, 7, 22, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 7, 23, 23, 59, 59, 0)),
       userData)
-    assert.equal(data[0].devices.length, 0)
+    console.log(data[0].devices[0].alerts.length)
+    console.log(data[0].devices[0].alerts)
+    assert.equal(data[0].devices.length, 2)
   }, 900000)
 
   // eslint-disable-next-line no-undef

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
     })
   }