fleetmap-reports 2.0.118 → 2.0.120

package/package.json

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

package/src/activity-report.js

@@ -256,7 +256,6 @@ 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 = 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

@@ -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
       })
     }
   }