fleetmap-reports 1.0.782 → 1.0.784

package/package.json

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

package/src/activity-report.js

@@ -83,15 +83,16 @@ async function createActivityReportByDevice (from, to, userData, traccarInstance
     to
   }
 
-  const sliced = automaticReports.sliceArray(allDevices, 5)
+  const sliced = automaticReports.sliceArray(allDevices, 4)
   let deviceCount = 0
   for (const devices of sliced) {
     let summaries = []
+    const needRoute = userData.groupByDay || !userData.allWeek
     const {
       trips,
       route,
       summary
-    } = await traccar.getAllInOne(traccarInstance, from, to, devices, true, true, false, !userData.groupByDay, deviceCount, allDevices.length)
+    } = await traccar.getAllInOne(traccarInstance, from, to, devices, needRoute, true, false, !userData.groupByDay, deviceCount, allDevices.length)
 
     if (userData.groupByDay) {
       console.log('trips:' + trips.length)
@@ -400,20 +401,22 @@ function exportActivityReportToPDFVehicle (doc, translations, reportData, userDa
   reportData.devices.forEach(d => {
     const group = userData.groups.find(g => d.device.groupId === g.id)
 
-    const temp = [
-      d.device.name,
-      group ? group.name : '',
-      d.summary[0].startTime ? new Date(d.summary[0].startTime).toLocaleString() : '',
-      d.summary[0].endTime ? new Date(d.summary[0].endTime).toLocaleString() : '',
-      Number((d.summary[0].distance / 1000).toFixed(1)),
-      Number((d.summary[0].startOdometer / 1000).toFixed(1)),
-      Number((d.summary[0].endOdometer / 1000).toFixed(1)),
-      Math.round(d.summary[0].averageSpeed * 1.85200),
-      Math.round(d.summary[0].maxSpeed * 1.85200),
-      convertMS(d.summary[0].engineHours),
-      d.summary[0].convertedSpentFuel >= 0 ? d.summary[0].convertedSpentFuel : 0
-    ]
-    data.push(temp)
+    if (d.summary) {
+      const temp = [
+        d.device.name,
+        group ? group.name : '',
+        d.summary[0].startTime ? new Date(d.summary[0].startTime).toLocaleString() : '',
+        d.summary[0].endTime ? new Date(d.summary[0].endTime).toLocaleString() : '',
+        Number((d.summary[0].distance / 1000).toFixed(1)),
+        Number((d.summary[0].startOdometer / 1000).toFixed(1)),
+        Number((d.summary[0].endOdometer / 1000).toFixed(1)),
+        Math.round(d.summary[0].averageSpeed * 1.85200),
+        Math.round(d.summary[0].maxSpeed * 1.85200),
+        convertMS(d.summary[0].engineHours),
+        d.summary[0].convertedSpentFuel >= 0 ? d.summary[0].convertedSpentFuel : 0
+      ]
+      data.push(temp)
+    }
   })
 
   const footValues = ['Total:' + reportData.devices.length,
@@ -718,19 +721,21 @@ function exportActivityReportToExcelVehicle (settings, translations, reportData,
     reportData.devices.forEach(d => {
       const group = userData.groups.find(g => d.device.groupId === g.id)
 
-      data = data.concat([{
-        name: d.device.name,
-        group: group ? group.name : '',
-        start: d.summary[0].startTime ? new Date(d.summary[0].startTime).toLocaleString() : '',
-        end: d.summary[0].endTime ? new Date(d.summary[0].endTime).toLocaleString() : '',
-        distance: Number((d.summary[0].distance / 1000).toFixed(0)),
-        startOdometer: Number((d.summary[0].startOdometer / 1000).toFixed(0)),
-        endOdometer: Number((d.summary[0].endOdometer / 1000).toFixed(0)),
-        avgSpeed: Math.round(d.summary[0].averageSpeed * 1.85200),
-        maxSpeed: Math.round(d.summary[0].maxSpeed * 1.85200),
-        engineHours: convertMS(d.summary[0].engineHours),
-        spentFuel: d.summary[0].convertedSpentFuel >= 0 ? d.summary[0].convertedSpentFuel : 0
-      }])
+      if (d.summary) {
+        data = data.concat([{
+          name: d.device.name,
+          group: group ? group.name : '',
+          start: d.summary[0].startTime ? new Date(d.summary[0].startTime).toLocaleString() : '',
+          end: d.summary[0].endTime ? new Date(d.summary[0].endTime).toLocaleString() : '',
+          distance: Number((d.summary[0].distance / 1000).toFixed(0)),
+          startOdometer: Number((d.summary[0].startOdometer / 1000).toFixed(0)),
+          endOdometer: Number((d.summary[0].endOdometer / 1000).toFixed(0)),
+          avgSpeed: Math.round(d.summary[0].averageSpeed * 1.85200),
+          maxSpeed: Math.round(d.summary[0].maxSpeed * 1.85200),
+          engineHours: convertMS(d.summary[0].engineHours),
+          spentFuel: d.summary[0].convertedSpentFuel >= 0 ? d.summary[0].convertedSpentFuel : 0
+        }])
+      }
     })
     console.log(data)
     return {

package/src/partnerReports/afriquia.js

@@ -7,10 +7,6 @@ function calculateLastStopTime (stopTime, to, time) {
   return stopTime + (to.getTime() - new Date(time).getTime())
 }
 
-function calculateFirstStopTime (stopTime, from, time) {
-  return stopTime + (new Date(time).getTime() - from.getTime())
-}
-
 async function createActivityReport (from, to, userData, traccarInstance) {
   const unauthorizedGeofences = []
   const authorizedGeofences = []
@@ -126,4 +122,6 @@ async function createActivityReport (from, to, userData, traccarInstance) {
   return reportData
 }
 
+
+
 exports.createActivityReport = createActivityReport

package/src/refueling-report.js

@@ -7,7 +7,7 @@ const odoo = require('./util/odoo')
 const traccarHelper = require('./util/traccar')
 const { calculateFuelDiff, getRefuelingLiters } = require('./util/fuel')
 
-const positionsToCheck = 15
+// const positionsToCheck = 15
 
 async function createRefuelingReport (from, to, userData, traccar) {
   console.log('Create RefuelingReport')
@@ -119,6 +119,86 @@ function coordsDistance (lon1, lat1, lon2, lat2) {
   return distance.default(from, to) * 1000
 }
 
+/* function isStoped (position) {
+  return !position.attributes.ignition || position.attributes.rpm === 0
+} */
+
+/* function analyseRouteRefuelingOnStops (data, d, refuelingPositions) {
+  let refuelingActivated = false
+  let currentValue = null
+  let positionsChecked = 0
+  let lastRefuelingIndex = 0
+  data.route.forEach(function (element, index, array) {
+    if (isStoped(element) && refuelingActivated && !currentValue) {
+      // Ignition is off and Refueling is Active and there is no current value
+
+      // Get 5 position before the ignition off to calculate the current value of the fuel tank level
+      // lastRefuelingIndex is used to avoid re-analyzing positions prior to a refueling
+      const before = (index > 5 ? array.slice((index - 6 < lastRefuelingIndex ? lastRefuelingIndex : index - 6), index - 1) : array.slice(0, index - 1)).filter(b => b.attributes.ignition && b.attributes.fuel)
+      currentValue = Math.round(before.reduce((a, b) => a + b.attributes.fuel, 0) / before.length)
+
+      positionsChecked = 0
+    }
+
+    if (element.attributes.ignition && refuelingActivated && currentValue) {
+      // Ignition is on and Refueling is Active and there is a current value
+      // Calculate the value of the fuel tank level after turning the ignition back on
+      const after = (array.length > index + 5 ? array.slice(index, index + 1) : array.slice(index)).filter(b => b.attributes.ignition && b.attributes.fuel)
+      const newValue = Math.round(after.reduce((a, b) => a + b.attributes.fuel, 0) / after.length)
+
+      const diff = calculateFuelDiff(currentValue, newValue, d, element)
+      if (diff > 20) {
+        // New refueling detected
+        const value = getRefuelingLiters(d, element, diff)
+        refuelingPositions.push({position: element, date: element.fixTime, diff: value})
+        lastRefuelingIndex = index
+        positionsChecked = positionsToCheck + 1 // to reset values
+      }
+
+      if (positionsChecked > positionsToCheck) {
+        refuelingActivated = false
+        currentValue = null
+        positionsChecked = 0
+      } else {
+        positionsChecked++
+      }
+    }
+
+    if (element.attributes.ignition && !refuelingActivated) {
+      refuelingActivated = true
+    }
+  })
+} */
+
+function analyseRouteRefueling (data, d, refuelingPositions) {
+  let startValue = 0
+  let currentValue = 0
+  let refuelingActivated = false
+  data.route.forEach(function (element, index, array) {
+    if (!refuelingActivated) {
+      startValue = element.attributes.fuel
+    }
+
+    const endValue = array.length > index + 2 ? array[index + 2].attributes.fuel : undefined
+    const diff = calculateFuelDiff(startValue, endValue, d, element)
+
+    if (diff > 5 && !refuelingActivated) {
+      refuelingActivated = true
+      currentValue = diff
+    } else if (refuelingActivated && currentValue <= diff) {
+      currentValue = diff
+    } else {
+      if (currentValue > 20) {
+        // New refueling detected
+        const value = getRefuelingLiters(d, element, currentValue)
+        refuelingPositions.push({ position: element, date: element.fixTime, diff: value })
+        currentValue = 0
+      }
+      refuelingActivated = false
+    }
+  })
+}
+
 async function calculateRefuelingPositions (userData, d, data) {
   const refuelingPositions = []
 
@@ -137,50 +217,8 @@ async function calculateRefuelingPositions (userData, d, data) {
       }
     })
   } else {
-    let refuelingActivated = false
-    let currentValue = null
-    let positionsChecked = 0
-    let lastRefuelingIndex = 0
-    data.route.forEach(function (element, index, array) {
-      if (!element.attributes.ignition && refuelingActivated && !currentValue) {
-        // Ignition is off and Refueling is Active and there is no current value
-
-        // Get 5 position before the ignition off to calculate the current value of the fuel tank level
-        // lastRefuelingIndex is used to avoid re-analyzing positions prior to a refueling
-        const before = (index > 5 ? array.slice((index - 6 < lastRefuelingIndex ? lastRefuelingIndex : index - 6), index - 1) : array.slice(0, index - 1)).filter(b => b.attributes.ignition && b.attributes.fuel)
-        currentValue = Math.round(before.reduce((a, b) => a + b.attributes.fuel, 0) / before.length)
-
-        positionsChecked = 0
-      }
-
-      if (element.attributes.ignition && refuelingActivated && currentValue) {
-        // Ignition is on and Refueling is Active and there is a current value
-        // Calculate the value of the fuel tank level after turning the ignition back on
-        const after = (array.length > index + 5 ? array.slice(index, index + 1) : array.slice(index)).filter(b => b.attributes.ignition && b.attributes.fuel)
-        const newValue = Math.round(after.reduce((a, b) => a + b.attributes.fuel, 0) / after.length)
-
-        const diff = calculateFuelDiff(currentValue, newValue, d, element)
-        if (diff > 20) {
-          // New refueling detected
-          const value = getRefuelingLiters(d, element, diff)
-          refuelingPositions.push({ position: element, date: element.fixTime, diff: value })
-          lastRefuelingIndex = index
-          positionsChecked = positionsToCheck + 1 // to reset values
-        }
-
-        if (positionsChecked > positionsToCheck) {
-          refuelingActivated = false
-          currentValue = null
-          positionsChecked = 0
-        } else {
-          positionsChecked++
-        }
-      }
-
-      if (element.attributes.ignition && !refuelingActivated) {
-        refuelingActivated = true
-      }
-    })
+    // analyseRouteRefuelingOnStops(data, d, refuelingPositions)
+    analyseRouteRefueling(data, d, refuelingPositions)
   }
   return refuelingPositions
 }