fleetmap-reports 1.0.821 → 1.0.823

package/package.json

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

package/src/partnerReports/afriquia.js

@@ -6,7 +6,6 @@ const { convertToFeature, convertPositionToFeature } = require('../util/utils')
 function calculateLastStopTime (stopTime, to, time) {
   return stopTime + (to.getTime() - new Date(time).getTime())
 }
-
 async function createActivityReport (from, to, userData, traccarInstance) {
   const unauthorizedGeofences = []
   const authorizedGeofences = []

package/src/tests/activity.test.js

@@ -7,11 +7,14 @@ describe('activity report', function () {
   it('Activity by device', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
-    userData.groupByDay = true
-    const data = await report.activityReport(new Date(2023, 0, 1, 0, 0, 0, 0),
-      new Date(2023, 0, 31, 23, 59, 59, 0),
+
+    const data = await report.activityReport(new Date(2022, 0, 1, 0, 0, 0, 0),
+      new Date(2022, 0, 31, 23, 59, 59, 0),
       userData)
     assert.equal(data.length, 1)
+    const device = data[0].devices.find(d => d.device.id === 22326)
+    assert.equal(device.summary[0].startOdometer, 0)
+    assert.equal(device.summary[0].distance, 0)
     assert.equal(device.summary[0].startTime, 0)
     assert.equal(device.summary[0].endTime, 0)
   }, 80000)

package/src/tests/zones.test.js

@@ -32,6 +32,18 @@ describe('zones', function () {
     console.log('result', result)
   }, 4000000)
 
+  it('works with afriquia', async () => {
+    const report = await getReports(process.env.USER_AFRIQUIA, process.env.PASS_AFRIQUIA)
+    const userData = await report.getUserData()
+    console.log(userData.devices.length)
+    console.log(userData.geofences)
+    const result = await report.zoneReport(
+        new Date(Date.UTC(2023, 5, 11, 0, 0, 0, 0)),
+        new Date(Date.UTC(2023, 5, 11, 23, 59, 59, 0)),
+        userData)
+    console.log('result', result)
+  }, 4000000)
+
   // eslint-disable-next-line no-undef
   it('works with casais', async () => {
     const report = await getReports(process.env.USER_CASAIS, process.env.PASS_CASAIS)

package/src/zone-report.js

@@ -186,12 +186,37 @@ async function processDevices (from, to, devices, userData, data) {
       }
     } else {
       if (zoneInOutData.length > 0) {
-        devicesResult.push({
-          device: d,
-          from,
-          to,
-          geofences: userData.onlyWithKmsOut ? zoneInOutData.filter(a => a.distanceOut) : zoneInOutData
-        })
+        if (userData.tripsBetweenZones) {
+          const tripsBetweenZones = []
+          zoneInOutData.forEach((a, index) => {
+            if (index + 1 < zoneInOutData.length && a.outTime && zoneInOutData[index + 1].inTime) {
+              tripsBetweenZones.push({
+                outTime: a.outTime,
+                outGeofenceName: a.geofenceName,
+                inTime: zoneInOutData[index + 1].inTime,
+                inGeofenceName: zoneInOutData[index + 1].geofenceName,
+                distanceOut: a.distanceOutAny,
+                totalOutTime: new Date(zoneInOutData[index + 1].inTime.fixTime).getTime() - new Date(a.outTime.fixTime).getTime()
+              })
+            }
+          })
+          if (tripsBetweenZones.length > 0) {
+            devicesResult.push({
+              device: d,
+              from,
+              to,
+              tripsBetweenZones: true,
+              geofences: userData.onlyWithKmsOut ? tripsBetweenZones.filter(a => a.distanceOut) : tripsBetweenZones
+            })
+          }
+        } else {
+          devicesResult.push({
+            device: d,
+            from,
+            to,
+            geofences: userData.onlyWithKmsOut ? zoneInOutData.filter(a => a.distanceOut) : zoneInOutData
+          })
+        }
       }
     }
   }
@@ -314,7 +339,7 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to) {
         new Date(p.fixTime).getTime() >= outDate &&
           new Date(p.fixTime).getTime() < anyNextIn
       )
-      const distanceOutAny = zoneInData.length < 2 ? calculateDistance(routeAfterOutAndBeforeAnyNextIn) : 0
+      const distanceOutAny = Object.keys(zoneInData).length < 2 ? calculateDistance(routeAfterOutAndBeforeAnyNextIn) : 0
 
       if (zoneInData[a.geofenceId]) {
         const totalInTime = new Date(a.position.fixTime).getTime() - new Date(zoneInData[a.geofenceId].position.fixTime).getTime()
@@ -336,7 +361,7 @@ function analyseAlerts (alerts, deviceRoute, userData, from, to) {
           stopped: routeIn.filter(p => !p.attributes.ignition).length > 0,
           driverName: zoneInData[a.geofenceId].position.driverName
         })
-        zoneInData[a.geofenceId] = null
+        delete zoneInData[a.geofenceId]
       } else {
         const totalInTime = new Date(a.position.fixTime).getTime() - from.getTime()
         const routeIn = deviceRoute.filter(p =>
@@ -461,6 +486,15 @@ async function exportZoneReportToPDF (userData, reportData) {
     headers.push(translations.report.date)
     reportData.devices[0].days[0].geofences.forEach(g => headers.push(g.geofenceName))
     headers.push(translations.report.distanceOut || 'Kms Afuera')
+  } else if (userData.tripsBetweenZones) {
+    headers.push(...[
+      translations.report.date_start,
+      translations.report.geofenceOut || 'Zone OUT',
+      translations.report.date_end,
+      translations.report.geofenceIn || 'Zone IN',
+      translations.report.duration,
+      translations.report.distance
+    ])
   } else {
     headers.push(...[
       translations.report.enter,
@@ -543,25 +577,44 @@ async function exportZoneReportToPDF (userData, reportData) {
       } else {
         const data = []
         space = reportHeader(index === 0, doc, translations, d, lang, timezone, userData)
-        d.geofences.forEach(a => {
-          const temp = [
-            geofenceEnter(userData.user, a),
-            geofenceExit(userData.user, a),
-            a.stopped ? translations.report.yes : translations.report.no,
-            convertMS(a.totalInTime, true),
-            a.distanceIn ? a.distanceIn.toLocaleString(lang, { maximumFractionDigits: 2 }) : 0,
-            a.distanceOut ? a.distanceOut.toLocaleString(lang, { maximumFractionDigits: 2 }) : 0,
-            a.geofenceName,
-            a.driverName
-          ]
-          data.push(temp)
-        })
-        const footer = ['Total:' + d.geofences.length]
-        addTable(doc, headers, data, footer, style, space + 35, {
-          3: { halign: 'right' },
-          4: { halign: 'right' },
-          5: { halign: 'right' }
-        })
+        if (userData.tripsBetweenZones) {
+          d.geofences.forEach(a => {
+            const temp = [
+              geofenceExit(userData.user, a),
+              a.outGeofenceName,
+              geofenceEnter(userData.user, a),
+              a.inGeofenceName,
+              convertMS(a.totalOutTime, true),
+              a.distanceOut ? a.distanceOut.toLocaleString(lang, { maximumFractionDigits: 2 }) : 0
+            ]
+            data.push(temp)
+          })
+          const footer = ['Total:' + d.geofences.length]
+          addTable(doc, headers, data, footer, style, space + 35, {
+            4: { halign: 'right' },
+            5: { halign: 'right' }
+          })
+        } else {
+          d.geofences.forEach(a => {
+            const temp = [
+              geofenceEnter(userData.user, a),
+              geofenceExit(userData.user, a),
+              a.stopped ? translations.report.yes : translations.report.no,
+              convertMS(a.totalInTime, true),
+              a.distanceIn ? a.distanceIn.toLocaleString(lang, { maximumFractionDigits: 2 }) : 0,
+              a.distanceOut ? a.distanceOut.toLocaleString(lang, { maximumFractionDigits: 2 }) : 0,
+              a.geofenceName,
+              a.driverName
+            ]
+            data.push(temp)
+          })
+          const footer = ['Total:' + d.geofences.length]
+          addTable(doc, headers, data, footer, style, space + 35, {
+            3: { halign: 'right' },
+            4: { halign: 'right' },
+            5: { halign: 'right' }
+          })
+        }
       }
     })
     return doc
@@ -599,6 +652,16 @@ function exportZoneReportToExcel (userData, reportData) {
       headers.push({ label: g.geofenceName, value: g.geofenceId })
     )
     headers.push({ label: translations.report.distanceOut || 'Kms Afuera', value: 'distanceOut' })
+  } else if (userData.tripsBetweenZones) {
+    headers.push(...[
+      { label: translations.report.vehicle, value: 'name' },
+      { label: translations.report.date_start, value: 'exit' },
+      { label: translations.report.geofenceOut || 'Zone OUT', value: 'zoneOut' },
+      { label: translations.report.date_end, value: 'enter' },
+      { label: translations.report.geofenceIn || 'Zone IN', value: 'zoneIn' },
+      { label: translations.report.duration, value: 'totalOutTime' },
+      { label: translations.report.distance, value: 'distanceOut' }
+    ])
   } else {
     headers.push(...[
       { label: translations.report.vehicle, value: 'name' },
@@ -693,6 +756,8 @@ function getColumns (device, data, userData, translations, excel) {
     totalInTime: convertMS(data.totalInTime, !userData.groupByDay),
     totalOutTime: convertMS(data.totalOutTime, !userData.groupByDay),
     zone: data.geofenceName,
+    zoneOut: data.outGeofenceName,
+    zoneIn: data.inGeofenceName,
     driver: data.driverName
   }
 }