fleetmap-reports 2.0.131 → 2.0.132

package/package.json

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

package/src/kms-report.js

@@ -9,11 +9,14 @@ const { getUserPartner } = require('fleetmap-partners')
 const traccar = require('./util/traccar')
 const { getDates, getTranslations, isClientSide, executeServerSide } = require('./util/utils')
 const driversUtil = require('./util/driver')
-const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, getKms } = require('./util/trips')
+const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, getKms,
+  getTripTotalKms
+} = require('./util/trips')
 const { devicesToProcess } = require('./util/device')
 const { getDriverData, reportByDriver } = require('./util/driver')
 const automaticReports = require('./automaticReports')
 const { getSummaryByDay } = require('./util/traccar')
+const { getStop } = require('./trip-report')
 
 const fileName = 'KmsReport'
 
@@ -201,7 +204,7 @@ async function processDrivers (from, to, userData, data) {
         }
       } else {
         driverData.summary = {
-          distance: trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
+          distance: trips.reduce((a, b) => a + getTripTotalKms(b, getStop(b.endTime, data.stops), data.route), 0)
         }
       }
       driversResult.push(driverData)

package/src/trip-report.js

@@ -623,6 +623,7 @@ function getStop (tripEndDate, stops) {
   return null
 }
 
+exports.getStop = getStop
 exports.createTripReport = createTripReport
 exports.exportTripReportToPDF = exportTripReportToPDF
 exports.exportTripReportToExcel = exportTripReportToExcel

package/src/util/driver.js

@@ -79,7 +79,7 @@ async function getDriverData (d, data, userData) {
   return {
     route,
     trips: filteredTrips,
-    events
+    events,
   }
 }