fleetmap-reports 1.0.715 → 1.0.717

package/package.json

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

package/src/activity-report.js

@@ -191,7 +191,9 @@ function processDevices (from, to, devices, data, userData) {
               endOdometer: 0,
               startOdometer: 0,
               startTime: tripsByDay.length && tripsByDay[0].startTime,
-              endTime: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endTime
+              startAddress: tripsByDay.length && tripsByDay[0].startAddress,
+              endTime: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endTime,
+              endAddress: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endAddress
             })
           }
         } else {
@@ -204,7 +206,9 @@ function processDevices (from, to, devices, data, userData) {
             summaryCurrentDay.distance = distance
             summaryCurrentDay.convertedSpentFuel = automaticReports.calculateSpentFuel(summaryCurrentDay.spentFuel, d)
             summaryCurrentDay.startTime = tripsByDay.length && tripsByDay[0].startTime
+            summaryCurrentDay.startAddress = tripsByDay.length && tripsByDay[0].startAddress
             summaryCurrentDay.endTime = tripsByDay.length && tripsByDay[tripsByDay.length - 1].endTime
+            summaryCurrentDay.endAddress = tripsByDay.length && tripsByDay[tripsByDay.length - 1].endAddress
 
             summary.push(summaryCurrentDay)
           }
@@ -225,7 +229,9 @@ function processDevices (from, to, devices, data, userData) {
           startOdometer: trips.length ? trips[0].startOdometer : 0,
           endOdometer: trips.length ? trips[trips.length - 1].endOdometer : 0,
           startTime: trips.length && trips[0].startTime,
-          endTime: trips.length && trips[trips.length - 1].endTime
+          startAddress: trips.length && trips[0].startAddress,
+          endTime: trips.length && trips[trips.length - 1].endTime,
+          endAddress: trips.length && trips[trips.length - 1].endAddress
         })
       } else {
         summary.push(...data.summaries.filter(s => s.deviceId === d.id))
@@ -236,7 +242,9 @@ function processDevices (from, to, devices, data, userData) {
             s.distance = deviceTrips.reduce((a, b) => a + b.distance, 0)
             s.convertedSpentFuel = automaticReports.calculateSpentFuel(s.spentFuel, d)
             s.startTime = deviceTrips.length && deviceTrips[0].startTime
+            s.startAddress = deviceTrips.length && deviceTrips[0].startAddress
             s.endTime = deviceTrips.length && deviceTrips[deviceTrips.length - 1].endTime
+            s.endAddress = deviceTrips.length && deviceTrips[deviceTrips.length - 1].endAddress
           })
         }
       }
@@ -246,7 +254,10 @@ function processDevices (from, to, devices, data, userData) {
       device: d,
       summary
     }
-    devicesResult.push(deviceData)
+
+    if ((deviceData.summary.length && deviceData.summary[0].startTime) || !userData.onlyWithActivity) {
+      devicesResult.push(deviceData)
+    }
   })
 
   return devicesResult
@@ -279,7 +290,9 @@ function processDrivers (from, to, drivers, data, userData) {
             maxSpeed: tripsByDay.reduce((a, b) => Math.max(a, b.maxSpeed), 0),
             averageSpeed: tripsByDay.length ? Math.round(tripsByDay.reduce((a, b) => a + b.averageSpeed, 0) / tripsByDay.length) : 0,
             startTime: tripsByDay.length && tripsByDay[0].startTime,
-            endTime: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endTime
+            startAddress: tripsByDay.length && tripsByDay[0].startAddress,
+            endTime: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endTime,
+            endAddress: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endAddress
           })
         }
       } else {
@@ -289,7 +302,9 @@ function processDrivers (from, to, drivers, data, userData) {
           maxSpeed: trips.reduce((a, b) => Math.max(a, b.maxSpeed), 0),
           averageSpeed: Math.round(trips.reduce((a, b) => a + b.averageSpeed, 0) / trips.length),
           startTime: trips.length && trips[0].startTime,
-          endTime: trips.length && trips[trips.length - 1].endTime
+          startAddress: trips.length && trips[0].startAddress,
+          endTime: trips.length && trips[trips.length - 1].endTime,
+          endAddress: trips.length && trips[trips.length - 1].endAddress
         })
       }
       driversResult.push(driverData)

package/src/trip-report.js

@@ -1,6 +1,9 @@
 const automaticReports = require('./automaticReports')
 const jsPDF = require('jspdf')
-const { convertMS, convertToLocaleString, convertToLocaleDateString, convertToLocaleTimeString, getTranslations } = require('./util/utils')
+const {
+  convertMS, convertToLocaleString, convertToLocaleDateString, convertToLocaleTimeString, getTranslations,
+  isClientSide
+} = require('./util/utils')
 require('jspdf-autotable')
 const { getUserPartner } = require('fleetmap-partners')
 const { headerFromUser, addTable } = require('./util/pdfDocument')
@@ -12,6 +15,7 @@ const { devicesToProcess, deviceName } = require('./util/device')
 const { getIdleEvents } = require('./util/route')
 const { reportByDriver, getDriverName, getDriverData } = require('./util/driver')
 const { getNearestPOIs } = require('./util/geofence')
+const { parallel } = require('./util/parallel')
 
 const fileName = 'TripReport'
 
@@ -212,16 +216,29 @@ function processDevices (from, to, devices, data, userData, traccar) {
   return devicesResult
 }
 
-function processDrivers (from, to, userData, data) {
-  console.log(data)
+function calculateIdleEvents (drivers, route) {
+  const idleEvents = []
+  drivers.forEach(d => {
+    idleEvents.push(...getIdleEvents(route, d))
+  })
+  return idleEvents
+}
+
+async function processDrivers (from, to, userData, data) {
   const driversResult = []
+
+  const idleEvents = []
+  if (isClientSide()) {
+    idleEvents.push(...(calculateIdleEvents(userData.drivers, data.route)))
+  } else {
+    idleEvents.push(...(await parallel('trip-report', 'calculateIdleEvents', userData.drivers, data.route)))
+  }
+
   userData.drivers.forEach(d => {
     const { route, trips } = getDriverData(d, data)
     const filteredTrips = trips.filter(t => (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
     filteredTrips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
 
-    const idleEvents = getIdleEvents(data.route, d)
-
     filteredTrips.forEach(function (trip, i) {
       trip.totalKms = trip.distance / 1000
 

package/src/util/driver.js

@@ -27,7 +27,7 @@ async function reportByDriver (devices, traccar, from, to, userData, processor)
   for (const slice of sliced) {
     const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, true, true, false, deviceCount, devices.length)
 
-    const results = processor(from, to, userData, { trips: allInOne.trips, route: allInOne.route, stops: allInOne.stops })
+    const results = await processor(from, to, userData, { trips: allInOne.trips, route: allInOne.route, stops: allInOne.stops })
 
     report.drivers.push(...results)
 

package/src/util/parallel.js

@@ -1,37 +1,41 @@
 const { sliceArray } = require('../automaticReports')
-const cluster = require('cluster')
 const path = require('path')
 
-exports.parallel = (report, method, devices, route, userData) => {
-  const numCPUs = require('os').cpus().length
-  return new Promise((resolve) => {
-    if (cluster.isPrimary) {
-      console.log(`Master ${process.pid} is running`, process.cwd())
-      cluster.setupPrimary({
-        exec: path.resolve(__dirname, 'worker.js')
-      })
-      const sliced = sliceArray(devices, numCPUs)
-      const _result = []
-      let done = 0
-      sliced.forEach((_devices) => {
-        const worker = cluster.fork()
-        worker.send({
-          report,
-          method,
-          args: [_devices, route.filter(p => _devices.find(d => d.id === p.deviceId)), userData]
+exports.parallel = (report, method, toSlice, ...args) => {
+  try {
+    const cluster = require('cluster')
+    const numCPUs = require('os').cpus().length
+    return new Promise((resolve) => {
+      if (cluster.isPrimary) {
+        console.log(`Master ${process.pid} is running`, process.cwd())
+        cluster.setupPrimary({
+          exec: path.resolve(__dirname, 'worker.js')
         })
-        worker.on('message', ({ result }) => {
-          console.log('Received result from worker', worker.process.pid)
-          _result.push(result)
-          if (++done === sliced.length) {
-            resolve(_result.flat())
-          }
+        const sliced = sliceArray(toSlice, numCPUs)
+        const _result = []
+        let done = 0
+        sliced.forEach((slice) => {
+          const worker = cluster.fork()
+          worker.send({
+            report,
+            method,
+            args: [slice, ...args]
+          })
+          worker.on('message', ({result}) => {
+            console.log('Received result from worker', worker.process.pid)
+            _result.push(result)
+            if (++done === sliced.length) {
+              resolve(_result.flat())
+            }
+          })
         })
-      })
 
-      cluster.on('exit', (worker, code, signal) => {
-        console.log('Worker died', worker.process.pid, code, signal)
-      })
-    }
-  })
+        cluster.on('exit', (worker, code, signal) => {
+          console.log('Worker died', worker.process.pid, code, signal)
+        })
+      }
+    })
+  } catch (e) {
+    console.log('ClientSide')
+  }
 }