fleetmap-reports 1.0.264 → 1.0.265

package/.idea/workspace.xml

@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="activity report by driver grouped by day">
+    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="fix kms-report by driver and fix activity report with time period">
       <change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/activity-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/activity-report.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/index.test.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.test.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/kms-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/kms-report.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/speeding-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/speeding-report.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/trip-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/trip-report.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/util/driver.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/driver.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/util/traccar.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/traccar.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/util/trips.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/trips.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -222,7 +226,9 @@
       <workItem from="1640866782794" duration="123000" />
       <workItem from="1640866964393" duration="1022000" />
       <workItem from="1640870147277" duration="8236000" />
-      <workItem from="1641321068227" duration="13602000" />
+      <workItem from="1641321068227" duration="14805000" />
+      <workItem from="1641387675790" duration="32947000" />
+      <workItem from="1641509412324" duration="41000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>
@@ -371,7 +377,14 @@
       <option name="project" value="LOCAL" />
       <updated>1640878664617</updated>
     </task>
-    <option name="localTasksCounter" value="22" />
+    <task id="LOCAL-00022" summary="fix kms-report by driver and fix activity report with time period">
+      <created>1641348028566</created>
+      <option name="number" value="00022" />
+      <option name="presentableId" value="LOCAL-00022" />
+      <option name="project" value="LOCAL" />
+      <updated>1641348028566</updated>
+    </task>
+    <option name="localTasksCounter" value="23" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -410,6 +423,7 @@
     <MESSAGE value="calculate avg speed" />
     <MESSAGE value="fix activity report by driver" />
     <MESSAGE value="activity report by driver grouped by day" />
-    <option name="LAST_COMMIT_MESSAGE" value="activity report by driver grouped by day" />
+    <MESSAGE value="fix kms-report by driver and fix activity report with time period" />
+    <option name="LAST_COMMIT_MESSAGE" value="fix kms-report by driver and fix activity report with time period" />
   </component>
 </project>

package/package.json

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

package/src/activity-report.js

@@ -94,7 +94,7 @@ async function createActivityReportByDevice(from, to){
     if(userData.groupByDay) {
         const dates = getDates(from, to)
         for(const date of dates){
-            if(userData.allWeek){
+            if(userData.allWeek || !userData.weekDays){
                 const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
                 const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
 
@@ -160,11 +160,11 @@ async function createActivityReportByDevice(from, to){
 }
 
 async function createActivityReportByDriver(from, to){
-    const deviceIds = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
-    console.log(deviceIds)
+    const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
+
     let tripsData = []
-    if(deviceIds.length > 0) {
-        tripsData = await traccar.getTrips(traccarInstance, from, to, deviceIds)
+    if(devices.length > 0) {
+        tripsData = await traccar.getTrips(traccarInstance, from, to, devices)
     }
 
     const allData = {
@@ -187,9 +187,6 @@ function processDevices(devices, data, kmsReport) {
         if (summary) {
             summary.forEach(s => {
                 const deviceKms = kmsReport[0].devices.filter(r => r.device.id === d.id)
-
-                console.log(deviceKms)
-
                 s.convertedSpentFuel = automaticReports.calculateSpentFuel(s.spentFuel, d)
                 s.distance = deviceKms.length ? (userData.groupByDay ? deviceKms[0].days.find(d => d.date.getTime() === s.date.getTime()).kms : deviceKms[0].summary.distance) : 0
             })

package/src/kms-report.js

@@ -27,7 +27,7 @@ async function createKmsReportByDevice(from, to) {
 
     devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
     const route = userData.allWeek ? [] : await traccar.getRoute(traccarInstance, from, to, devicesToProcess)
-    const tripsData = await traccar.getTrips(traccarInstance, from, to, devicesToProcess.map(d => d.id))
+    const tripsData = await traccar.getTrips(traccarInstance, from, to, devicesToProcess)
 
     console.log('trips:' + tripsData.length)
 
@@ -40,22 +40,16 @@ async function createKmsReportByDevice(from, to) {
 }
 
 async function createKmsReportByDriver(from, to) {
-    const deviceIds = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
-    console.log(deviceIds.length)
+    const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
+    console.log(devices.length)
 
-    let tripsData = []
-    if(deviceIds.length > 0) {
-        const response = await traccarInstance.reports.reportsTripsGet(from, to, deviceIds)
-        tripsData = response.data
+    if(!devices.length) {
+        //empty report
+        return { drivers: [] }
     }
 
-    const allData = {
-        drivers: []
-    }
-
-    allData.drivers = processDrivers(from, to, userData.drivers, tripsData)
-
-    return allData
+    const tripsData = await traccar.getTrips(traccarInstance, from, to, devices)
+    return { drivers: processDrivers(from, to, userData.drivers, tripsData) }
 }
 
 async function createKmsReportByGroup(from, to) {
@@ -75,7 +69,7 @@ function processDrivers(from, to, drivers, data) {
                 driverData.days = []
                 const dates = getDates(from, to)
                 for(const date of dates){
-                    if(userData.allWeek){
+                    if(userData.allWeek || !userData.weekDays){
                         const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
                         const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
 

package/src/speeding-report.js

@@ -16,109 +16,135 @@ let traccarInstance
 let userData
 
 const fileName = 'SpeedingReport'
+const eventTypes = ['deviceOverspeed']
 
 async function createSpeedingReport(from, to, reportUserData, traccar) {
+  console.log('Create SpeedingReport')
   traccarInstance = traccar
   userData = reportUserData
-  console.log('createSpeedingReport', from, to, userData, traccar)
   const reportData = []
 
-  if(userData.byDriver){
+  if (userData.byDriver) {
+    console.log("ByDriver")
     const allData = await createSpeedingReportByDriver(from, to)
     reportData.push(allData)
   }
-  else if(userData.byGroup){
+  else if (userData.byGroup) {
     console.log("ByGroup")
-    for (const g of userData.groups) {
-      const devices = userData.devices.filter(d => d.groupId === g.id)
-      console.log(g.name + ' devices:' + devices.length)
-      if(devices.length > 0) {
-        const groupData = {
-          devices: [],
-          group: g,
-          xpert: devices.filter(d => d.attributes.xpert).length > 0
-        }
+    const allData = await createSpeedingReportByGroup(from, to)
+    reportData.push(...allData)
+  } else {
+    console.log("ByDevice")
+    const allData = await createSpeedingReportByDevice(from, to, userData.devices)
+    reportData.push(allData)
+  }
 
-        const eventTypes = ['deviceOverspeed']
-        const events = await traccar.getEvents(traccarInstance, from, to, devices, eventTypes)
-        const routes = userData.useVehicleSpeedLimit ? [] : await traccar.getRoute(traccarInstance, from, to, devices)
+  return reportData
+}
 
-        devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
+async function createSpeedingReportByGroup(from, to){
+  const reportData = []
+  for (const g of userData.groups) {
+    const devices = userData.devices.filter(d => d.groupId === g.id)
+    console.log(g.name + ' devices:' + devices.length)
+    if(devices.length > 0) {
+      const groupData = {
+        devices: [],
+        group: g,
+        xpert: devices.filter(d => d.attributes.xpert).length > 0
+      }
 
-        if (events.length > 0) {
-          groupData.devices = await processDevices(from, to, devices, events, routes)
-          reportData.push(groupData)
-        }
+      const events = await traccar.getEvents(traccarInstance, from, to, devices, eventTypes)
+      const routes = await traccar.getRoute(traccarInstance, from, to, devices)
+
+      devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
+
+      if (events.length > 0) {
+        groupData.devices = await processDevices(from, to, devices, events, routes)
+        reportData.push(groupData)
       }
     }
-
-    const withoutGroupData = await createSpeedingReportByDevice(from, to)
-    reportData.push(withoutGroupData)
-  } else {
-    const allData = await createSpeedingReportByDevice(from, to)
-    reportData.push(allData)
   }
 
+  const groupIds = userData.groups.map(g => g.id)
+  const withoutGroupDevices = userData.devices.filter(d => !groupIds.includes(d.groupId))
+
+  const withoutGroupData = await createSpeedingReportByDevice(from, to, withoutGroupDevices)
+  reportData.push(withoutGroupData)
+
   return reportData
 }
 
-async function createSpeedingReportByDevice(from, to) {
-  const groupIds = userData.groups.map(g => g.id)
-  const withoutGroupDevices = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
-
-  withoutGroupDevices.sort((a, b) => (a.name > b.name) ? 1 : -1)
+async function createSpeedingReportByDevice(from, to, devices) {
+  devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
-  const eventTypes = ['deviceOverspeed']
-  const events = await traccar.getEvents(traccarInstance, from, to, withoutGroupDevices, eventTypes)
-  const routes = userData.useVehicleSpeedLimit ? [] : await traccar.getRoute(traccarInstance, from, to, withoutGroupDevices)
+  const routes = await traccar.getRoute(traccarInstance, from, to, devices)
+  const events = []
+  if(!userData.useVehicleSpeedLimit && userData.customSpeed){
+    events.push(...await getCustomSpeedLimitEvents(devices, routes))
+  } else {
+    events.push(...await traccar.getEvents(traccarInstance, from, to, devices, eventTypes))
+  }
 
-  const allData = { devices: [] }
+  if(userData.roadSpeedLimits){
+    events.push(...await getHereEvents(devices, routes))
+  }
 
-  if(events.length > 0 || userData.roadSpeedLimits) {
-    allData.devices = await processDevices(from, to, withoutGroupDevices, events, routes)
-    allData.xpert = withoutGroupDevices.filter(d => d && d.attributes && d.attributes.xpert).length > 0
+  if(!events.length) {
+    //empty report
+    return { devices: [] }
   }
 
-  return allData
+  return {
+    devices: await processDevices(from, to, devices, events, routes),
+    xpert: devices.filter(d => d && d.attributes && d.attributes.xpert).length > 0
+  }
 }
 
 async function createSpeedingReportByDriver(from, to) {
-  const deviceIds = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
-  console.log('Devices with driver',deviceIds.length)
+  const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
+  console.log('Devices with driver',devices.length)
+
+  if(!devices.length) {
+    //empty report
+    return { drivers: [] }
+  }
 
-  let eventsData = []
-  if(deviceIds.length > 0) {
-    const devices = userData.devices.filter(d => deviceIds.includes(d.id))
-    eventsData = await traccar.getEvents(traccarInstance, from, to, devices,['deviceOverspeed'])
+  const routes = await traccar.getRoute(traccarInstance, from, to, devices)
+  const events = []
+  if(!userData.useVehicleSpeedLimit && userData.customSpeed){
+    events.push(...await getCustomSpeedLimitEvents(devices, routes))
+  } else {
+    events.push(...await traccar.getEvents(traccarInstance, from, to, devices, eventTypes))
   }
 
-  const allData = {
-    drivers: []
+  if(userData.roadSpeedLimits){
+    events.push(...await getHereEvents(devices, routes))
   }
-  console.log(eventsData.length)
 
-  await getEventsPosition(from , to, userData.devices, eventsData)
-  allData.drivers = await processDrivers(from, to, eventsData)
-  console.log(allData.drivers.length)
-  return allData
+  if(!events.length) {
+    //empty report
+    return { drivers: [] }
+  }
+
+  return {drivers: await processDrivers(from, to, events, routes)}
 }
 
-async function processDrivers(from, to, data) {
-  console.log(data)
+async function processDrivers(from, to, events, routes) {
   const driversResult = []
-  const alertsWithPosition = data.filter(a => a.position)
-
-  userData.drivers.forEach(d => {
-    const alerts = alertsWithPosition.filter(e => e.position.attributes.driverUniqueId === d.uniqueId)
 
-    if (alerts.length > 0) {
+  await findEventsPosition(from, to, userData.devices, events, routes)
 
+  userData.drivers.forEach(d => {
+    const driverEvents = events.filter(e => e.position && e.position.attributes.driverUniqueId === d.uniqueId)
+    if (driverEvents.length > 0) {
+      driverEvents.sort((a, b) => a.positionId - b.positionId)
       driversResult.push({
         driver: d,
         from: from,
         to: to,
-        alerts: alerts,
-        maxSpeed: alerts.reduce((a, b) => {
+        alerts: driverEvents,
+        maxSpeed: driverEvents.reduce((a, b) => {
           return a > b.attributes.maxSpeed ? a : b.attributes.maxSpeed
         }, 0),
       })
@@ -130,117 +156,38 @@ async function processDrivers(from, to, data) {
 
 async function processDevices(from, to, devices, events, routes) {
   const devicesResult = []
+  await findEventsPosition(from, to, devices, events, routes)
 
-  if(userData.useVehicleSpeedLimit) {
-    await getEventsPosition(from, to, devices, events)
-
-    console.log(events)
-
-    for (const d of devices) {
-      const deviceEvents = events.filter(t => t.deviceId === d.id)
-
-      if (deviceEvents.length > 0) {
-        const alertsWithPosition = deviceEvents.filter(a => a.position).sort((a, b) => a.positionId - b.positionId)
-        devicesResult.push({
-          device: d,
-          from: from,
-          to: to,
-          alerts: alertsWithPosition,
-          maxSpeed: alertsWithPosition.reduce((a, b) => {
-            return a > (b && b.attributes && b.attributes.maxSpeed) ? a : (b && b.attributes && b.attributes.maxSpeed)
-          }, 0),
-        })
-      }
-    }
-  } else {
-    for (const d of devices) {
-      const positions = routes.filter(t => t.deviceId === d.id)
-      const maxSpeed = userData.customSpeed / 1.85200
-
-      const alerts = []
-      for(let pIndex = 0; pIndex < positions.length ; pIndex++){
-        const position = positions[pIndex]
-        if(position.speed > maxSpeed){
-          const alert = {
-            position: position,
-            attributes: {
-              speedLimit: maxSpeed,
-              speed: position.speed
-            }
-          }
-
-          pIndex = calculateEventData(positions, pIndex, alert)
-
-          alerts.push(alert)
-        }
-      }
-      if(alerts.length > 0){
-        devicesResult.push({
-          device: d,
-          from: from,
-          to: to,
-          alerts: alerts,
-          maxSpeed: alerts.reduce((a, b) => {
-            return a > (b && b.attributes && b.attributes.maxSpeed) ? a : (b && b.attributes && b.attributes.maxSpeed)
-          }, 0),
-        })
-      }
+  for (const d of devices) {
+    const deviceEvents = events.filter(e => e.deviceId === d.id && e.position)
+    if (deviceEvents.length > 0) {
+      deviceEvents.sort((a, b) => a.positionId - b.positionId)
+      devicesResult.push({
+        device: d,
+        from: from,
+        to: to,
+        alerts: deviceEvents,
+        maxSpeed: deviceEvents.reduce((a, b) => {
+          return a > (b && b.attributes && b.attributes.maxSpeed) ? a : (b && b.attributes && b.attributes.maxSpeed)
+        }, 0),
+      })
     }
   }
 
   return devicesResult
 }
 
-async function getEventsPosition(from, to, devices, events){
-
-  const deviceIds = [...new Set(events.map(e => e.deviceId))]
-  const routeData = await traccar.getRoute(traccarInstance, from, to, deviceIds.map(id => { return { id: id } } ))
-
-  console.log(events)
-
+async function findEventsPosition(from, to, devices, events, routes){
   for (const d of devices) {
-    let alerts = events.filter(t => t.deviceId === d.id)
-
-    if (alerts.length > 0 || userData.roadSpeedLimits) {
-      const positions = routeData.filter(p => p.deviceId === d.id)
-
-      if (userData.roadSpeedLimits && positions.length) {
-        try {
-          const results = await here.routeMatch(positions)
-          const hereAlerts = results.map(r => {
-            const position = positions.find(p => new Date(p.fixTime).getTime() === r.timestamp)
-            return {
-              ...r,
-              roadSpeedLimit: r.speedLimit,
-              deviceId: d.id,
-              position,
-              positionId: position && position.id,
-              attributes: {speedLimit: r.speedLimit, speed: r.currentSpeedKmh / 1.85200}
-            }
-          })
-          console.log('hereAlerts', hereAlerts)
-          const reduced = hereAlerts.reduce((acc, cur, idx, src) => {
-            if (idx === 1) {
-              return [cur]
-            }
-            if (cur.timestamp - src[idx - 1].timestamp > 300000 || cur.roadSpeedLimit !== src[idx - 1].roadSpeedLimit) {
-              return acc.concat(cur)
-            }
-            return acc
-          })
-          events.push(...reduced)
-          alerts = events.filter(t => t.deviceId === d.id)
-        } catch (e) {
-          console.error(e)
-        }
-      }
+    let deviceEvents = events.filter(e => e.deviceId === d.id && e.positionId)
+    if (deviceEvents.length > 0) {
+      deviceEvents.sort((a,b) => a.positionId-b.positionId )
+      const positions = routes.filter(p => p.deviceId === d.id)
 
-      for (const a of alerts) {
+      for (const a of deviceEvents) {
         let pIndex = positions.findIndex(p => p.id === a.positionId)
         if (pIndex > 0) {
-          a.position = positions[pIndex]
           let geofence = null
-
           if (a.geofenceId) {
             geofence = userData.geofences.find(g => g.id === a.geofenceId)
             if (geofence) {
@@ -248,44 +195,87 @@ async function getEventsPosition(from, to, devices, events){
             }
           }
 
-          let endEventPosition = a.position
-          let maxSpeed = a.position.speed
-          let dist = 0
-          while (pIndex + 1 < positions.length) {
-            pIndex++
-
-            dist += distance(point([endEventPosition.longitude, endEventPosition.latitude]),
-                point([positions[pIndex].longitude, positions[pIndex].latitude]))
-            endEventPosition = positions[pIndex]
-            if (endEventPosition.speed <= a.attributes.speedLimit || (geofence && isOutsideGeofence(geofence, endEventPosition))) {
-              a.eventTime = new Date(endEventPosition.fixTime) - new Date(a.position.fixTime)
-              a.attributes.maxSpeed = maxSpeed
-              a.distance = dist
-              break
-            } else {
-              if (maxSpeed < endEventPosition.speed) {
-                maxSpeed = endEventPosition.speed
-              }
-            }
-          }
+          if(!a.position) {
+            a.position = positions[pIndex]
+            pIndex = calculateEventData(positions, pIndex, a, d, geofence)
 
-          if (a.position.attributes.driverUniqueId) {
-            const driver = userData.drivers.find(d => d.uniqueId === a.position.attributes.driverUniqueId)
-            a.driver = driver && driver.name
+            positions.slice(pIndex)
           }
+        }
+      }
+    }
+  }
+}
 
-          a.deviceName = d.name
+async function getCustomSpeedLimitEvents(devices, routes){
+  console.log('calculate custom speed limit events')
+  const events = []
+  const maxSpeed = userData.customSpeed / 1.85200
 
-          positions.slice(pIndex)
+  for (const d of devices) {
+    const positions = routes.filter(p => p.deviceId === d.id)
+    let eventIsActive = false
+
+    for (const position of positions) {
+      if(position.speed > maxSpeed && !eventIsActive){
+        const event = {
+          positionId: position && position.id,
+          deviceId: d.id,
+          attributes: {
+            speedLimit: maxSpeed,
+            speed: position.speed
+          }
         }
+        events.push(event)
+        eventIsActive = true
+      } else if (position.speed <= maxSpeed) {
+        eventIsActive = false
       }
     }
   }
+
+  return events
 }
 
-function calculateEventData(positions, pIndex, a, geofence){
-  let endEventPosition = a.position
-  let maxSpeed = a.position.speed
+async function getHereEvents(devices, routes){
+  console.log('calculate custom speed limit events')
+  const events = []
+  for (const d of devices) {
+    const positions = routes.filter(p => p.deviceId === d.id)
+    try {
+      const results = await here.routeMatch(positions)
+      const hereAlerts = results.map(r => {
+        const position = positions.find(p => new Date(p.fixTime).getTime() === r.timestamp)
+        return {
+          ...r,
+          roadSpeedLimit: r.speedLimit,
+          deviceId: d.id,
+          position,
+          positionId: position && position.id,
+          attributes: {speedLimit: r.speedLimit, speed: r.currentSpeedKmh / 1.85200}
+        }
+      })
+      console.log('hereAlerts', hereAlerts)
+      const reduced = hereAlerts.reduce((acc, cur, idx, src) => {
+        if (idx === 1) {
+          return [cur]
+        }
+        if (cur.timestamp - src[idx - 1].timestamp > 300000 || cur.roadSpeedLimit !== src[idx - 1].roadSpeedLimit) {
+          return acc.concat(cur)
+        }
+        return acc
+      })
+      events.push(...reduced)
+    } catch (e) {
+      //console.error(e)
+    }
+  }
+  return events
+}
+
+function calculateEventData(positions, pIndex, alert, device, geofence){
+  let endEventPosition = alert.position
+  let maxSpeed = alert.position.speed
   let dist = 0
   while (pIndex + 1 < positions.length) {
     pIndex++
@@ -293,10 +283,10 @@ function calculateEventData(positions, pIndex, a, geofence){
     dist += distance(point([endEventPosition.longitude, endEventPosition.latitude]),
         point([positions[pIndex].longitude, positions[pIndex].latitude]))
     endEventPosition = positions[pIndex]
-    if (endEventPosition.speed <= a.attributes.speedLimit || (geofence && isOutsideGeofence(geofence, endEventPosition))) {
-      a.eventTime = new Date(endEventPosition.fixTime) - new Date(a.position.fixTime)
-      a.attributes.maxSpeed = maxSpeed
-      a.distance = dist
+    if (endEventPosition.speed <= alert.attributes.speedLimit || (geofence && isOutsideGeofence(geofence, endEventPosition))) {
+      alert.eventTime = new Date(endEventPosition.fixTime) - new Date(alert.position.fixTime)
+      alert.attributes.maxSpeed = maxSpeed
+      alert.distance = dist
       break
     } else {
       if (maxSpeed < endEventPosition.speed) {
@@ -305,6 +295,14 @@ function calculateEventData(positions, pIndex, a, geofence){
     }
   }
 
+
+  if (alert.position.attributes.driverUniqueId) {
+    const driver = userData.drivers.find(d => d.uniqueId === alert.position.attributes.driverUniqueId)
+    alert.driver = driver && driver.name
+  }
+
+  alert.deviceName = device.name
+
   return pIndex
 }
 

package/src/trip-report.js

@@ -3,13 +3,13 @@ const messages = require('../lang')
 const jsPDF = require('jspdf')
 const {convertMS, convertToLocaleString, convertToLocaleDateString, convertToLocaleTimeString} = require("./util/utils")
 require('jspdf-autotable')
-const {coordsDistance} = require("./util/utils")
 const drivers = require("./util/driver")
 const {getUserPartner} = require("fleetmap-partners")
 const {headerFromUser, addTable} = require("./util/pdfDocument")
 const {getStyle} = require("./reportStyle")
 const traccar = require("./util/traccar")
 const trips = require("./util/trips");
+const {isInsideTimetable, addNearestPOIs} = require("./util/trips");
 
 
 let traccarInstance
@@ -23,26 +23,26 @@ async function createTripReport(from, to, reportUserData, traccar) {
     traccarInstance = traccar
     const reportData = []
 
-    if(userData.byDriver){
-        const allData = await createTripReportByDriver(from, to)
-        reportData.push(allData)
+    if (userData.byDriver) {
+        console.log("ByDriver")
+        const report = await createTripReportByDriver(from, to)
+        reportData.push(report)
     }
-    else if(userData.byGroup){
+    else if (userData.byGroup) {
         console.log("ByGroup")
         const allData = await createTripReportByGroup(from, to)
         reportData.push(...allData)
+    } else {
+        console.log("ByDevice")
+        const report = await createTripReportByDevice(from, to)
+        reportData.push(report)
     }
 
-    const groupIds = userData.groups.map(g => g.id)
-    const withoutGroupDevices = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
-
-    const allData = await createTripReportByDevice(from, to, withoutGroupDevices)
-    reportData.push(allData)
-
     return reportData
 }
 
-async function createTripReportByDevice(from, to, devices) {
+async function createTripReportByDevice(from, to) {
+    const devices = userData.devices
     const allData = {
         devices: [],
         xpert: devices.filter(d => d.attributes.xpert).length > 0
@@ -51,7 +51,7 @@ async function createTripReportByDevice(from, to, devices) {
     devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
     const devicesToSlice = devices.slice()
-    const data = await traccar.getTrips(traccarInstance, from, to, devicesToSlice.map(d => d.id))
+    const data = await traccar.getTrips(traccarInstance, from, to, devicesToSlice)
     const stopsData = await traccar.getStops(traccarInstance, from, to, devicesToSlice)
 
     console.log('Trips:' + data.length)
@@ -77,90 +77,75 @@ async function createTripReportByGroup(from, to) {
             }
 
             const response = await traccarInstance.reports.reportsTripsGet(from, to, null, [g.id])
-            const data = response.data
+            const tripsData = response.data
 
             const stopsResponse = await traccarInstance.reports.reportsStopsGet(from, to, null, [g.id])
             const stopsData = stopsResponse.data
 
             devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
-            if (data.length > 0) {
-
-                console.log('Trips:' + data.length)
-                groupData.devices = processDevices(from, to, devices, data, stopsData, userData)
+            if (tripsData.length > 0) {
+                console.log('Trips:' + tripsData.length)
+                groupData.devices = processDevices(from, to, devices, tripsData, stopsData, userData)
 
                 reportData.push(groupData)
             }
         }
     }
+
+    const groupIds = userData.groups.map(g => g.id)
+    const withoutGroupDevices = userData.devices.filter(d => !groupIds.includes(d.groupId))
+
+    const allData = await createTripReportByDevice(from, to, withoutGroupDevices)
+    reportData.push(allData)
+
     return reportData
 }
 
 async function createTripReportByDriver(from, to){
-    const deviceIds = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
-    console.log(deviceIds.length)
+    const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
+    console.log(devices.length)
 
-    let tripsData = []
-    if(deviceIds.length > 0) {
-        const response = await traccarInstance.reports.reportsTripsGet(from, to, deviceIds)
-        tripsData = response.data
+    if(!devices.length){
+        //Empty report
+        return { drivers:[] }
     }
 
-    const allData = {
-        drivers: []
-    }
-
-    allData.drivers = processDrivers(from, to, userData.drivers, tripsData)
+    const tripsData = await traccar.getTrips(traccarInstance, from, to, devices)
 
-    return allData
+    return { drivers: processDrivers(from, to, userData.drivers, tripsData)}
 }
 
 function processDevices(from, to, devices, data, stopsData) {
     const devicesResult = []
 
     devices.forEach(d => {
-        const trips = data.filter(t => t.deviceId === d.id && (userData.allWeek || isInsideTimetable(t, userData)))
+        const trips = data.filter(t => t.deviceId === d.id
+            && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData)))
         const stops = stopsData.filter(s => s.deviceId === d.id)
 
-        trips.forEach(t => {
-            t.totalKms = t.distance / 1000
+        addNearestPOIs(trips, userData)
+
+        trips.forEach(trip => {
             if (automaticReports.deviceWithFuelInfo(d)) {
-                t.fuelConsumption = Math.round((t.spentFuel * d.attributes.fuel_tank_capacity) / 100)
-                t.avgFuelConsumption = t.totalKms > 0 ? Math.round(t.fuelConsumption * 100 / t.totalKms) : 0
+                trip.fuelConsumption = Math.round((t.spentFuel * d.attributes.fuel_tank_capacity) / 100)
+                trip.avgFuelConsumption = t.totalKms > 0 ? Math.round(t.fuelConsumption * 100 / t.totalKms) : 0
             } else {
-                t.fuelConsumption = '-'
-                t.avgFuelConsumption = '-'
+                trip.fuelConsumption = '-'
+                trip.avgFuelConsumption = '-'
             }
 
-            const distance = userData.geofences
-                .filter(g => g && g.area.startsWith('CIRCLE'))
-                .map(g => {
-                    const str = g.area.substring('CIRCLE ('.length, g.area.indexOf(','))
-                    const coord = str.trim().split(' ')
-                    return {
-                    p: g,
-                    distance: Math.round(coordsDistance(parseFloat(coord[1]), parseFloat(coord[0]), t.endLon, t.endLat))
-                }
-            })
-            const nearestPOIs = distance.filter(a => a.distance < 100).sort((a, b) => (a.distance > b.distance) ? 1 : -1)
-            if (nearestPOIs.length > 0) {
-                t.endPOIName = nearestPOIs[0].p.name
+            const stop = getStop(new Date(trip.startTime), stops)
+            if (stop) {
+                trip.stopDuration = (new Date(stop.endTime) - new Date(stop.startTime))
+                trip.stopEngineHours = stop.engineHours
+            } else {
+                trip.stopDuration = 0
+                trip.stopEngineHours = 0
             }
         })
 
         if (trips.length > 0) {
-            trips.forEach(trip => {
-                const stop = getStop(new Date(trip.startTime), stops)
-
-                if (stop) {
-                    trip.stopDuration = (new Date(stop.endTime) - new Date(stop.startTime))
-                    trip.stopEngineHours = stop.engineHours
-                } else {
-                    trip.stopDuration = 0
-                    trip.stopEngineHours = 0
-                }
-            })
-
             const deviceData = {
                 device: d,
                 from: from,
@@ -188,11 +173,12 @@ function processDrivers(from, to, drivers, data) {
     console.log(data)
     const driversResult = []
     drivers.forEach(d => {
-        const trips = data.filter(t => t.driverUniqueId === d.uniqueId)
+        const trips = data.filter(t => t.driverUniqueId === d.uniqueId
+            && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData)))
 
-        trips.forEach(t => {
-            t.totalKms = t.distance / 1000
-        })
+        trips.sort((a,b)=>new Date(a.startTime).getTime()-new Date(b.startTime).getTime())
+
+        addNearestPOIs(trips, userData)
 
         if (trips.length > 0) {
             const driverData = {
@@ -201,14 +187,13 @@ function processDrivers(from, to, drivers, data) {
                 to: to,
                 totalDuration: trips.reduce((a, b) => a + b.duration, 0),
                 totalDistance: trips.reduce((a, b) => a + b.distance, 0),
-                maxSpeed: trips.reduce((a, b) => {
-                    return a > b.maxSpeed ? a : b.maxSpeed
-                }, 0),
+                maxSpeed: trips.reduce((a, b) => { return a > b.maxSpeed ? a : b.maxSpeed }, 0),
                 trips: trips,
             }
             driversResult.push(driverData)
         }
     })
+    console.log(driversResult)
 
     return driversResult
 }
@@ -453,35 +438,6 @@ function getStop(tripEndDate, stops){
     return null
 }
 
-function isInsideTimetable(t, userData){
-    const tripStart  = new Date(t.startTime)
-    const tripEnd  = new Date(t.endTime)
-
-    if((tripStart.getDay() === 0 && userData.weekDays.sunday) ||
-        (tripStart.getDay() === 1 && userData.weekDays.monday) ||
-        (tripStart.getDay() === 2 && userData.weekDays.tuesday) ||
-        (tripStart.getDay() === 3 && userData.weekDays.wednesday)  ||
-        (tripStart.getDay() === 4 && userData.weekDays.thursday) ||
-        (tripStart.getDay() === 5 && userData.weekDays.friday) ||
-        (tripStart.getDay() === 6 && userData.weekDays.saturday)) {
-
-        const startDate = new Date(new Date(tripStart).toISOString().split('T')[0] + ' '+userData.dayHours.startTime)
-        const endDate = new Date(new Date(tripStart).toISOString().split('T')[0] + ' '+userData.dayHours.endTime)
-
-        console.log(tripStart, startDate, endDate)
-
-        //Trips inside time period
-        if(startDate.getTime() < endDate.getTime()) {
-            return tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDate.getTime()
-        } else {
-            return (tripStart.getTime() < endDate.getTime() && tripEnd.getTime() < endDate.getTime()) ||
-                (tripStart.getTime() > startDate.getTime())
-        }
-    }
-
-    return false
-}
-
 exports.createTripReport = createTripReport;
 exports.exportTripReportToPDF = exportTripReportToPDF;
 exports.exportTripReportToExcel = exportTripReportToExcel;

package/src/util/driver.js

@@ -9,10 +9,9 @@ async function devicesByDriver(traccarInstance, from, to, drivers, devices){
             return e.attributes.driverUniqueId === d.uniqueId
         })
 
-        deviceIds.push(events.map(e => e.deviceId))
+        deviceIds.push(...events.map(e => e.deviceId))
     }
-
-    return [...new Set(deviceIds.flat())]
+    return devices.filter(d => deviceIds.includes(d.id))
 }
 
 exports.devicesByDriver = devicesByDriver

package/src/util/traccar.js

@@ -14,12 +14,12 @@ async function getRoute(traccar, from, to, devices){
     return result.map(r => r.data).flat()
 }
 
-async function getTrips(traccar, from, to, deviceIds){
-    const devicesToSlice = deviceIds.slice()
+async function getTrips(traccar, from, to, devices){
+    const devicesToSlice = devices.slice()
     const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
     let requests = []
     for (const a of arrayOfArrays) {
-        const promise = traccar.reports.reportsTripsGet(from, to, a)
+        const promise = traccar.reports.reportsTripsGet(from, to, a.map(d => d.id))
         requests = requests.concat(promise)
     }
 

package/src/util/trips.js

@@ -1,8 +1,30 @@
 const traccar = require("./traccar");
+const {coordsDistance} = require("./utils");
 
 const minDistance = 0
 const minAvgSpeed = 0
 
+function addNearestPOIs(trips, userData){
+    trips.forEach(t => {
+        t.totalKms = t.distance / 1000
+
+        const distance = userData.geofences
+            .filter(g => g && g.area.startsWith('CIRCLE'))
+            .map(g => {
+                const str = g.area.substring('CIRCLE ('.length, g.area.indexOf(','))
+                const coord = str.trim().split(' ')
+                return {
+                    p: g,
+                    distance: Math.round(coordsDistance(parseFloat(coord[1]), parseFloat(coord[0]), t.endLon, t.endLat))
+                }
+            })
+        const nearestPOIs = distance.filter(a => a.distance < 100).sort((a, b) => (a.distance > b.distance) ? 1 : -1)
+        if (nearestPOIs.length > 0) {
+            t.endPOIName = nearestPOIs[0].p.name
+        }
+    })
+}
+
 async function checkTripsKms(traccarInstance, from, to, routeData, tripsData, devices) {
     console.log('checkTripsKms')
     const trips = tripsData.filter(t => t.distance === minDistance && t.averageSpeed > minAvgSpeed)
@@ -20,4 +42,35 @@ async function checkTripsKms(traccarInstance, from, to, routeData, tripsData, de
     }
 }
 
+function isInsideTimetable(t, userData){
+    const tripStart  = new Date(t.startTime)
+    const tripEnd  = new Date(t.endTime)
+
+    if((tripStart.getDay() === 0 && userData.weekDays.sunday) ||
+        (tripStart.getDay() === 1 && userData.weekDays.monday) ||
+        (tripStart.getDay() === 2 && userData.weekDays.tuesday) ||
+        (tripStart.getDay() === 3 && userData.weekDays.wednesday)  ||
+        (tripStart.getDay() === 4 && userData.weekDays.thursday) ||
+        (tripStart.getDay() === 5 && userData.weekDays.friday) ||
+        (tripStart.getDay() === 6 && userData.weekDays.saturday)) {
+
+        const startDate = new Date(new Date(tripStart).toISOString().split('T')[0] + ' '+userData.dayHours.startTime)
+        const endDate = new Date(new Date(tripStart).toISOString().split('T')[0] + ' '+userData.dayHours.endTime)
+
+        console.log(tripStart, startDate, endDate)
+
+        //Trips inside time period
+        if(startDate.getTime() < endDate.getTime()) {
+            return tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDate.getTime()
+        } else {
+            return (tripStart.getTime() < endDate.getTime() && tripEnd.getTime() < endDate.getTime()) ||
+                (tripStart.getTime() > startDate.getTime())
+        }
+    }
+
+    return false
+}
+
 exports.checkTripsKms = checkTripsKms
+exports.isInsideTimetable = isInsideTimetable
+exports.addNearestPOIs = addNearestPOIs