fleetmap-reports 1.0.799 → 1.0.801

package/package.json

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

package/src/activity-report.js

@@ -166,6 +166,7 @@ function processDevices (from, to, devices, data, userData) {
         const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
 
         const tripsByDay = trips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay))
+        const routeByDay = trips.filter(p => (new Date(p.fixTime) > fromByDay && new Date(p.fixTime) < toByDay))
         const distance = tripsByDay.reduce((a, b) => a + b.distance, 0)
 
         if (!userData.allWeek && userData.weekDays && userData.dayHours) {
@@ -193,7 +194,7 @@ function processDevices (from, to, devices, data, userData) {
           summaryCurrentDay.distance = distance
           summaryCurrentDay.averageSpeed = distance > 0 ? ((trips.reduce((a, b) => a + (b.averageSpeed * b.distance), 0)) / distance) : 0
           summaryCurrentDay.maxSpeed = tripsByDay.reduce((a, b) => { return a > b.maxSpeed ? a : b.maxSpeed }, 0)
-          summaryCurrentDay.convertedSpentFuel = calculateConsumption(d, { route: deviceRoute })
+          summaryCurrentDay.convertedSpentFuel = calculateConsumption(d, { route: routeByDay })
           summaryCurrentDay.startTime = tripsByDay.length && tripsByDay[0].startTime
           summaryCurrentDay.startAddress = tripsByDay.length && tripsByDay[0].startAddress
           summaryCurrentDay.endTime = tripsByDay.length && tripsByDay[tripsByDay.length - 1].endTime
@@ -244,7 +245,7 @@ function processDevices (from, to, devices, data, userData) {
       summary
     }
 
-    if ((deviceData.summary.length && deviceData.summary[0].startTime) || !userData.onlyWithActivity) {
+    if ((deviceData.summary.length && deviceData.summary.some(s => s.startTime)) || !userData.onlyWithActivity) {
       devicesResult.push(deviceData)
     }
   })