fleetmap-reports 2.0.119 → 2.0.121

package/package.json

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

package/src/kms-report.js

@@ -79,17 +79,19 @@ async function createKmsReportByDevice (from, to, userData, traccarInstance) {
       const sliced = automaticReports.sliceArray(allDevices,
         20)
       for (const devices of sliced) {
-        const needRoute = !userData.allWeek
+        const needRoute = userData.groupByDay || !userData.allWeek
         const {
           trips,
-          route
-        } = await traccar.getAllInOne(traccarInstance, from, to, devices, needRoute, true, false, false, deviceCount, allDevices.length, 10, 2)
+          route,
+          summary
+        } = await traccar.getAllInOne(traccarInstance, from, to, devices, needRoute, true, false, !userData.groupByDay, deviceCount, allDevices.length, 10, 2)
 
         // Process report data
         if (trips.length) {
           allData.devices = allData.devices.concat(await processDevices(from, to, devices, {
             trips,
-            route
+            route,
+            summary
           }, userData, traccarInstance))
         }
         deviceCount += devices.length
@@ -228,7 +230,6 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
 
     if (userData.groupByDay) {
       if (trips.length > 0) {
-        const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
         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)
@@ -246,13 +247,10 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
         })
       }
     } else {
+      const summary = data.summary.find(s => s.deviceId === d.id)
       devicesResult.push({
         device: d,
-        summary: {
-          startOdometer: trips.length ? trips[0].startOdometer : 0,
-          endOdometer: trips.length ? trips[trips.length - 1].endOdometer : 0,
-          distance: getKms(trips)
-        }
+        summary
       })
     }
   }

package/src/partnerReports/performance-report.js

@@ -144,7 +144,7 @@ function getDeviceData (allInOne, d) {
     const deviceStops = allInOne.stops.filter(t => t.deviceId === d.id)
 
     const drivingTime = deviceTrips.reduce((a, b) => a + b.duration, 0)
-    const drivingConsumption = calculateConsumption(d, { trips: deviceTrips, stops: [], route: deviceRoute, summary: deviceSummary }, undefined)
+    const drivingConsumption = calculateConsumption(d, { trips: deviceTrips, stops: [], route: deviceRoute, summary: deviceSummary })
     const drivingDistance = deviceSummary ? deviceSummary.distance / 1000 : 0
     const idleTime = deviceTrips.reduce((a, b) => a + (b.idleTime ? b.idleTime : 0), 0) + deviceStops.reduce((a, b) => a + b.engineHours, 0)
     const idleConsumption = deviceSummary && deviceSummary.spentFuel > drivingConsumption ? deviceSummary.spentFuel - drivingConsumption : 0

package/src/util/fuel.js

@@ -25,13 +25,14 @@ function getRefuelingLiters (d, position, diff) {
   return Math.round(diff * d.attributes.fuel_tank_capacity / 100)
 }
 
-function calculateConsumption (d, data, avgConsumption) {
+function calculateConsumption (d, data) {
   let fuelConsumption = 0
   const withFuelUsed = data.route && data.route.find(p => p.attributes.fuelUsed)
   if (data.summary) {
     fuelConsumption = calculateSpentFuel(data.summary.spentFuel, d, withFuelUsed)
-  } else if (data.trips && data.stops) {
-    const spentFuel = data.trips.reduce((a, b) => a + b.spentFuel, 0) + data.stops.reduce((a, b) => a + b.spentFuel, 0)
+  }
+  if (fuelConsumption <= 0 && data.trips && data.stops) {
+    const spentFuel = data.trips.reduce((a, b) => a + (b.spentFuel > 0 ? b.spentFuel : 0), 0) + data.stops.reduce((a, b) => a + (b.spentFuel > 0 ? b.spentFuel : 0), 0)
     fuelConsumption = calculateSpentFuel(spentFuel, d, withFuelUsed)
   } else if (data.route && data.route.length > 1 && data.route[0].attributes.fuelUsed) {
     fuelConsumption = data.route[data.route.length - 1].attributes.fuelUsed - data.route[0].attributes.fuelUsed