fleetmap-reports 1.0.454 → 1.0.457

package/package.json

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

package/src/activity-report.js

@@ -125,7 +125,7 @@ async function createActivityReportByDevice (from, to, userData, traccarInstance
 }
 
 async function createActivityReportByDriver (from, to, userData, traccarInstance) {
-  const devices = await traccar.devices.devicesGet().then(d => d.data)
+  const devices = await traccarInstance.devices.devicesGet().then(d => d.data)
 
   let tripsData = []
   let routeData = []
@@ -252,6 +252,7 @@ function processDrivers (from, to, drivers, data, 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)
+    trips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
     if (trips.length > 0) {
       const driverData = {
         driver: d,

package/src/trip-report.js

@@ -134,7 +134,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())
   })
 
   return report
@@ -215,6 +214,8 @@ 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) {