fleetmap-reports 1.0.311 → 1.0.315

package/package.json

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

package/src/activity-report.js

@@ -301,8 +301,8 @@ function exportActivityReportToPDF_Driver(doc, translations, reportData, userDat
 
     const footValues = ['Total:' + reportData.drivers.length,
         (reportData.drivers.reduce((a, b) => a + b.summary[0].distance, 0) / 1000).toFixed(0),
-        getSumAvgSpeed(reportData.drivers),
-        getSumMaxSpeed(reportData.drivers),
+        getSumAvgSpeed(reportData.drivers, userData),
+        getSumMaxSpeed(reportData.drivers, userData),
         convertMS(reportData.drivers.reduce((a, b) => a + b.summary[0].engineHours, 0))]
 
     const style = getStyle(getUserPartner(userData.user))
@@ -345,10 +345,10 @@ function exportActivityReportToPDF_Vehicle(doc, translations, reportData, userDa
         '',
         (reportData.devices.reduce((a, b) => a + b.summary[0].distance, 0) / 1000).toFixed(0),
         '', '',
-        getSumAvgSpeed(reportData.devices),
-        getSumMaxSpeed(reportData.devices),
+        getSumAvgSpeed(reportData.devices, userData),
+        getSumMaxSpeed(reportData.devices, userData),
         convertMS(reportData.devices.reduce((a, b) => a + b.summary[0].engineHours, 0)),
-        getSumSpentFuel(reportData.devices)]
+        getSumSpentFuel(reportData.devices, userData)]
 
     const style = getStyle(getUserPartner(userData.user))
     addTable(doc, headers, data, footValues, style, 35)
@@ -543,8 +543,8 @@ function exportActivityReportToPDF_Driver_GroupByDay(doc, translations, reportDa
 
         const footValues = ['Total:' + d.summary.length,
             (d.summary.reduce((a, b) => a + b.distance, 0) / 1000).toFixed(0),
-            getSumAvgSpeed(d.summary),
-            getSumMaxSpeed(d.summary),
+            getSumAvgSpeed(d.summary, userData),
+            getSumMaxSpeed(d.summary, userData),
             convertMS(d.summary.reduce((a, b) => a + b.engineHours, 0))]
 
         const style = getStyle(getUserPartner(userData.user))

package/src/events-report.js

@@ -46,7 +46,7 @@ async function createEventsReport(from, to, userData, traccar) {
 
     if(data.length > 0) {
         reportData.push({
-            devices: await processDevices(from, to, withoutGroupDevices, userData.geofences, userData.drivers, data),
+            devices: await processDevices(from, to, withoutGroupDevices, userData.geofences, userData.drivers, data, traccar),
             xpert: withoutGroupDevices.filter(d => d.attributes.xpert).length > 0
         })
     }
@@ -71,7 +71,7 @@ async function getReportData(from, to, devices, types, traccar) {
     return data
 }
 
-async function processDevices(from, to, devices, geofences, drivers, data) {
+async function processDevices(from, to, devices, geofences, drivers, data, traccar) {
     const devicesResult = []
 
     for (const d of devices) {

package/src/idle-report.js

@@ -18,7 +18,7 @@ async function createIdleReport(from, to, userData, traccarInstance) {
         reportData.push(...allData)
     } else {
         console.log("ByDevice")
-        const report = await createTripReportByDevice(from, to, userData, traccarInstance)
+        const report = await createTripReportByDevice(from, to, userData.devices, userData, traccarInstance)
         reportData.push(report)
     }
 

package/src/speeding-report.js

@@ -54,7 +54,7 @@ async function createSpeedingReportByGroup(from, to, userData, traccarInstance){
       devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
       if (events.length > 0) {
-        groupData.devices = await processDevices(from, to, devices, events, routes)
+        groupData.devices = await processDevices(from, to, devices, events, routes, userData)
         reportData.push(groupData)
       }
     }
@@ -75,7 +75,7 @@ async function createSpeedingReportByDevice(from, to, devices, userData, traccar
   const routes = await traccarHelper.getRoute(traccarInstance, from, to, devices)
   const events = []
   if(!userData.useVehicleSpeedLimit && userData.customSpeed){
-    events.push(...await getCustomSpeedLimitEvents(devices, routes))
+    events.push(...await getCustomSpeedLimitEvents(devices, routes, userData.customSpeed))
   } else {
     events.push(...await traccarHelper.getEvents(traccarInstance, from, to, devices, eventTypes))
   }
@@ -90,7 +90,7 @@ async function createSpeedingReportByDevice(from, to, devices, userData, traccar
   }
 
   return {
-    devices: await processDevices(from, to, devices, events, routes),
+    devices: await processDevices(from, to, devices, events, routes, userData),
     xpert: devices.filter(d => d && d.attributes && d.attributes.xpert).length > 0
   }
 }
@@ -107,7 +107,7 @@ async function createSpeedingReportByDriver(from, to, userData) {
   const routes = await traccarHelper.getRoute(traccarInstance, from, to, devices)
   const events = []
   if(!userData.useVehicleSpeedLimit && userData.customSpeed){
-    events.push(...await getCustomSpeedLimitEvents(devices, routes))
+    events.push(...await getCustomSpeedLimitEvents(devices, routes, userData.customSpeed))
   } else {
     events.push(...await traccarHelper.getEvents(traccarInstance, from, to, devices, eventTypes))
   }
@@ -198,10 +198,10 @@ async function findEventsPosition(from, to, devices, events, routes, userData){
   }
 }
 
-async function getCustomSpeedLimitEvents(devices, routes, userData){
+async function getCustomSpeedLimitEvents(devices, routes, customSpeed){
   console.log('custom speed limit events')
   const events = []
-  const maxSpeed = userData.customSpeed / 1.85200
+  const maxSpeed = customSpeed / 1.85200
 
   for (const d of devices) {
     const positions = routes.filter(p => p.deviceId === d.id)