fleetmap-reports 1.0.596 → 1.0.598

package/package.json

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

package/src/fuelconsumption-report.js

@@ -204,7 +204,7 @@ async function exportFuelConsumptionReportToPDF (userData, reportData) {
           r.date,
           (r.distance / 1000).toFixed(1),
           r.spentFuel > 0 ? r.spentFuel : 0,
-          lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms,
+          lang === 'pt-BR' ? (r.avgConsumption.byLiters).toFixed(1) : (r.avgConsumption.byKms).toFixed(1),
           new Date(r.duration).toLocaleTimeString(),
           (r.endOdometer / 1000).toFixed(1),
           r.refueling

package/src/refueling-report.js

@@ -32,7 +32,7 @@ async function createRefuelingReport (from, to, userData, traccar) {
   }
 
   const fuelServicesData = []
-  if (userData.withOdooServices) {
+  if (devices.some(d => d.attributes.odooId)) {
     fuelServicesData.push(...(await odoo.getOdooFuelServices(traccar, from, to)))
   }
 
@@ -122,7 +122,7 @@ function coordsDistance (lon1, lat1, lon2, lat2) {
 async function calculateRefuelingPositions (userData, d, data) {
   const refuelingPositions = []
 
-  if (userData.withOdooServices && d.attributes.odooId) {
+  if (d.attributes.odooId && !data.route[0].attributes.fuel) {
     console.log(data.fuelServices)
     data.fuelServices.forEach(s => {
       const serviceDate = new Date(s.date)
@@ -133,7 +133,7 @@ async function calculateRefuelingPositions (userData, d, data) {
       const quantity = s.liter
 
       if (routeBeforeService.length) {
-        refuelingPositions.push({ date: s.date, diff: Number.parseFloat(quantity), cost: s.amount })
+        refuelingPositions.push({ position: routeBeforeService.slice(-1)[0], date: s.date, diff: Number.parseFloat(quantity), cost: s.amount })
       }
     })
   } else {

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.minimumIdleMinutes)
+      const hereResults = await getHereEvents(devices, routes, userData.maxSpeedThreshold, userData.minimumIdleTime)
       console.log('got', hereResults.length, 'from here')
       events.push(...hereResults)
     } else if (!userData.useVehicleSpeedLimit && userData.customSpeed) {

package/src/tests/index.test.js

@@ -5,6 +5,7 @@ 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.minimumIdleMinutes = 1
+    userData.minimumIdleTime = 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

package/src/trip-report.js

@@ -172,8 +172,8 @@ function processDevices (from, to, devices, data, userData, traccar) {
       const stop = getStop(new Date(trip.startTime), stops)
 
       if (stop && !trip.endTimeIsOut) {
-        trip.stopDuration = (new Date(stop.endTime) - new Date(stop.startTime))
-        trip.stopEngineHours = trip.idleTime + stop.idleTime
+        trip.stopDuration = ((new Date(stop.endTime) - new Date(stop.startTime)) - stop.engineHours)
+        trip.stopEngineHours = trip.idleTime + stop.engineHours
       } else {
         trip.stopDuration = 0
         trip.stopEngineHours = 0