fleetmap-reports 1.0.368 → 1.0.369

package/package.json

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

package/src/kms-report.js

@@ -9,6 +9,7 @@ const {getDates, convertFromUTC} = require("./util/utils")
 const trips = require("./util/trips")
 const drivers = require("./util/driver")
 const { isInsideTimetable, isPartialInsideTimetable, calculateTrip} = require("./util/trips")
+const traccarHelper = require("./util/traccar");
 
 const fileName = 'KmsReport'
 
@@ -46,14 +47,15 @@ async function createKmsReportByDevice(from, to, userData, traccarInstance) {
     }
 
     devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
-    const route = await traccar.getRoute(traccarInstance, from, to, devicesToProcess)
-    const tripsData = await traccar.getTrips(traccarInstance, from, to, devicesToProcess)
+    const allInOne =  await traccarHelper.getAllInOne(traccarInstance, from, to, devicesToProcess, true, true, false, false)
+    const tripsData = allInOne.trips
+    const routeData = allInOne.route
 
     console.log('trips:' + tripsData.length)
 
     if (tripsData.length > 0) {
-        trips.checkTripsKms(traccarInstance, from, to, devicesToProcess, {trips: tripsData, route: route})
-        allData.devices = processDevices(from, to, devicesToProcess, {trips: tripsData, route: route}, userData)
+        trips.checkTripsKms(traccarInstance, from, to, devicesToProcess, {trips: tripsData, route: routeData})
+        allData.devices = processDevices(from, to, devicesToProcess, {trips: tripsData, route: routeData}, userData)
     }
 
     return allData
@@ -68,8 +70,10 @@ async function createKmsReportByDriver(from, to, userData, traccarInstance) {
         return { drivers: [] }
     }
 
-    const tripsData = await traccar.getTrips(traccarInstance, from, to, devices)
-    const routeData = await traccar.getRoute(traccarInstance, from, to, devices)
+    const allInOne =  await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, true, false, false)
+    const tripsData = allInOne.trips
+    const routeData = allInOne.route
+
 
     return { drivers: processDrivers(from, to, userData, {trips: tripsData, route: routeData}) }
 }