fleetmap-reports 1.0.610 → 1.0.612

package/package.json

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

package/src/machines-report.js

@@ -73,7 +73,7 @@ function processDevices (from, to, devices, data, userData) {
           const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
           const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
 
-          const routeByDay = deviceRoute.filter(p => (new Date(p.fixTime) > fromByDay && new Date(p.fixTime) < toByDay) && p.valid && p.attributes.hours !== undefined)
+          const routeByDay = deviceRoute.filter(p => (new Date(p.fixTime) > fromByDay && new Date(p.fixTime) < toByDay) && p.valid)
           routeByDay.sort((a, b) => new Date(a.fixTime).getTime() - new Date(b.fixTime).getTime())
 
           const ignitions = calculateIgnitions(routeByDay)
@@ -97,10 +97,21 @@ function processDevices (from, to, devices, data, userData) {
 function getSummaryData (date, device, route, ignition, ignitions) {
   const startTime = ignition ? ignition.on.fixTime : (ignitions.length ? ignitions[0].on.fixTime : undefined)
   const endTime = ignition ? ignition.off.fixTime : (ignitions.length ? ignitions[ignitions.length - 1].off.fixTime : undefined)
-  const engineHours = ignition
+  let engineHours = ignition
     ? ignition.route[ignition.route.length - 1].attributes.hours - ignition.route[0].attributes.hours
     : (ignitions ? ignitions.reduce((a, b) => a + (b.route[b.route.length - 1].attributes.hours - b.route[0].attributes.hours), 0) : undefined)
 
+  if (!engineHours) {
+    engineHours = 0
+    if (ignition) {
+      engineHours = new Date(endTime).getTime() - new Date(startTime).getTime()
+    } else {
+      ignitions.forEach(e => {
+        engineHours = engineHours + (new Date(e.off.fixTime).getTime() - new Date(e.on.fixTime).getTime())
+      })
+    }
+  }
+
   return {
     date,
     deviceId: device.id,

package/src/speeding-report.js

@@ -135,7 +135,7 @@ async function getEvents (traccarInstance, from, to, devices, userData, deviceCo
 
     const events = []
     if (userData.roadSpeedLimits) {
-      const hereResults = await getHereEvents(devices, routes, userData.maxSpeedThreshold, userData.minimumIdleTime)
+      const hereResults = await getHereEvents(devices, routes, userData.maxSpeedThreshold, userData.minimumIdleMinutes)
       console.log('got', hereResults.length, 'from here')
       events.push(...hereResults)
     } else if (!userData.useVehicleSpeedLimit && userData.customSpeed) {

package/src/tests/index.test.js

@@ -5,7 +5,6 @@ const utils = require('../util/utils')
 
 // eslint-disable-next-line no-undef
 describe('Test_Reports', function () {
-  this.timeout(5000000)
   it('converts to pdf', async () => {
     const report = await getReports()
     const userData = await report.getUserData()

package/src/tests/speeding.test.js

@@ -23,7 +23,7 @@ describe('speeding tests', function () {
     assert.equal(device.alerts.length, 104) // Total Alerts
     console.log(device.alerts)
 
-    userData.minimumIdleTime = 1
+    userData.minimumIdleMinutes = 1
     const r = await getSpeedingReport(report, userData)
     r.device.alerts.forEach(a => assert.equal(true, a.eventTime >= 60000))
     assert.equal(r.device.alerts.length, 6) // Total Alerts