fleetmap-reports 1.0.457 → 1.0.461

package/package.json

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

package/src/location-report.js

@@ -188,6 +188,8 @@ async function exportLocationReportToPDF (userData, reportData) {
       headers.push(getDigitalPort1Label(userData.byDriver ? positionsData[0].driver : positionsData[0].device, translations))
       headers.push(getDigitalPort2Label(userData.byDriver ? positionsData[0].driver : positionsData[0].device, translations))
     }
+    headers.push('Latitude')
+    headers.push('Longitude')
 
     let first = true
     // eslint-disable-next-line new-cap
@@ -228,7 +230,8 @@ async function exportLocationReportToPDF (userData, reportData) {
           temp.push(getDigitalPortValue(a, 1, translations))
           temp.push(getDigitalPortValue(a, 2, translations))
         }
-
+        temp.push(a.latitude)
+        temp.push(a.longitude)
         data.push(temp)
       })
 
@@ -330,6 +333,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 +355,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

@@ -134,6 +134,10 @@ async function createTripReportByDriver (from, to, userData, traccar) {
     d.totalDuration = d.trips.reduce((a, b) => a + b.duration, 0)
     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
@@ -214,8 +218,6 @@ function processDrivers (from, to, userData, data) {
     const trips = data.trips.filter(t => t.driverUniqueId === d.uniqueId &&
             (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
 
-    trips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
-
     const idleEvents = getIdleEvents(data.route, d)
 
     trips.forEach(function (trip, i) {