fleetmap-reports 1.0.614 → 1.0.615

package/package.json

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

package/src/trip-report.js

@@ -135,10 +135,6 @@ async function createTripReportByDriver (from, to, userData, traccar) {
     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())
-    d.trips.forEach(function (trip, i) {
-      trip.stopDuration = i !== d.trips.length - 1 ? (new Date(d.trips[i + 1].startTime) - new Date(trip.endTime)) : 0
-    })
   })
 
   return report
@@ -220,9 +216,11 @@ function processDrivers (from, to, userData, data) {
   const driversResult = []
   userData.drivers.forEach(d => {
     const route = data.route.filter(p => p.attributes.driverUniqueId === d.uniqueId)
-    const trips = data.trips.filter(t => t.driverUniqueId === d.uniqueId &&
+    let trips = data.trips.filter(t => t.driverUniqueId === d.uniqueId &&
             (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
 
+    trips = 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) {
@@ -233,8 +231,10 @@ function processDrivers (from, to, userData, data) {
         trip.endPOIName = nearestPOIs[0].p.name
       }
 
-      trip.stopEngineHours = getTripIdleTime(trip, idleEvents)
-      trip.stopDuration = i !== trips.length - 1 ? (new Date(trips[i + 1].startTime) - new Date(trip.endTime)) : 0
+      const stop = data.stops.find(s => s.deviceId === trip.deviceId && (new Date(s.startTime).getTime() === new Date(trip.endTime).getTime()))
+
+      trip.stopEngineHours = getTripIdleTime(trip, idleEvents) + (stop ? stop.engineHours : 0)
+      trip.stopDuration = (i !== trips.length - 1 ? (new Date(trips[i + 1].startTime) - new Date(trip.endTime)) : (to - new Date(trip.endTime))) - trip.stopEngineHours
     })
 
     if (trips.length > 0) {

package/src/util/driver.js

@@ -25,11 +25,9 @@ async function reportByDriver (devices, traccar, from, to, userData, processor)
 
   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
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, true, true, false, deviceCount, devices.length)
 
-    const results = processor(from, to, userData, { trips: tripsData, route: routeData })
+    const results = processor(from, to, userData, { trips: allInOne.trips, route: allInOne.route, stops: allInOne.stops })
 
     report.drivers.push(...results)