fleetmap-reports 1.0.843 → 1.0.845

package/package.json

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

package/src/partnerReports/gpsjump-report.js

@@ -1,6 +1,7 @@
 const automaticReports = require('../automaticReports')
 const traccarHelper = require('../util/traccar')
 const distance = require('@turf/distance')
+const { convertToLocaleString } = require('../util/utils')
 
 const minDistance = 5000
 
@@ -15,7 +16,7 @@ async function createGPSJumpReport (from, to, userData, traccar) {
     const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, false, false, false, deviceCount, devices.length)
 
     slice.forEach(d => {
-      const deviceData = getDeviceData(allInOne, d)
+      const deviceData = getDeviceData(allInOne, d, userData.user)
       reportData = reportData.concat(deviceData)
     })
 
@@ -25,19 +26,19 @@ async function createGPSJumpReport (from, to, userData, traccar) {
   return reportData
 }
 
-function getDeviceData (allInOne, d) {
+function getDeviceData (allInOne, d, user) {
   const deviceRoute = allInOne.route.filter(t => t.deviceId === d.id)
 
   return deviceRoute.map((pA, index) => {
     if (index < deviceRoute.length - 1) {
       const pB = deviceRoute[index + 1]
-      const distanceValue = distance.default([pA.longitude, pA.latitude], [pB.longitude, pB.latitude], 'meters')
+      const distanceValue = distance.default([pA.longitude, pA.latitude], [pB.longitude, pB.latitude], { units: 'meters' })
 
       return {
         device: d.name,
-        dateA: new Date(pA.fixTime),
+        dateA: convertToLocaleString(pA.fixTime, user.attributes.lang, user.attributes.timezone, user),
         addressA: pA.address,
-        dateB: new Date(pB.fixTime),
+        dateB: convertToLocaleString(pB.fixTime, user.attributes.lang, user.attributes.timezone, user),
         addressB: pB.address,
         distance: distanceValue
       }

package/src/tests/index.test.js

@@ -24,10 +24,11 @@ describe('Test_Reports', function () {
     console.log(utils.convertToLocaleString(new Date(), 'es-CL', 'Europe/Madrid'))
   })
   it('gps jump device', async () => {
-    const report = await getReports()
+    const report = await getReports('HASSANE', 'movitec.1637')
     const userData = await report.getUserData()
-    const data = await createGPSJumpReport(new Date(2022, 0, 3, 0, 0, 0, 0),
-      new Date(2022, 0, 3, 23, 59, 59, 0),
+    userData.devices = userData.devices.filter(d => d.id === 148725)
+    const data = await createGPSJumpReport(new Date(2023, 8, 22, 0, 0, 0, 0),
+      new Date(2023, 8, 24, 23, 59, 59, 0),
       userData, report.traccar)
     console.log(data)
   }, 40000)

package/src/util/utils.js

@@ -152,12 +152,12 @@ async function getImgFromUrl (hostname) {
 
 function isClientSide () { return (typeof window !== 'undefined') }
 
-function convertToLocaleString (value, lang, timezone) {
+function convertToLocaleString (value, lang, timezone, user) {
   if (isClientSide()) {
     return new Date(value).toLocaleString()
   } else {
-    return new Date(value).toLocaleString(lang, {
-      timeZone: timezone,
+    return new Date(value).toLocaleString(lang || getUserPartner(user).lang, {
+      timeZone: timezone || getUserPartner(user).timezone,
       hour12: false
     })
   }