fleetmap-reports 1.0.936 → 1.0.937

package/package.json

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

package/src/kms-report.js

@@ -178,9 +178,10 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
         const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
         const days = await Promise.all(dates.map(async date => {
           const { tripsByDay } = await getDataByDay(d, date, { trips }, userData, traccarInstance)
+          const odometerKms = tripsByDay.length > 0 ? tripsByDay[tripsByDay.length - 1].endOdometer - tripsByDay[0].startOdometer : 0
           return {
             date,
-            kms: tripsByDay.reduce((a, b) => a + b.distance, 0)
+            kms: odometerKms > 0 ? odometerKms : tripsByDay.reduce((a, b) => a + b.distance, 0)
           }
         }))
 
@@ -192,12 +193,13 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
         })
       }
     } else {
+      const odometerKms = trips.length > 0 ? trips[trips.length - 1].endOdometer - trips[0].startOdometer : 0
       devicesResult.push({
         device: d,
         summary: {
           startOdometer: trips.length ? trips[0].startOdometer : 0,
           endOdometer: trips.length ? trips[trips.length - 1].endOdometer : 0,
-          distance: trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
+          distance: odometerKms > 0 ? odometerKms : trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
         }
       })
     }