fleetmap-reports 1.0.580 → 1.0.581

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.580",
+  "version": "1.0.581",
   "description": "",
   "main": "src/index.js",
   "scripts": {
-    "test": "email=$email & password=$password & jest"
+    "test": "jest"
   },
   "keywords": [],
   "author": "",

package/src/automaticReports.js

@@ -20,15 +20,6 @@ function fuelSignalInverter (device) {
   return device.attributes.fuel_low_threshold <= device.attributes.fuel_high_threshold ? 1 : -1
 }
 
-function calculateFuelDiff (a, b, device) {
-  const diff = (b - a) * fuelSignalInverter(device)
-  if (device.attributes.xpert) {
-    return diff
-  } else {
-    return (diff * 100) / Math.abs(device.attributes.fuel_low_threshold - device.attributes.fuel_high_threshold)
-  }
-}
-
 function calculateXpertSpentFuel (date, positions) {
   const begin = moment(date, 'YYYY-MM-DD').startOf('day')
   const end = moment(date, 'YYYY-MM-DD').endOf('day')
@@ -66,7 +57,6 @@ function calculateSpentFuel (value, device) {
 
 exports.sliceArray = sliceArray
 exports.deviceWithFuelInfo = deviceWithFuelInfo
-exports.calculateFuelDiff = calculateFuelDiff
 exports.calculateSpentFuel = calculateSpentFuel
 exports.calculateXpertSpentFuel = calculateXpertSpentFuel
 exports.calculateXpertDistance = calculateXpertDistance

package/src/refueling-report.js

@@ -5,6 +5,7 @@ const distance = require('@turf/distance')
 const { getTranslations } = require('./util/utils')
 const odoo = require('./util/odoo')
 const traccarHelper = require('./util/traccar')
+const { calculateFuelDiff, getRefuelingLiters } = require('./util/fuel')
 
 const positionsToCheck = 15
 
@@ -158,10 +159,10 @@ async function calculateRefuelingPositions (userData, d, data) {
         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 = automaticReports.calculateFuelDiff(currentValue, newValue, d)
+        const diff = calculateFuelDiff(currentValue, newValue, d, element)
         if (diff > 20) {
           // New refueling detected
-          const value = Math.round(diff * d.attributes.fuel_tank_capacity / 100)
+          const value = getRefuelingLiters(d, element, diff)
           refuelingPositions.push({ position: element, date: element.fixTime, diff: value })
           lastRefuelingIndex = index
           positionsChecked = positionsToCheck + 1 // to reset values

package/src/{fuel.test.js → tests/fuel.test.js}

@@ -1,5 +1,5 @@
 /* eslint-disable no-undef */
-const { getReports } = require('./tests')
+const { getReports } = require('./index')
 const assert = require('assert')
 
 const deviceId = 122575

package/src/tests/index.js

@@ -15,8 +15,12 @@ const axios = require('axios').create({ ...traccarConfig.baseOptions, baseURL: t
 axiosCookieJarSupport(axios)
 
 const getReports = async () => {
-  await new SessionApi(traccarConfig, null, axios).sessionPost(process.env.email, process.env.password)
-  return new Index(traccarConfig, axios, cookieJar)
+  try {
+    await new SessionApi(traccarConfig, null, axios).sessionPost(process.env.email, process.env.password)
+    return new Index(traccarConfig, axios, cookieJar)
+  } catch (e) {
+    console.error(e)
+  }
 }
 
 exports.getReports = getReports

package/src/{index.test.js → tests/index.test.js}

@@ -1,7 +1,7 @@
 /* eslint-disable no-undef */
-const { getReports } = require('./tests')
+const { getReports } = require('./index')
 const assert = require('assert')
-const utils = require('./util/utils')
+const utils = require('../util/utils')
 
 async function getSpeedingReport (report, userData) {
   const data = await report.speedingReport(
@@ -300,7 +300,7 @@ describe('Test_Reports', function () {
     console.log('Start')
     const reports = await getReports()
     const userData = await reports.getUserData()
-    const r = await require('./util/traccar').getAllInOne(reports.traccar,
+    const r = await require('../util/traccar').getAllInOne(reports.traccar,
       new Date(2022, 1, 1, 0, 0, 0, 0),
       new Date(2022, 1, 4, 23, 59, 59, 0),
       userData.devices,

package/src/util/fuel.js

@@ -0,0 +1,26 @@
+function calculateFuelDiff (a, b, device, p) {
+  if (p.protocol === 'teltonika') {
+    return b - a
+  } else {
+    const diff = (b - a) * fuelSignalInverter(device)
+    if (device.attributes.xpert) {
+      return diff
+    } else {
+      return (diff * 100) / Math.abs(device.attributes.fuel_low_threshold - device.attributes.fuel_high_threshold)
+    }
+  }
+}
+
+function fuelSignalInverter (device) {
+  return device.attributes.fuel_low_threshold <= device.attributes.fuel_high_threshold ? 1 : -1
+}
+
+function getRefuelingLiters (d, position, diff) {
+  if (position.protocol === 'teltonika' && !position.attributes.io89) {
+    return diff
+  }
+  return Math.round(diff * d.attributes.fuel_tank_capacity / 100)
+}
+
+exports.calculateFuelDiff = calculateFuelDiff
+exports.getRefuelingLiters = getRefuelingLiters