fleetmap-reports 1.0.310 → 1.0.314

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.310",
+  "version": "1.0.314",
   "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,12 +90,12 @@ 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
   }
 }
 
-async function createSpeedingReportByDriver(from, to) {
+async function createSpeedingReportByDriver(from, to, userData) {
   const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
   console.log('Devices with driver',devices.length)
 
@@ -107,7 +107,7 @@ async function createSpeedingReportByDriver(from, to) {
   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))
   }
@@ -121,13 +121,13 @@ async function createSpeedingReportByDriver(from, to) {
     return { drivers: [] }
   }
 
-  return {drivers: await processDrivers(from, to, events, routes)}
+  return {drivers: await processDrivers(from, to, events, routes, userData)}
 }
 
-async function processDrivers(from, to, events, routes) {
+async function processDrivers(from, to, events, routes, userData) {
   const driversResult = []
 
-  await findEventsPosition(from, to, userData.devices, events, routes)
+  await findEventsPosition(from, to, userData.devices, events, routes, userData)
 
   userData.drivers.forEach(d => {
     const driverEvents = events.filter(e => e.position && e.position.attributes.driverUniqueId === d.uniqueId)
@@ -148,9 +148,9 @@ async function processDrivers(from, to, events, routes) {
   return driversResult
 }
 
-async function processDevices(from, to, devices, events, routes) {
+async function processDevices(from, to, devices, events, routes, userData) {
   const devicesResult = []
-  await findEventsPosition(from, to, devices, events, routes)
+  await findEventsPosition(from, to, devices, events, routes, userData)
 
   for (const d of devices) {
     const deviceEvents = events.filter(e => e.deviceId === d.id && e.position)
@@ -171,7 +171,7 @@ async function processDevices(from, to, devices, events, routes) {
   return devicesResult
 }
 
-async function findEventsPosition(from, to, devices, events, routes){
+async function findEventsPosition(from, to, devices, events, routes, userData){
   for (const d of devices) {
     let deviceEvents = events.filter(e => e.deviceId === d.id && e.positionId)
     if (deviceEvents.length > 0) {
@@ -190,7 +190,7 @@ async function findEventsPosition(from, to, devices, events, routes){
           }
 
           a.position = positions[pIndex]
-          pIndex = calculateEventData(positions, pIndex, a, d, geofence)
+          pIndex = calculateEventData(positions, pIndex, a, d, geofence, userData)
           positions.slice(pIndex)
         }
       }
@@ -198,10 +198,10 @@ async function findEventsPosition(from, to, devices, events, routes){
   }
 }
 
-async function getCustomSpeedLimitEvents(devices, routes){
+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)
@@ -272,7 +272,7 @@ async function getHereEvents(devices, routes, threshold){
   return events
 }
 
-function calculateEventData(positions, pIndex, alert, device, geofence){
+function calculateEventData(positions, pIndex, alert, device, geofence, userData){
   let endEventPosition = alert.position
   let maxSpeed = alert.position.speed
   let dist = 0

package/src/trip-report.js

@@ -7,35 +7,35 @@ const drivers = require("./util/driver")
 const {getUserPartner} = require("fleetmap-partners")
 const {headerFromUser, addTable} = require("./util/pdfDocument")
 const {getStyle} = require("./reportStyle")
-const traccar = require("./util/traccar")
+const traccarHelper = require("./util/traccar")
 const trips = require("./util/trips");
 const {isInsideTimetable, addNearestPOIs, isPartialInsideTimetable} = require("./util/trips")
 
 const fileName = 'TripReport'
 
-async function createTripReport(from, to, userData, traccarInstance) {
+async function createTripReport(from, to, userData, traccar) {
     console.log('Create TripReport')
     const reportData = []
 
     if (userData.byDriver) {
         console.log("ByDriver")
-        const report = await createTripReportByDriver(from, to, userData, traccarInstance)
+        const report = await createTripReportByDriver(from, to, userData, traccar)
         reportData.push(report)
     }
     else if (userData.byGroup) {
         console.log("ByGroup")
-        const allData = await createTripReportByGroup(from, to, userData, traccarInstance)
+        const allData = await createTripReportByGroup(from, to, userData, traccar)
         reportData.push(...allData)
     } else {
         console.log("ByDevice")
-        const report = await createTripReportByDevice(from, to, userDatauserData, traccarInstance)
+        const report = await createTripReportByDevice(from, to, userData, traccar)
         reportData.push(report)
     }
 
     return reportData
 }
 
-async function createTripReportByDevice(from, to, userData, traccarInstance) {
+async function createTripReportByDevice(from, to, userData, traccar) {
     const devices = userData.devices
     const allData = {
         devices: [],
@@ -45,21 +45,21 @@ async function createTripReportByDevice(from, to, userData, traccarInstance) {
     devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
     const devicesToSlice = devices.slice()
-    const tripsData = await traccar.getTrips(traccarInstance, from, to, devicesToSlice)
-    const stopsData = await traccar.getStops(traccarInstance, from, to, devicesToSlice)
-    const routeData = await traccar.getRoute(traccarInstance, from, to, devicesToSlice)
+    const tripsData = await traccarHelper.getTrips(traccar, from, to, devicesToSlice)
+    const stopsData = await traccarHelper.getStops(traccar, from, to, devicesToSlice)
+    const routeData = await traccarHelper.getRoute(traccar, from, to, devicesToSlice)
 
     console.log('Trips:' + tripsData.length)
 
     if (tripsData.length > 0) {
-        trips.checkTripsKms(traccarInstance, from, to, devices, {trips: tripsData, route: routeData})
+        trips.checkTripsKms(traccar, from, to, devices, {trips: tripsData, route: routeData})
         allData.devices = processDevices(from, to, devices, {trips: tripsData, stops: stopsData, route: routeData}, userData)
     }
 
     return allData
 }
 
-async function createTripReportByGroup(from, to, userData, traccarInstance) {
+async function createTripReportByGroup(from, to, userData, traccar) {
     const reportData = []
     for (const g of userData.groups) {
         const devices = userData.devices.filter(d => d.groupId === g.id)
@@ -71,13 +71,13 @@ async function createTripReportByGroup(from, to, userData, traccarInstance) {
                 xpert: devices.filter(d => d.attributes.xpert).length > 0
             }
 
-            const response = await traccarInstance.reports.reportsTripsGet(from, to, null, [g.id])
+            const response = await traccar.reports.reportsTripsGet(from, to, null, [g.id])
             const tripsData = response.data
 
-            const stopsResponse = await traccarInstance.reports.reportsStopsGet(from, to, null, [g.id])
+            const stopsResponse = await traccar.reports.reportsStopsGet(from, to, null, [g.id])
             const stopsData = stopsResponse.data
 
-            const routeResponse = await traccarInstance.reports.reportsRouteGet(from, to, null, [g.id])
+            const routeResponse = await traccar.reports.reportsRouteGet(from, to, null, [g.id])
             const routeData = routeResponse.data
 
             devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
@@ -100,8 +100,8 @@ async function createTripReportByGroup(from, to, userData, traccarInstance) {
     return reportData
 }
 
-async function createTripReportByDriver(from, to, userData, traccarInstance){
-    const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
+async function createTripReportByDriver(from, to, userData, traccar){
+    const devices = await drivers.devicesByDriver(traccar, from, to, userData.drivers, userData.devices)
     console.log(devices.length)
 
     if(!devices.length){
@@ -109,8 +109,8 @@ async function createTripReportByDriver(from, to, userData, traccarInstance){
         return { drivers:[] }
     }
 
-    const tripsData = await traccar.getTrips(traccarInstance, from, to, devices)
-    const routeData = await traccar.getRoute(traccarInstance, from, to, devices)
+    const tripsData = await traccarHelper.getTrips(traccar, from, to, devices)
+    const routeData = await traccarHelper.getRoute(traccar, from, to, devices)
 
     return { drivers: processDrivers(from, to, userData, {trips: tripsData, route: routeData})}
 }