fleetmap-reports 1.0.716 → 1.0.717

package/package.json

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

package/src/activity-report.js

@@ -191,7 +191,9 @@ function processDevices (from, to, devices, data, userData) {
               endOdometer: 0,
               startOdometer: 0,
               startTime: tripsByDay.length && tripsByDay[0].startTime,
-              endTime: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endTime
+              startAddress: tripsByDay.length && tripsByDay[0].startAddress,
+              endTime: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endTime,
+              endAddress: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endAddress
             })
           }
         } else {
@@ -204,7 +206,9 @@ function processDevices (from, to, devices, data, userData) {
             summaryCurrentDay.distance = distance
             summaryCurrentDay.convertedSpentFuel = automaticReports.calculateSpentFuel(summaryCurrentDay.spentFuel, d)
             summaryCurrentDay.startTime = tripsByDay.length && tripsByDay[0].startTime
+            summaryCurrentDay.startAddress = tripsByDay.length && tripsByDay[0].startAddress
             summaryCurrentDay.endTime = tripsByDay.length && tripsByDay[tripsByDay.length - 1].endTime
+            summaryCurrentDay.endAddress = tripsByDay.length && tripsByDay[tripsByDay.length - 1].endAddress
 
             summary.push(summaryCurrentDay)
           }
@@ -225,7 +229,9 @@ function processDevices (from, to, devices, data, userData) {
           startOdometer: trips.length ? trips[0].startOdometer : 0,
           endOdometer: trips.length ? trips[trips.length - 1].endOdometer : 0,
           startTime: trips.length && trips[0].startTime,
-          endTime: trips.length && trips[trips.length - 1].endTime
+          startAddress: trips.length && trips[0].startAddress,
+          endTime: trips.length && trips[trips.length - 1].endTime,
+          endAddress: trips.length && trips[trips.length - 1].endAddress
         })
       } else {
         summary.push(...data.summaries.filter(s => s.deviceId === d.id))
@@ -236,7 +242,9 @@ function processDevices (from, to, devices, data, userData) {
             s.distance = deviceTrips.reduce((a, b) => a + b.distance, 0)
             s.convertedSpentFuel = automaticReports.calculateSpentFuel(s.spentFuel, d)
             s.startTime = deviceTrips.length && deviceTrips[0].startTime
+            s.startAddress = deviceTrips.length && deviceTrips[0].startAddress
             s.endTime = deviceTrips.length && deviceTrips[deviceTrips.length - 1].endTime
+            s.endAddress = deviceTrips.length && deviceTrips[deviceTrips.length - 1].endAddress
           })
         }
       }
@@ -246,7 +254,10 @@ function processDevices (from, to, devices, data, userData) {
       device: d,
       summary
     }
-    devicesResult.push(deviceData)
+
+    if ((deviceData.summary.length && deviceData.summary[0].startTime) || !userData.onlyWithActivity) {
+      devicesResult.push(deviceData)
+    }
   })
 
   return devicesResult
@@ -279,7 +290,9 @@ function processDrivers (from, to, drivers, data, userData) {
             maxSpeed: tripsByDay.reduce((a, b) => Math.max(a, b.maxSpeed), 0),
             averageSpeed: tripsByDay.length ? Math.round(tripsByDay.reduce((a, b) => a + b.averageSpeed, 0) / tripsByDay.length) : 0,
             startTime: tripsByDay.length && tripsByDay[0].startTime,
-            endTime: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endTime
+            startAddress: tripsByDay.length && tripsByDay[0].startAddress,
+            endTime: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endTime,
+            endAddress: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endAddress
           })
         }
       } else {
@@ -289,7 +302,9 @@ function processDrivers (from, to, drivers, data, userData) {
           maxSpeed: trips.reduce((a, b) => Math.max(a, b.maxSpeed), 0),
           averageSpeed: Math.round(trips.reduce((a, b) => a + b.averageSpeed, 0) / trips.length),
           startTime: trips.length && trips[0].startTime,
-          endTime: trips.length && trips[trips.length - 1].endTime
+          startAddress: trips.length && trips[0].startAddress,
+          endTime: trips.length && trips[trips.length - 1].endTime,
+          endAddress: trips.length && trips[trips.length - 1].endAddress
         })
       }
       driversResult.push(driverData)