fleetmap-reports 1.0.426 → 1.0.427

package/package.json

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

package/src/index.test.js

@@ -52,6 +52,21 @@ describe('Test_Reports', function () {
     assert.equal(device.trips[1].endPOIName, undefined)
     assert.equal(device.totalDistance, 339204.53999999166) // Total Kms
   }, 20000)
+  // eslint-disable-next-line no-undef
+  it('Trip by driver', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.byDriver = true
+    const data = await report.tripReport(new Date(2022, 1, 1, 0, 0, 0, 0),
+      new Date(2022, 1, 10, 23, 59, 59, 0),
+      userData)
+    assert.equal(data.length, 1)
+    console.log(data[0].drivers)
+    const driver = data[0].drivers.find(d => d.driver.id === 14020)
+    assert.equal(driver.trips.length, 9) // Total Trips
+    assert.equal(driver.totalDuration, 6274000)
+    assert.equal(driver.maxSpeed, 70.1944)
+  }, 20000)
   it('Trip without addresses', async () => {
     const report = await getReports()
     const userData = await report.getUserData()

package/src/trip-report.js

@@ -114,11 +114,40 @@ async function createTripReportByDriver (from, to, userData, traccar) {
     return { drivers: [] }
   }
 
-  const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, true, false, false)
-  const tripsData = allInOne.trips
-  const routeData = allInOne.route
+  const allData = {
+    drivers: []
+  }
+
+  const sliced = automaticReports.sliceArray(devices, 5)
+
+  let deviceCount = 0
+  for (const slice of sliced) {
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, true, false, false, deviceCount, devices.length)
+    const tripsData = allInOne.trips
+    const routeData = allInOne.route
 
-  return { drivers: processDrivers(from, to, userData, { trips: tripsData, route: routeData }) }
+    const results = processDrivers(from, to, userData, { trips: tripsData, route: routeData })
+
+    results.forEach(result => {
+      const driver = allData.drivers.find(d => d.driver.id === result.driver.id)
+      if (driver) {
+        driver.trips.push(...result.trips)
+      } else {
+        allData.drivers.push(result)
+      }
+    })
+
+    deviceCount = deviceCount + slice.length
+  }
+
+  allData.drivers.forEach(d => {
+    d.totalDuration = d.trips.reduce((a, b) => a + b.duration, 0)
+    d.totalDistance = d.trips.reduce((a, b) => a + b.distance, 0)
+    d.maxSpeed = d.trips.reduce((a, b) => { return a > b.maxSpeed ? a : b.maxSpeed }, 0)
+    d.trips = d.trips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
+  })
+
+  return allData
 }
 
 function processDevices (from, to, devices, data, userData, traccar) {
@@ -195,8 +224,6 @@ function processDrivers (from, to, userData, data) {
     const trips = data.trips.filter(t => t.driverUniqueId === d.uniqueId &&
             (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
 
-    trips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
-
     const idleEvents = getIdleEvents(data.route, d)
 
     trips.forEach(function (trip, i) {
@@ -211,15 +238,11 @@ function processDrivers (from, to, userData, data) {
         driver: d,
         from,
         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),
         trips
       }
       driversResult.push(driverData)
     }
   })
-  console.log(driversResult)
 
   return driversResult
 }