fleetmap-reports 1.0.572 → 1.0.573

package/package.json

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

package/src/zone-report.js

@@ -46,7 +46,7 @@ async function createZoneReport (from, to, userData, traccar) {
         devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
         if (data.length > 0) {
-          groupData.devices = await processDevices(from, to, devices, userData.drivers, userData.geofences, data)
+          groupData.devices = await processDevices(from, to, devices, userData, { alerts: data })
           reportData.push(groupData)
         }
       }
@@ -72,7 +72,7 @@ async function createZoneReport (from, to, userData, traccar) {
     console.log('Geofence Enter/Exit Alerts:' + alerts.length)
 
     if (alerts.length) {
-      allData.devices.push(...await processDevices(from, to, devices, userData.drivers, userData.geofences, { alerts, route: data.route }, traccar))
+      allData.devices.push(...await processDevices(from, to, devices, userData, { alerts, route: data.route }))
     }
     deviceCount = deviceCount + slice.length
   }
@@ -82,31 +82,28 @@ async function createZoneReport (from, to, userData, traccar) {
   return reportData
 }
 
-async function processDevices (from, to, devices, drivers, geofences, data) {
+async function processDevices (from, to, devices, userData, data) {
   const devicesResult = []
 
   for (const d of devices) {
     const alerts = data.alerts.filter(t => t.deviceId === d.id)
     if (alerts.length > 0) {
-      // const response = await traccar.reports.reportsRouteGet(from, to, [d.id])
-
       const zoneInOutData = []
       const zoneInData = {}
-      // const positions = response.data
 
       alerts.forEach(a => {
-        // a.position = positions.find(p => p.id === a.positionId)
         if (a.position) {
           if (a.type === 'geofenceEnter') {
-            const driver = drivers.find(d => a.position.attributes && d.uniqueId === a.position.attributes.driverUniqueId)
+            const driver = userData.drivers.find(d => a.position.attributes && d.uniqueId === a.position.attributes.driverUniqueId)
             a.position.driverName = driver ? driver.name : ''
             zoneInData[a.geofenceId] = a
           } else if (a.type === 'geofenceExit') {
-            const geofence = geofences.find(g => g.id === a.geofenceId)
+            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 = data.route.filter(p => p.fixTime >= zoneInData[a.geofenceId].position.fixTime &&
-                  p.fixTime <= a.position.fixTime)
+              const route = data.route.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())
+              console.log(route)
               if (geofence) {
                 zoneInOutData.push({
                   inTime: zoneInData[a.geofenceId].position,
@@ -133,7 +130,7 @@ async function processDevices (from, to, devices, drivers, geofences, data) {
 
       for (const i in zoneInData) {
         if (zoneInData[i]) {
-          const geofence = geofences.find(g => g.id === zoneInData[i].geofenceId)
+          const geofence = userData.geofences.find(g => g.id === zoneInData[i].geofenceId)
           if (geofence) {
             zoneInOutData.push({
               inTime: zoneInData[i].position,
@@ -144,12 +141,14 @@ async function processDevices (from, to, devices, drivers, geofences, data) {
         }
       }
 
-      if (zoneInOutData.length > 0) {
+      const result = userData.onlyWithStop ? zoneInOutData.filter(d => d.stopped) : zoneInOutData
+
+      if (result.length > 0) {
         devicesResult.push({
           device: d,
           from,
           to,
-          geofences: zoneInOutData
+          geofences: result
         })
       }
     }