fleetmap-reports 1.0.580 → 1.0.582

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.580",
+  "version": "1.0.582",
   "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/trip-report.js

@@ -163,15 +163,10 @@ function processDevices (from, to, devices, data, userData, traccar) {
     addNearestPOIs(trips, userData)
 
     trips.forEach(trip => {
-      if (deviceRoute[0].protocol === 'teltonika') {
+      if ((deviceRoute[0].protocol === 'teltonika' && deviceRoute[0].attributes.fuel) ||
+          automaticReports.deviceWithFuelInfo(d)) {
         trip.fuelConsumption = trip.spentFuel
-        trip.avgFuelConsumption = trip.totalKms > 0 ? Math.round(trip.fuelConsumption * 100 / trip.totalKms) : 0
-      } else if (automaticReports.deviceWithFuelInfo(d)) {
-        trip.fuelConsumption = Math.round((trip.spentFuel * d.attributes.fuel_tank_capacity) / 100)
-        trip.avgFuelConsumption = trip.totalKms > 0 ? Math.round(trip.fuelConsumption * 100 / trip.totalKms) : 0
-      } else {
-        trip.fuelConsumption = '-'
-        trip.avgFuelConsumption = '-'
+        trip.avgFuelConsumption = trip.totalKms > 0 ? trip.fuelConsumption * 100 / trip.totalKms : 0
       }
 
       const stop = getStop(new Date(trip.startTime), stops)
@@ -201,9 +196,11 @@ function processDevices (from, to, devices, data, userData, traccar) {
         }, 0),
         trips
       }
-      if (d.attributes.xpert) {
+
+      if (trips[0].fuelConsumption !== undefined) {
         deviceData.totalFuelConsumption = trips.reduce((a, b) => a + b.fuelConsumption, 0)
-        deviceData.avgFuelConsumption = deviceData.totalDistance > 0 ? Math.round((deviceData.totalFuelConsumption * 100) / (deviceData.totalDistance / 1000)) : 0
+        deviceData.avgFuelConsumption = deviceData.totalDistance > 0 ? (deviceData.totalFuelConsumption * 100) / (deviceData.totalDistance / 1000) : 0
+        console.log(deviceData)
       }
 
       devicesResult.push(deviceData)
@@ -257,26 +254,28 @@ async function exportTripReportToPDF (userData, reportData) {
     translations.report.start,
     translations.report.end,
     translations.report.endAddress,
-    translations.report.tripTime
+    translations.report.tripTime,
+    translations.report.idleTime,
+    translations.report.stopTime,
+    translations.report.distance,
+    translations.report.avgSpeed,
+    translations.report.maxSpeed
   ]
 
-  if (userData.byDriver) {
-    headers.push(translations.report.idleTime,
-      translations.report.stopTime,
-      translations.report.distance,
-      translations.report.avgSpeed,
-      translations.report.maxSpeed,
-      translations.report.name)
-  } else {
-    headers.push(translations.report.idleTime,
-      translations.report.stopTime,
-      translations.report.distance,
-      translations.report.avgSpeed,
-      translations.report.maxSpeed,
-      translations.report.driver)
-  }
-
   if (tripsData) {
+    const withFuelData = tripsData.reduce((a, b) => a || b.totalFuelConsumption !== undefined)
+
+    if (withFuelData) {
+      headers.push(translations.report.consumption,
+        translations.report.avg_consumption)
+    }
+
+    if (userData.byDriver) {
+      headers.push(translations.report.name)
+    } else {
+      headers.push(translations.report.driver)
+    }
+
     // eslint-disable-next-line new-cap
     const doc = new jsPDF.jsPDF('l')
     await headerFromUser(doc, translations.report.titleTripReport, userData.user)
@@ -326,6 +325,10 @@ async function exportTripReportToPDF (userData, reportData) {
           Math.round(a.averageSpeed * 1.85200),
           Math.round(a.maxSpeed * 1.85200))
 
+        if (withFuelData) {
+          temp.push(a.fuelConsumption.toFixed(1), a.avgFuelConsumption.toFixed(1))
+        }
+
         if (userData.byDriver) {
           temp.push(a.deviceName)
         } else {
@@ -346,8 +349,21 @@ async function exportTripReportToPDF (userData, reportData) {
         getSumAvgSpeed(d.trips),
         getMaxSpeed(d.trips))
 
+      if (withFuelData) {
+        footValues.push(parseFloat(d.totalFuelConsumption).toFixed(1), parseFloat(d.avgFuelConsumption).toFixed(1))
+      }
+
       const style = getStyle(getUserPartner(userData.user))
-      addTable(doc, headers, data, footValues, style, space + (userData.allWeek ? 40 : 45))
+      addTable(doc,
+        headers, data, footValues, style,
+        space + (userData.allWeek ? 40 : 45),
+        {
+          7: { halign: 'right' },
+          8: { halign: 'right' },
+          9: { halign: 'right' },
+          10: { halign: 'right' },
+          11: { halign: 'right' }
+        })
     })
     return doc
   }
@@ -364,37 +380,37 @@ function exportTripReportToExcel (userData, reportData) {
     sheetName: translations.report.titleTripReport, // The name of the sheet
     fileName // The name of the spreadsheet
   }
-  const headers = userData.byDriver
-    ? [
-        { label: translations.report.driver, value: 'name' },
-        { label: translations.report.date, value: 'date' },
-        { label: translations.report.start, value: 'start' },
-        { label: translations.report.end, value: 'end' },
-        { label: translations.report.endAddress, value: 'endAddress' },
-        { label: translations.report.tripTime, value: 'tripTime' },
-        { label: translations.report.idleTime, value: 'idleTime' },
-        { label: translations.report.stopTime, value: 'stopTime' },
-        { label: translations.report.distance, value: 'distance' },
-        { label: translations.report.avgSpeed, value: 'averageSpeed' },
-        { label: translations.report.maxSpeed, value: 'maxSpeed' },
-        { label: translations.report.vehicle, value: 'subname' }
-      ]
-    : [
-        { label: translations.report.vehicle, value: 'name' },
-        { label: translations.report.date, value: 'date' },
-        { label: translations.report.start, value: 'start' },
-        { label: translations.report.end, value: 'end' },
-        { label: translations.report.endAddress, value: 'endAddress' },
-        { label: translations.report.tripTime, value: 'tripTime' },
-        { label: translations.report.idleTime, value: 'idleTime' },
-        { label: translations.report.stopTime, value: 'stopTime' },
-        { label: translations.report.distance, value: 'distance' },
-        { label: translations.report.avgSpeed, value: 'averageSpeed' },
-        { label: translations.report.maxSpeed, value: 'maxSpeed' },
-        { label: translations.report.driver, value: 'subname' }
-      ]
+
+  const headers = [
+    { label: translations.report.date, value: 'date' },
+    { label: translations.report.start, value: 'start' },
+    { label: translations.report.end, value: 'end' },
+    { label: translations.report.endAddress, value: 'endAddress' },
+    { label: translations.report.tripTime, value: 'tripTime' },
+    { label: translations.report.idleTime, value: 'idleTime' },
+    { label: translations.report.stopTime, value: 'stopTime' },
+    { label: translations.report.distance, value: 'distance' },
+    { label: translations.report.avgSpeed, value: 'averageSpeed' },
+    { label: translations.report.maxSpeed, value: 'maxSpeed' }
+  ]
+
   let data = []
   if (tripsData) {
+    const withFuelData = tripsData.reduce((a, b) => a || b.totalFuelConsumption !== undefined)
+
+    if (withFuelData) {
+      headers.push({ label: translations.report.consumption, value: 'consumption' },
+        { label: translations.report.avg_consumption, value: 'avgConsumption' })
+    }
+
+    if (userData.byDriver) {
+      headers.unshift({ label: translations.report.driver, value: 'name' })
+      headers.push({ label: translations.report.vehicle, value: 'subname' })
+    } else {
+      headers.unshift({ label: translations.report.vehicle, value: 'name' })
+      headers.push({ label: translations.report.driver, value: 'subname' })
+    }
+
     tripsData.forEach(d => {
       data = data.concat([{}])
       data = data.concat(d.trips.map(a => {
@@ -410,6 +426,8 @@ function exportTripReportToExcel (userData, reportData) {
           distance: Number(a.totalKms.toFixed(2)),
           averageSpeed: Math.round(a.averageSpeed * 1.85200),
           maxSpeed: Math.round(a.maxSpeed * 1.85200),
+          consumption: a.fuelConsumption.toFixed(1),
+          avgConsumption: a.avgFuelConsumption.toFixed(1),
           subname: userData.byDriver ? a.deviceName : getDriverName(userData.drivers, a.driverUniqueId)
         }
       }))
@@ -421,7 +439,9 @@ function exportTripReportToExcel (userData, reportData) {
         stopTime: convertMS(d.trips.reduce((a, b) => a + b.stopDuration, 0)),
         distance: getSumTotalKms(userData.user, d.trips),
         averageSpeed: getSumAvgSpeed(d.trips),
-        maxSpeed: getMaxSpeed(d.trips)
+        maxSpeed: getMaxSpeed(d.trips),
+        consumption: parseFloat(d.totalFuelConsumption).toFixed(1),
+        avgConsumption: parseFloat(d.avgFuelConsumption).toFixed(1)
       }])
       data = data.concat([{}])
     })

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

package/src/util/pdfDocument.js

@@ -25,7 +25,7 @@ async function headerFromUser (doc, title, user, orientation = 'l') {
   return header(doc, title, partner.host, getStyle(partner), orientation)
 }
 
-function addTable (doc, headers, data, footValues, style, startY) {
+function addTable (doc, headers, data, footValues, style, startY, columnStyles = {}) {
   doc.autoTable({
     head: [headers],
     body: data,
@@ -45,7 +45,20 @@ function addTable (doc, headers, data, footValues, style, startY) {
       fillColor: style.pdfFooterColor,
       textColor: style.pdfFooterTextColor,
       fontSize: 9
+
+    },
+    didDrawCell: (data) => {
+      console.log(data)
+      data.table.foot.forEach((footRow) => {
+        const keys = Object.keys(columnStyles)
+        console.log(keys)
+        keys.forEach((colFormat, i) => {
+          console.log(footRow)
+          footRow.cells[i].styles.halign = 'right'
+        })
+      })
     },
+    columnStyles,
     startY
   })
 }