fleetmap-reports 2.0.30 → 2.0.32

package/package.json

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

package/src/kms-report.js

@@ -117,7 +117,7 @@ async function createKmsReportByDriver (from, to, userData, traccarInstance) {
       report.drivers = drivers
     })
   } else {
-    const results = await reportByDriver(userData.devices, traccarInstance, from, to, userData, processDrivers)
+    const results = await reportByDriver(userData.devices, traccarInstance, from, to, userData, processDrivers, { route: true, trips: true, stops: false, summary: false })
 
     results.drivers.forEach(result => {
       const driver = report.drivers.find(d => d.driver.id === result.driver.id)
@@ -177,10 +177,8 @@ async function createKmsReportByGroup (from, to, userData, traccarInstance) {
 
 async function processDrivers (from, to, userData, data) {
   const driversResult = []
-  const driversOnRoute = data.route ? new Set(data.route.map(p => p.attributes.driverUniqueId)) : new Set([])
-  const driverToProcess = userData.drivers.filter(d => driversOnRoute.has(d.uniqueId))
 
-  for (const d of driverToProcess) {
+  for (const d of userData.drivers) {
     const { trips } = await getDriverData(d, data, userData)
 
     if (trips.length > 0) {

package/src/tests/kms.test.js

@@ -53,11 +53,11 @@ describe('Kms_Reports', function () {
     assert.equal(device.days[29].kms, 136174.93281451002) // Total Kms
   }, 30000)
   it('KmsReport by driver', async () => {
-    const reports = await getReports()
+    const reports = await getReports(process.env.USER_CTM_MOVIFLOTTE, process.env.PASS_CTM_MOVIFLOTTE)
     const userData = await reports.getUserData()
     userData.byDriver = true
     console.log(userData.drivers)
-    const data = await reports.kmsReport(new Date(2024, 0, 24, 0, 0, 0), new Date(2024, 0, 24, 23, 59, 59),
+    const data = await reports.kmsReport(new Date(2024, 0, 1, 0, 0, 0), new Date(2024, 0, 31, 23, 59, 59),
         userData)
     assert.equal(data.length, 1)
   }, 3000000)

package/src/util/driver.js

@@ -22,14 +22,14 @@ async function devicesByDriver (traccarInstance, from, to, drivers, devices) {
   return { devices: devices.filter(d => deviceIds.includes(d.id)), drivers: drivers.filter(d => driversIds.includes(d.id)) }
 }
 
-async function reportByDriver (devices, traccar, from, to, userData, processor) {
+async function reportByDriver (devices, traccar, from, to, userData, processor, allInOneData = { route: true, trips: true, stops: true, summary: false }) {
   const report = { 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, true, false, deviceCount, devices.length)
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, allInOneData.route, allInOneData.trips, allInOneData.stops, allInOneData.summary, deviceCount, devices.length)
     const results = await processor(from, to, userData, { trips: allInOne.trips, route: allInOne.route, stops: allInOne.stops })
     report.drivers.push(...results)
     deviceCount = deviceCount + slice.length

package/src/util/utils.js

@@ -127,7 +127,7 @@ function getDates (startDate, endDate, timezone) {
 }
 
 function getImage (url) {
-  return require('axios').get(url, { responseType: 'arraybuffer' }).then(d => d.data)
+  return require('axios').default.get(url, { responseType: 'arraybuffer' }).then(d => d.data)
 }
 
 async function getImageBase64 (url) {