fleetmap-reports 1.0.648 → 1.0.650

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.648",
+  "version": "1.0.650",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -34,8 +34,8 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
-    "jest": "^29.4.3",
-    "mocha": "^10.2.0",
+    "jest": "^27.5.0",
+    "mocha": "^9.0.3",
     "webpack": "^5.24.3",
     "webpack-cli": "^4.5.0"
   }

package/src/tests/index.test.js

@@ -363,7 +363,7 @@ describe('Test_Reports', function () {
     assert.equal(device.geofences[0].outTime.fixTime, '2022-04-26T07:47:35.000+0000')
     assert.equal(device.geofences[0].totalTime, '28777')
     assert.equal(device.geofences[0].geofenceName, 'Casa João')
-  }, 30000)
+  }, 990000)
   // eslint-disable-next-line no-undef
   it('Zone Report With Stops', async () => {
     const report = await getReports()

package/src/tests/trips.test.js

@@ -6,10 +6,10 @@ describe('trips', function () {
     userData.roadSpeedLimits = false
     userData.customSpeed = false
     userData.useVehicleSpeedLimit = true
-    const data = await report.tripReport(
+    await report.tripReport(
       new Date(Date.UTC(2022, 9, 22, 0, 0, 0, 0)),
       new Date(Date.UTC(2022, 9, 22, 23, 59, 59, 0)),
       userData)
-    await report.tripReportToPDF(userData, data)
+    // await report.tripReportToPDF(userData, data)
   }, 40000)
 })

package/src/util/utils.js

@@ -235,10 +235,14 @@ exports.getLogo = (user) => {
 exports.convertToFeature = convertToFeature
 exports.convertPositionToFeature = convertPositionToFeature
 exports.calculateDistance = (positions) => {
-  return positions.map(p => [p.longitude, p.latitude])
+  return positions
+    .sort((a, b) => new Date(a.fixTime).getTime() - new Date(b.fixTime).getTime())
+    .map(p => [p.longitude, p.latitude])
     .reduce((previousValue, currentValue, currentIndex, array) => {
       return currentIndex < array.length - 1
         ? previousValue + distance.default(currentValue, array[currentIndex + 1])
         : previousValue
     }, 0) || 0
 }
+
+exports.sortPositions = (a, b) => new Date(a).getTime() - new Date(b).getTime()

package/src/zone-report.js

@@ -2,7 +2,8 @@ const moment = require('moment')
 const automaticReports = require('./automaticReports')
 const {
   convertMS, convertToLocaleString, getTranslations, convertToFeature, convertPositionToFeature,
-  calculateDistance
+  calculateDistance,
+  sortPositions
 } = require('./util/utils')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
@@ -88,6 +89,13 @@ async function createZoneReport (from, to, userData, traccar) {
   return reportData
 }
 
+function getNextIn(outDate, alerts, geofenceId, deviceRoute) {
+  return alerts
+    .filter(a => a.type === 'geofenceEnter' && a.geofenceId === geofenceId)
+    .find(a => new Date(a.position.fixTime).getTime() > outDate) ||
+    new Date(deviceRoute.slice(-1)[0].fixTime).getTime()
+}
+
 async function processDevices (from, to, devices, userData, data) {
   const devicesResult = []
 
@@ -109,16 +117,25 @@ async function processDevices (from, to, devices, userData, data) {
             const geofence = userData.geofences.find(g => g.id === a.geofenceId)
             if (zoneInData[a.geofenceId]) {
               const totalInTime = moment(a.position.fixTime).diff(moment(zoneInData[a.geofenceId].position.fixTime), 'seconds')
-              const route = deviceRoute.filter(p => new Date(p.fixTime).getTime() >= new Date(zoneInData[a.geofenceId].position.fixTime).getTime() &&
-                  new Date(p.fixTime).getTime() <= new Date(a.position.fixTime).getTime())
+              const inDate = new Date(zoneInData[a.geofenceId].position.fixTime).getTime()
+              const outDate = new Date(a.position.fixTime).getTime()
+              const routeIn = deviceRoute.filter(p =>
+                new Date(p.fixTime).getTime() >= inDate &&
+                new Date(p.fixTime).getTime() < outDate
+              )
+              const routeAfterOut = deviceRoute.filter(p =>
+                new Date(p.fixTime).getTime() >= outDate &&
+                new Date(p.fixTime).getTime() < getNextIn(outDate, alerts, a.geofenceId, deviceRoute)
+              )
               if (geofence) {
                 zoneInOutData.push({
                   inTime: zoneInData[a.geofenceId].position,
                   outTime: a.position,
                   totalTime: totalInTime,
-                  distance: calculateDistance(route),
+                  distanceIn: calculateDistance(routeIn),
+                  distanceOut: calculateDistance(routeAfterOut),
                   geofenceName: geofence.name,
-                  stopped: route.filter(p => !p.attributes.ignition).length > 0,
+                  stopped: routeIn.filter(p => !p.attributes.ignition).length > 0,
                   driverName: zoneInData[a.geofenceId].position.driverName
                 })
               }
@@ -170,7 +187,7 @@ function getInAndOutEvents (devices, route, userData) {
   devices.forEach(d => {
     const deviceRoute = route.filter(p => p.deviceId === d.id)
 
-    const routePoints = deviceRoute.map(p => convertPositionToFeature(p))
+    const routePoints = deviceRoute.sort(sortPositions).map(p => convertPositionToFeature(p))
     const geofencesFeatures = userData.geofences.map(g => convertToFeature(g))
 
     const entryMap = []