fleetmap-reports 1.0.937 → 1.0.938

package/package.json

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

package/src/activity-report.js

@@ -12,7 +12,7 @@ const {
 const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const traccar = require('./util/traccar')
-const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay } = require('./util/trips')
+const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, getKms } = require('./util/trips')
 const { devicesToProcess } = require('./util/device')
 const { getDriverData } = require('./util/driver')
 const { calculateConsumption } = require('./util/fuel')
@@ -178,8 +178,7 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
       const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
       for (const date of dates) {
         const { tripsByDay, routeByDay } = await getDataByDay(d, date, { trips, route: deviceRoute }, userData, traccarInstance)
-
-        const distance = tripsByDay.reduce((a, b) => a + b.distance, 0)
+        const distance = getKms(tripsByDay)
         if (!userData.allWeek && userData.weekDays && userData.dayHours) {
           if (weekDaySelected(date, userData.weekDays)) {
             summary.push({
@@ -222,7 +221,7 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
     } else {
       if (!userData.allWeek && userData.weekDays && userData.dayHours) {
         const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
-        const distance = trips.reduce((a, b) => a + b.distance, 0)
+        const distance = getKms(trips)
         summary.push({
           deviceId: d.id,
           averageSpeed: distance > 0 ? ((trips.reduce((a, b) => a + (b.averageSpeed * b.distance), 0)) / distance) : 0,
@@ -244,7 +243,7 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
         if (summary.length) {
           summary.forEach(s => {
             s.engineHours = deviceTrips.reduce((a, b) => a + b.duration, 0)
-            s.distance = deviceTrips.reduce((a, b) => a + b.distance, 0)
+            s.distance = getKms(deviceTrips)
             s.convertedSpentFuel = calculateConsumption(d, { route: deviceRoute, summary: s })
             s.startTime = deviceTrips.length && deviceTrips[0].startTime
             s.startAddress = deviceTrips.length && deviceTrips[0].startAddress

package/src/kms-report.js

@@ -9,7 +9,7 @@ const { getUserPartner } = require('fleetmap-partners')
 const traccar = require('./util/traccar')
 const { getDates, getTranslations, isClientSide, executeServerSide } = require('./util/utils')
 const drivers = require('./util/driver')
-const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, checkTripsKms } = require('./util/trips')
+const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, checkTripsKms, getKms } = require('./util/trips')
 const traccarHelper = require('./util/traccar')
 const { devicesToProcess } = require('./util/device')
 const { getDriverData } = require('./util/driver')
@@ -178,10 +178,9 @@ 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: odometerKms > 0 ? odometerKms : tripsByDay.reduce((a, b) => a + b.distance, 0)
+            kms: getKms(tripsByDay)
           }
         }))
 
@@ -193,13 +192,12 @@ 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: odometerKms > 0 ? odometerKms : trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
+          distance: getKms(trips)
         }
       })
     }

package/src/util/trips.js

@@ -129,6 +129,11 @@ async function getDataByDay (device, date, data, userData, traccarInstance) {
   return { tripsByDay, routeByDay }
 }
 
+function getKms (trips) {
+  const odometerKms = trips.length > 0 ? trips[trips.length - 1].endOdometer - trips[0].startOdometer : 0
+  return odometerKms > 0 ? odometerKms : trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
+}
+
 function isInsideTimetable (t, userData) {
   return isInside(t.startTime, t.endTime, userData)
 }
@@ -199,6 +204,7 @@ exports.checkTripsKms = checkTripsKms
 exports.isInsideTimetable = isInsideTimetable
 exports.isPartialInsideTimetable = isPartialInsideTimetable
 exports.getDataByDay = getDataByDay
+exports.getKms = getKms
 exports.calculatePartialTrip = calculatePartialTrip
 exports.calculateTrip = calculateTrip
 exports.getTripIdleTime = getTripIdleTime