fleetmap-reports 1.0.458 → 1.0.462

package/package.json

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

package/src/activity-report.js

@@ -196,6 +196,7 @@ function processDevices (from, to, devices, data, userData) {
           })
 
           if (summaryCurrentDay) {
+            summaryCurrentDay.engineHours = tripsByDay.reduce((a, b) => a + b.duration, 0)
             summaryCurrentDay.distance = distance
             summaryCurrentDay.convertedSpentFuel = automaticReports.calculateSpentFuel(summaryCurrentDay.spentFuel, d)
             summaryCurrentDay.startTime = tripsByDay.length && tripsByDay[0].startTime
@@ -227,6 +228,7 @@ function processDevices (from, to, devices, data, userData) {
 
         if (summary.length) {
           summary.forEach(s => {
+            s.engineHours = deviceTrips.reduce((a, b) => a + b.duration, 0)
             s.distance = deviceTrips.reduce((a, b) => a + b.distance, 0)
             s.convertedSpentFuel = automaticReports.calculateSpentFuel(s.spentFuel, d)
             s.startTime = deviceTrips.length && deviceTrips[0].startTime

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)
       })
 
@@ -323,13 +326,18 @@ function exportLocationReportToExcel (userData, reportData) {
         { label: translations.report.address, value: 'address' },
         { label: translations.report.speed, value: 'speed' },
         { label: translations.report.ignition, value: 'ignition' },
-        { label: translations.report.driver, value: 'driver' }
+        { label: translations.report.driver, value: 'driver' },
+        { label: 'Latitude', value: 'latitude' },
+        { label: 'Longitude', value: 'longitude' }
       ]
 
   if (userData.includeTemperature) {
     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 +357,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
         }
       }))
     })