fleetmap-reports 2.0.131 → 2.0.133

package/package.json

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

package/src/kms-report.js

@@ -9,11 +9,15 @@ 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'
 
@@ -118,7 +122,7 @@ async function createKmsReportByDriver (from, to, userData, traccarInstance) {
       report.drivers = drivers
     })
   } else {
-    const results = await reportByDriver(userData.devices, traccarInstance, from, to, userData, processDrivers, { route: !userData.allWeek, trips: true, stops: false, summary: false })
+    const results = await reportByDriver(userData.devices, traccarInstance, from, to, userData, processDrivers, { route: !userData.allWeek || userData.byDriver, trips: true, stops: true, summary: false })
 
     results.drivers.forEach(result => {
       const driver = report.drivers.find(d => d.driver.id === result.driver.id)
@@ -201,7 +205,13 @@ 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(new Date(b.endTime), data.stops.filter(s => s.deviceId === b.deviceId)),
+              data.route.filter(r => r.deviceId === b.deviceId)
+            ), 0
+          ) * 1000
         }
       }
       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