fleetmap-reports 1.0.456 → 1.0.459

package/package.json

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

package/src/location-report.js

@@ -330,6 +330,9 @@ function exportLocationReportToExcel (userData, reportData) {
     headers.push({ label: translations.report.temperature, value: 'temperature' })
   }
 
+  headers.push({ label: 'latitude', value: 'latitude' })
+  headers.push({ label: 'longitude', value: 'longitude' })
+
   let data = []
   if (positionsData) {
     if (userData.includeDigitalPorts) {
@@ -349,7 +352,9 @@ function exportLocationReportToExcel (userData, reportData) {
           driver: userData.byDriver ? d.driver.name : getDriverName(a, userData.drivers),
           temperature: getTempValue(a),
           digitalport1: getDigitalPortValue(a, 1, translations),
-          digitalport2: getDigitalPortValue(a, 2, translations)
+          digitalport2: getDigitalPortValue(a, 2, translations),
+          latitude: a.latitude,
+          longitude: a.longitude
         }
       }))
     })

package/src/trip-report.js

@@ -135,6 +135,9 @@ async function createTripReportByDriver (from, to, userData, traccar) {
     d.totalDistance = d.trips.reduce((a, b) => a + b.distance, 0)
     d.maxSpeed = d.trips.reduce((a, b) => { return a > b.maxSpeed ? a : b.maxSpeed }, 0)
     d.trips = d.trips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
+    d.trips.forEach(function (trip, i) {
+      trip.stopDuration = i !== d.trips.length - 1 ? (new Date(d.trips[i + 1].startTime) - new Date(trip.endTime)) : 0
+    })
   })
 
   return report