fleetmap-reports 1.0.471 → 1.0.473

package/package.json

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

package/src/index.test.js

@@ -15,7 +15,6 @@ async function getSpeedingReport (report, userData) {
 
 // eslint-disable-next-line no-undef
 describe('Test_Reports', function () {
-  this.timeout(500000)
   // eslint-disable-next-line no-undef
   it('Speeding by device', async () => {
     const report = await getReports()

package/src/machines-report.js

@@ -64,7 +64,7 @@ function processDevices (from, to, devices, data, userData) {
       if (userData.withDetails) {
         const ignitions = calculateIgnitions(deviceRoute)
         for (const ignition of ignitions) {
-          const dayData = getSummaryData(new Date(ignition.on.fixTime), d, ignition.route, ignition.on, ignition.off)
+          const dayData = getSummaryData(new Date(ignition.on.fixTime), d, ignition.route, ignition, undefined)
           summary.push(dayData)
         }
       } else {
@@ -77,7 +77,7 @@ function processDevices (from, to, devices, data, userData) {
           routeByDay.sort((a, b) => new Date(a.fixTime).getTime() - new Date(b.fixTime).getTime())
 
           const ignitions = calculateIgnitions(routeByDay)
-          const dayData = getSummaryData(date, d, routeByDay, ignitions.length ? ignitions[0].on : undefined, ignitions.length ? ignitions[ignitions.length - 1].off : undefined)
+          const dayData = getSummaryData(date, d, routeByDay, undefined, ignitions)
           summary.push(dayData)
         }
       }
@@ -94,14 +94,20 @@ function processDevices (from, to, devices, data, userData) {
   return devicesResult
 }
 
-function getSummaryData (date, device, route, start, end) {
+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
+    ? 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)
+
   return {
     date,
     deviceId: device.id,
-    engineHours: start ? route[route.length - 1].attributes.hours - route[0].attributes.hours : undefined,
+    engineHours,
     totalHours: route.length ? route[route.length - 1].attributes.hours : undefined,
-    startTime: start ? start.fixTime : undefined,
-    endTime: end ? end.fixTime : undefined
+    startTime,
+    endTime
   }
 }
 

package/src/speeding-report.js

@@ -301,7 +301,7 @@ async function getHereEvents (devices, routes, threshold) {
         ? hereAlerts
         : hereAlerts.reduce((acc, cur, idx, src) => {
           if (idx === 1) {
-            return [cur]
+            return [acc]
           }
           if (cur.timestamp - src[idx - 1].timestamp > 300000 || cur.roadSpeedLimit !== src[idx - 1].roadSpeedLimit) {
             return acc.concat(cur)

package/src/util/odoo.js

@@ -1,16 +1,14 @@
 
-async function getOdooFuelServices (traccar, from, to) {
-  const url = `/odoo/reports/refuelingServices?startDate=${from.toDateString()}&endDate=${to.toDateString()}`
+async function getOdooFuelServices(traccar, from, to) {
+    const url = `/odoo/reports/refuelingServices?startDate=${from.toDateString()}&endDate=${to.toDateString()}`
 
-  console.log('LOADING_MESSAGE:' + url)
-  const { data } = await traccar.axios.get(url, {
-    jar: traccar.cookieJar,
-    withCredentials: true
-  })
+    const {data} = await traccar.axios.get(url,{
+        jar: traccar.cookieJar,
+        withCredentials: true })
 
-  console.log(data)
+    console.log(data)
 
-  return data
+    return data
 }
 
 exports.getOdooFuelServices = getOdooFuelServices