fleetmap-reports 1.0.363 → 1.0.366

package/package.json

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

package/src/activity-report.js

@@ -205,7 +205,7 @@ function processDevices(from, to, devices, data, userData) {
                     s.distance = deviceTrips.reduce((a, b) => a + b.distance, 0)
                     s.convertedSpentFuel = automaticReports.calculateSpentFuel(s.spentFuel, d)
                     s.startTime = deviceTrips.length && deviceTrips[0].startTime
-                    s.endTime =  uncompletedTripRoute.length ? uncompletedTripRoute[uncompletedTripRoute.length-1].fixTime : (deviceTrips.length && deviceTrips[deviceTrips.length-1].endTime)
+                    s.endTime = deviceTrips.length && deviceTrips[deviceTrips.length-1].endTime
                 })
             }
         }

package/src/speeding-report.js

@@ -95,7 +95,7 @@ async function createSpeedingReportByDevice(from, to, userData, traccarInstance)
   }
 }
 
-async function createSpeedingReportByDriver(from, to, userData) {
+async function createSpeedingReportByDriver(from, to, userData, traccarInstance) {
   const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
   console.log('Devices with driver',devices.length)
 

package/src/util/trips.js

@@ -163,8 +163,8 @@ function calculateTrip(device, route) {
         deviceId: device.id,
         deviceName: device.name,
         distance: route.reduce((a, b) => a + b.attributes.distance, 0),
-        averageSpeed: Math.round((route.reduce((a, b) => a.speed + b.speed, 0)) / route.length),
-        maxSpeed: route.reduce(function (p1, p2) { return Math.max(p1.speed, p2.speed) }).speed,
+        averageSpeed: Math.round((route.map(p => p.speed).reduce((a, b) => a + b, 0)) / route.length),
+        maxSpeed: route.map(p => p.speed).reduce(function (a, b) { return Math.max(a, b) }),
         spentFuel: 0,
         startOdometer: startPos.attributes.odometer || startPos.attributes.totalDistance,
         endOdometer: endPos.attributes.odometer || endPos.attributes.totalDistance,
@@ -174,6 +174,11 @@ function calculateTrip(device, route) {
         startLon: startPos.longitude,
         startTime: startPos.fixTime,
         startAddress: startPos.address,
+        endLat: endPos.latitude,
+        endLon: endPos.longitude,
+        endTime: endPos.fixTime,
+        endAddress: endPos.address,
+        endTimeIsOut: true,
         duration: new Date(endPos.fixTime).getTime() - new Date(startPos.fixTime).getTime(),
         driverUniqueId: null,
         driverName: null