fleetmap-reports 1.0.428 → 1.0.431

package/lang/enGB.js

@@ -223,6 +223,7 @@ module.exports = {
     engineHours: 'Use (H:m)',
     driverHours: 'Driving Time (H:m)',
     refueling: 'Refueling',
+    fueldrop: 'Fuel Drop (L)',
     totalRefueled: 'Total Refueled',
     totalFuelDrops: 'Total Fuel Drops',
     totalFuelDropLiters: 'Total Fuel Lost',
@@ -276,4 +277,4 @@ module.exports = {
     in: 'in',
     fuelDropInfo: 'Fuel drop greater than '
   }
-};
+}

package/lang/esCL.js

@@ -216,6 +216,7 @@ module.exports = {
     engineHours: 'Utilización (HH:mm)',
     driverHours: 'Tiempo de Conducción (H:m)',
     refueling: 'Cargas',
+    fueldrop: 'Combustível Perdido (L)',
     totalRefueled: 'Total Cargado',
     totalFuelDrops: 'Total Fuel Drops',
     totalFuelDropLiters: 'Total Fuel Lost',

package/lang/ptBR.js

@@ -212,6 +212,7 @@ module.exports = {
     engineHours: 'Utilização (H:m)',
     driverHours: 'Tempo de Condução (H:m)',
     refueling: 'Abastecimentos',
+    fueldrop: 'Combustível Perdido (L)',
     totalRefueled: 'Total Abastecido',
     totalFuelDrops: 'Total de Ocorrências',
     totalFuelDropLiters: 'Combustível Perdido',
@@ -265,4 +266,4 @@ module.exports = {
     in: 'em',
     fuelDropInfo: 'Perda de combustível superior a '
   }
-};
+}

package/lang/ptPT.js

@@ -219,6 +219,7 @@ module.exports = {
     engineHours: 'Utilização (H:m)',
     driverHours: 'Tempo de Condução (H:m)',
     refueling: 'Abastecimentos',
+    fueldrop: 'Combustível Perdido (L)',
     totalRefueled: 'Total Abastecido',
     totalFuelDrops: 'Total de Ocorrências',
     totalFuelDropLiters: 'Combustível Perdido',
@@ -251,7 +252,7 @@ module.exports = {
     unsubscribeSpeedingReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção "Relatório de excesso de velocidade" nas definições na secção "Relatórios".',
     unsubscribeZoneReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção "Relatório de zonas" nas definições na secção "Relatórios".',
     unsubscribeRefuelingReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção "Relatório de abastecimentos" nas definições na secção "Relatórios".',
-    unsubscribeFuelDropReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção "Relatório de perdas de combustível" nas definições na secção "Relatórios".',
+    unsubscribeFuelDropReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção "Relatório de perdas de combustível" nas definições na secção "Relatórios".'
   },
   layout: {
     deviceOnline: 'Dispositivo Online',
@@ -274,4 +275,4 @@ module.exports = {
     in: 'em',
     fuelDropInfo: 'Perda de combustível superior a '
   }
-};
+}

package/package.json

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

package/src/fuelconsumption-report.js

@@ -1,109 +1,158 @@
-const automaticReports = require("./automaticReports")
-const refuelingReport = require("./refueling-report")
-const traccarHelper = require("./util/traccar")
-const odoo = require("./util/odoo")
-const {devicesToProcess} = require("./util/device");
+const automaticReports = require('./automaticReports')
+const refuelingReport = require('./refueling-report')
+const traccarHelper = require('./util/traccar')
+const odoo = require('./util/odoo')
+const { devicesToProcess } = require('./util/device')
+const messages = require('../lang')
 
+async function createFuelConsumptionReport (from, to, userData, traccar) {
+  console.log('Create FuelConsumption Report')
 
+  const reportData = []
 
-async function createFuelConsumptionReport(from, to, userData, traccar) {
-    console.log('Create FuelConsumption Report')
+  const allData = {
+    devices: [],
+    from,
+    to
+  }
 
-    const reportData = []
+  const devices = devicesToProcess(userData)
 
-    const allData = {
-        devices: [],
-        from: from,
-        to: to
-    }
+  const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, true, false, false)
+  const tripsData = allInOne.trips
+  const routeData = allInOne.route
 
-    const devices = devicesToProcess(userData)
+  const fuelServicesData = []
+  if (userData.withOdooServices) {
+    fuelServicesData.push(...(await odoo.getOdooFuelServices(traccar, from, to)))
+  }
 
-    const allInOne =  await traccarHelper.getAllInOne(traccar, from, to, devices, true, true, false, false)
-    const tripsData = allInOne.trips
-    const routeData = allInOne.route
+  if (tripsData.length === 0) {
+    return reportData
+  }
+
+  allData.totalDevices = 0
+
+  for (const d of devices) {
+    const trips = tripsData.filter(t => t.deviceId === d.id)
+    const route = routeData.filter(r => r.deviceId === d.id)
+    const deviceFuelServices = fuelServicesData.filter(f => d.attributes.odooId === f.vehicle_id[0])
+
+    if (trips.length > 0) {
+      const refuelingPositions = await refuelingReport.calculateRefuelingPositions(userData, d, { route, trips, fuelServices: deviceFuelServices })
+      const groupedRefuelingsByDay = refuelingPositions.reduce(
+        (entryMap, e) => entryMap.set(e.date.substring(0, 10), [...entryMap.get(e.date.substring(0, 10)) || [], e]),
+        new Map()
+      )
+
+      trips.forEach(t => {
+        t.startDate = t.startTime.substring(0, 10)
+      })
+      const groupedTripsByDay = trips.reduce(
+        (entryMap, e) => entryMap.set(e.startDate, [...entryMap.get(e.startDate) || [], e]),
+        new Map()
+      )
+
+      const days = []
+      const keys = Array.from(groupedTripsByDay.keys())
+      const odooAvgConsumption = userData.withOdooServices ? calculateAvgConsumption(refuelingPositions, trips) : 0
+
+      keys.forEach(day => {
+        const dayTrips = groupedTripsByDay.get(day)
+        const dayRefueling = groupedRefuelingsByDay.get(day)
+        const distance = dayTrips.reduce((a, b) => a + b.distance, 0)
+        const spentFuel = calculateConsumption(userData, d, day, odooAvgConsumption, { trips: dayTrips, route })
+
+        const dataRow = {
+          date: day,
+          distance,
+          spentFuel,
+          avgConsumption: userData.withOdooServices ? odooAvgConsumption : distance > 0 && spentFuel > 0 ? Math.round(spentFuel * 100 / (distance / 1000)) : 0,
+          endOdometer: dayTrips.slice(-1)[0].endOdometer,
+          duration: dayTrips.reduce((a, b) => a + b.duration, 0),
+          refueling: (dayRefueling && dayRefueling.length > 0) ? dayRefueling.reduce((a, b) => a + b.diff, 0) : 0
+        }
 
-    const fuelServicesData = []
-    if(userData.withOdooServices) {
-        fuelServicesData.push(...(await odoo.getOdooFuelServices(traccar, from, to)))
-    }
+        days.push(dataRow)
+      })
 
-    if(tripsData.length === 0) {
-        return reportData
+      if (days.length > 0) {
+        allData.devices.push({
+          device: d,
+          days
+        })
+        allData.totalDevices = allData.totalDevices + 1
+      }
     }
+  }
 
-    allData.totalDevices = 0
-
-    for (const d of devices) {
-        const trips = tripsData.filter(t => t.deviceId===d.id)
-        const route = routeData.filter(r => r.deviceId===d.id)
-        const deviceFuelServices = fuelServicesData.filter(f => d.attributes.odooId === f.vehicle_id[0])
-
-        if(trips.length > 0) {
-            const refuelingPositions = await refuelingReport.calculateRefuelingPositions(userData, d, {route: route, trips: trips, fuelServices: deviceFuelServices})
-            const groupedRefuelingsByDay = refuelingPositions.reduce(
-                (entryMap, e) => entryMap.set(e.date.substring(0, 10), [...entryMap.get(e.date.substring(0, 10))||[], e]),
-                new Map()
-            )
-
-            trips.forEach(t => t.startDate = t.startTime.substring(0, 10))
-            const groupedTripsByDay = trips.reduce(
-                (entryMap, e) => entryMap.set(e.startDate, [...entryMap.get(e.startDate)||[], e]),
-                new Map()
-            )
-
-            const days = []
-            const keys = Array.from(groupedTripsByDay.keys())
-            const odooAvgConsumption = userData.withOdooServices ? calculateAvgConsumption(refuelingPositions, trips) : 0
-
-            keys.forEach(day => {
-                const dayTrips = groupedTripsByDay.get(day)
-                const dayRefueling = groupedRefuelingsByDay.get(day)
-                const distance = dayTrips.reduce((a, b) => a + b.distance, 0)
-                const spentFuel = calculateConsumption(userData, d, day, odooAvgConsumption, { trips: dayTrips, route: route })
-
-                const dataRow = {
-                    date: day,
-                    distance: distance,
-                    spentFuel: spentFuel,
-                    avgConsumption: userData.withOdooServices ? odooAvgConsumption : distance > 0 && spentFuel > 0 ? Math.round(spentFuel * 100 / (distance / 1000)) : 0,
-                    endOdometer: dayTrips.slice(-1)[0].endOdometer,
-                    duration: dayTrips.reduce((a, b) => a + b.duration, 0),
-                    refueling: (dayRefueling && dayRefueling.length > 0) ? dayRefueling.reduce((a, b) => a + b.diff, 0) : 0,
-                }
-
-                days.push(dataRow)
-            })
-
-            if (days.length > 0) {
-                allData.devices.push({
-                    device: d,
-                    days: days
-                })
-                allData.totalDevices = allData.totalDevices+1
-            }
-        }
-    }
+  reportData.push(allData)
 
-    reportData.push(allData)
+  return reportData
+}
 
-    return reportData
+function calculateAvgConsumption (refuelingPositions, trips) {
+  const odooTotalfuel = refuelingPositions.reduce((a, b) => a + b.diff, 0)
+  const totalKms = trips.reduce((a, b) => a + b.distance, 0)
+  return Math.round(odooTotalfuel * 100 / (totalKms / 1000))
 }
 
-function calculateAvgConsumption(refuelingPositions, trips) {
-    const odooTotalfuel = refuelingPositions.reduce((a, b) => a + b.diff, 0)
-    const totalKms = trips.reduce((a, b) => a + b.distance, 0)
-    return Math.round(odooTotalfuel * 100 / (totalKms / 1000))
+function calculateConsumption (userData, d, day, avgConsumption, data) {
+  if (d.attributes.xpert) {
+    return automaticReports.calculateXpertSpentFuel(day, data.route)
+  }
+  if (userData.withOdooServices) {
+    return Math.round((avgConsumption * (data.trips.reduce((a, b) => a + b.distance, 0) / 1000)) / 100)
+  }
+  return automaticReports.calculateSpentFuel(data.trips.reduce((a, b) => a + b.spentFuel, 0), d)
 }
 
-function calculateConsumption(userData, d, day, avgConsumption, data) {
-    if (d.attributes.xpert) {
-        return automaticReports.calculateXpertSpentFuel(day, data.route)
-    }
-    if (userData.withOdooServices) {
-        return Math.round((avgConsumption * (data.trips.reduce((a, b) => a + b.distance, 0)/1000)) / 100)
+function exportFuelConsumptionReportToExcel (userData, reportData) {
+  const lang = userData.user.attributes.lang
+  const translations = messages[lang] ? messages[lang] : messages['en-GB']
+
+  const settings = {
+    sheetName: 'FuelConsumptionReport', // The name of the sheet
+    fileName: 'FuelConsumptionReport' // The name of the spreadsheet
+  }
+  const headers = [
+    { label: translations.report.name, value: 'name' },
+    { label: translations.report.date, value: 'date' },
+    { label: translations.report.kms, value: 'kms' },
+    { label: translations.report.consumption, value: 'consumption' },
+    { label: translations.report.avg_consumption, value: 'avg_consumption' },
+    { label: translations.report.duration, value: 'duration' },
+    { label: translations.report.accumulated_kms, value: 'accumulated_kms' },
+    { label: translations.report.refueling, value: 'refueling' }
+  ]
+  let data = []
+  if (reportData.devices) {
+    reportData.devices.forEach((d) => {
+      data = data.concat(d.days.map((r) => {
+        return {
+          name: d.device.name,
+          date: r.date,
+          kms: (r.distance / 1000).toFixed(2),
+          consumption: r.spentFuel > 0 ? r.spentFuel : 0,
+          avg_consumption: r.avgConsumption,
+          duration: new Date(r.duration).toLocaleTimeString(),
+          accumulated_kms: (r.endOdometer / 1000).toFixed(2),
+          refueling: r.refueling
+        }
+      }))
+    })
+    return {
+      headers,
+      data,
+      settings
     }
-    return automaticReports.calculateSpentFuel(data.trips.reduce((a, b) => a + b.spentFuel, 0), d)
+  }
+}
+
+function exportFuelConsumptionReportToPDF (userData, reportData) {
+  console.log('Export to PDF')
 }
 
 exports.createFuelConsumptionReport = createFuelConsumptionReport
+exports.exportFuelConsumptionReportToPDF = exportFuelConsumptionReportToPDF
+exports.exportFuelConsumptionReportToExcel = exportFuelConsumptionReportToExcel

package/src/fueldrop-report.js

@@ -1,92 +1,136 @@
-const automaticReports = require("./automaticReports");
-const {devicesToProcess} = require("./util/device");
-
-function calculateFuelDrop(position, positions) {
-    const index = positions.indexOf(position)
-    if (index > 0) {
-        let backIndex = 1
-        while ((backIndex < 10) && index - backIndex >= 0) {
-            const positionBefore = positions[index - backIndex]
-            const diff = positionBefore.attributes.fuel - position.attributes.fuel
-            if (diff > 0) {
-                return diff
-            }
-            backIndex++
-        }
+const automaticReports = require('./automaticReports')
+const { devicesToProcess } = require('./util/device')
+const messages = require('../lang')
+
+function calculateFuelDrop (position, positions) {
+  const index = positions.indexOf(position)
+  if (index > 0) {
+    let backIndex = 1
+    while ((backIndex < 10) && index - backIndex >= 0) {
+      const positionBefore = positions[index - backIndex]
+      const diff = positionBefore.attributes.fuel - position.attributes.fuel
+      if (diff > 0) {
+        return diff
+      }
+      backIndex++
     }
-    return 0
+  }
+  return 0
 }
 
+async function createFuelDropReport (from, to, userData, traccar) {
+  console.log('Create FuelDropReport')
 
-async function createFuelDropReport(from, to, userData, traccar) {
-    console.log('Create FuelDropReport')
-
-    const reportData = []
+  const reportData = []
 
-    const allData = {
-        devices: [],
-        from: from,
-        to: to
-    }
+  const allData = {
+    devices: [],
+    from,
+    to
+  }
 
-    const devices = devicesToProcess(userData)
+  const devices = devicesToProcess(userData)
 
-    const arrayOfArrays = automaticReports.sliceArray(devices)
-    let data = []
-    const types = ['deviceFuelDrop']
+  const arrayOfArrays = automaticReports.sliceArray(devices)
+  let data = []
+  const types = ['deviceFuelDrop']
 
-    for (const a of arrayOfArrays) {
-        const response = await traccar.reports.reportsEventsGet(from, to, a.map(d => d.id), null, types)
-        data = data.concat(response.data)
-    }
+  for (const a of arrayOfArrays) {
+    const response = await traccar.reports.reportsEventsGet(from, to, a.map(d => d.id), null, types)
+    data = data.concat(response.data)
+  }
 
-    console.log('FuelDrop Alerts:'+data.length)
+  console.log('FuelDrop Alerts:' + data.length)
 
-    if(data.length === 0) {
-        return reportData
-    }
-    allData.totalDevices = 0
-    allData.totalFuelDrops = 0
-    allData.totalFuelDropLiters = 0
-
-    for (const d of devices) {
-        const alerts = data.filter(t => t.deviceId===d.id)
-
-        if(alerts.length > 0) {
-            const response = await traccar.reports.reportsRouteGet(from, to, [d.id])
-            const positions = response.data
-
-            for (const a of alerts) {
-                a.fuelDropLiters = 0
-                if(a.positionId > 0) {
-                    const position = positions.find(p => p.id === a.positionId)
-                    if (position) {
-                        a.position = position
-                        const diff = calculateFuelDrop(position, positions)
-                        a.fuelDropLiters = Math.round(diff * d.attributes.fuel_tank_capacity / 100)
-                    }
-                }
-            }
-
-            //Filter wrong fuel drop values
-            const filteredAlerts = alerts.filter(a => a.fuelDropLiters < d.attributes.fuel_tank_capacity && a.fuelDropLiters > 0)
-
-            if(filteredAlerts.length > 0) {
-                allData.devices.push({
-                    device: d,
-                    alerts: filteredAlerts
-                })
-
-                allData.totalDevices = allData.totalDevices + 1
-                allData.totalFuelDrops = allData.totalFuelDrops + filteredAlerts.length
-                allData.totalFuelDropLiters = allData.totalFuelDropLiters + filteredAlerts.reduce((a, b) => a + b.fuelDropLiters, 0)
-            }
+  if (data.length === 0) {
+    return reportData
+  }
+  allData.totalDevices = 0
+  allData.totalFuelDrops = 0
+  allData.totalFuelDropLiters = 0
+
+  for (const d of devices) {
+    const alerts = data.filter(t => t.deviceId === d.id)
+
+    if (alerts.length > 0) {
+      const response = await traccar.reports.reportsRouteGet(from, to, [d.id])
+      const positions = response.data
+
+      for (const a of alerts) {
+        a.fuelDropLiters = 0
+        if (a.positionId > 0) {
+          const position = positions.find(p => p.id === a.positionId)
+          if (position) {
+            a.position = position
+            const diff = calculateFuelDrop(position, positions)
+            a.fuelDropLiters = Math.round(diff * d.attributes.fuel_tank_capacity / 100)
+          }
         }
+      }
+
+      // Filter wrong fuel drop values
+      const filteredAlerts = alerts.filter(a => a.fuelDropLiters < d.attributes.fuel_tank_capacity && a.fuelDropLiters > 0)
+
+      if (filteredAlerts.length > 0) {
+        allData.devices.push({
+          device: d,
+          alerts: filteredAlerts
+        })
+
+        allData.totalDevices = allData.totalDevices + 1
+        allData.totalFuelDrops = allData.totalFuelDrops + filteredAlerts.length
+        allData.totalFuelDropLiters = allData.totalFuelDropLiters + filteredAlerts.reduce((a, b) => a + b.fuelDropLiters, 0)
+      }
     }
+  }
 
-    reportData.push(allData)
+  reportData.push(allData)
 
-    return reportData
+  return reportData
+}
+
+function exportFuelDropReportToExcel (userData, reportData) {
+  console.log('Export to Excel')
+  const lang = userData.user.attributes.lang
+  const translations = messages[lang] ? messages[lang] : messages['en-GB']
+
+  const settings = {
+    sheetName: 'FuelDropReport', // The name of the sheet
+    fileName: 'FuelDropReport' // The name of the spreadsheet
+  }
+  const headers = [
+    { label: translations.report.name, value: 'name' },
+    { label: translations.report.driver, value: 'driver' },
+    { label: translations.report.date, value: 'fixTime' },
+    { label: translations.report.address, value: 'address' },
+    { label: translations.report.fueldrop, value: 'fuelDropLiters' }
+  ]
+  let data = []
+  if (reportData.devices) {
+    reportData.devices.forEach(d => {
+      data = data.concat(d.alerts.map(r => {
+        return {
+          driver: r.driverName,
+          fuelDropLiters: r.fuelDropLiters,
+          fixTime: new Date(r.position.fixTime).toLocaleString(),
+          name: d.device.name,
+          address: r.geofenceName || r.position.address
+        }
+      }))
+    })
+  }
+
+  return {
+    headers,
+    data,
+    settings
+  }
+}
+
+function exportFuelDropReportToPDF (userData, reportData) {
+  console.log('Export to PDF')
 }
 
 exports.createFuelDropReport = createFuelDropReport
+exports.exportFuelDropReportToPDF = exportFuelDropReportToPDF
+exports.exportFuelDropReportToExcel = exportFuelDropReportToExcel

package/src/idle-report.js

@@ -162,6 +162,11 @@ function processDevices (from, to, devices, routes, userData) {
     const filteredEvents = idleEvents.filter(e => userData.minimumIdleMinutes ? e.idleTime > userData.minimumIdleMinutes * 60 * 1000 : true)
 
     if (filteredEvents.length) {
+      filteredEvents.forEach(e => {
+        const driver = userData.drivers.find(d => d.id === e.position.attributes.driverUniqueId)
+        e.driver = driver ? driver.name : ''
+      })
+
       const deviceData = {
         device: d,
         idleEvents: filteredEvents
@@ -291,11 +296,11 @@ function exportIdleReportToExcel (userData, reportData) {
     fileName // The name of the spreadsheet
   }
   const headers = [
-    userData.byDriver ? { label: translations.report.driver, value: 'driver' } : { label: translations.report.vehicle, value: 'name' },
+    userData.byDriver ? { label: translations.report.driver, value: 'name' } : { label: translations.report.vehicle, value: 'name' },
     { label: translations.report.date, value: 'fixTime' },
     { label: translations.report.address, value: 'address' },
     { label: translations.report.duration, value: 'duration' },
-    userData.byDriver ? { label: translations.report.vehicle, value: 'name' } : { label: translations.report.driver, value: 'driver' }
+    userData.byDriver ? { label: translations.report.vehicle, value: 'subname' } : { label: translations.report.driver, value: 'subname' }
   ]
 
   let data = []
@@ -304,13 +309,19 @@ function exportIdleReportToExcel (userData, reportData) {
       data = data.concat([{}])
       data = data.concat(d.idleEvents.map(a => {
         return {
-          driver: userData.byDriver ? d.driver.name : a.driver,
+          name: userData.byDriver ? d.driver.name : d.device.name,
           duration: convertMS(a.idleTime, true),
           fixTime: getIdleEventDate(a, userData.user),
-          name: userData.byDriver ? a.deviceName : d.device.name,
+          subname: userData.byDriver ? a.driver : a.deviceName,
           address: a.position.address + (a.geofenceName ? ' - ' + a.geofenceName : '')
         }
       }))
+      // Totals
+      data = data.concat([{
+        name: d.idleEvents.length,
+        duration: convertMS(d.idleEvents.reduce((a, b) => a + b.idleTime, 0), true)
+      }])
+      data = data.concat([{}])
     })
     console.log(data)
     return {

package/src/index.js

@@ -1,143 +1,166 @@
-function Reports(config, axios, cookieJar) {
-    const {ReportsApi, PositionsApi, SessionApi, DevicesApi, GroupsApi, DriversApi, GeofencesApi} = require('traccar-api')
-    this.traccar = {
-        reports: new ReportsApi(config, null, axios),
-        positions: new PositionsApi(config, null, axios),
-        session: new SessionApi(config, null, axios),
-        devices: new DevicesApi(config, null, axios),
-        groups: new GroupsApi(config, null, axios),
-        drivers: new DriversApi(config, null, axios),
-        geofences: new GeofencesApi(config, null, axios),
-        axios: axios || require('axios').create({...config.baseOptions, baseURL: config.basePath}),
-        cookieJar
-    }
-    this.getUserData = async () => {
-        return {
-            user: await this.traccar.session.sessionGet().then(d => d.data),
-            devices: await this.traccar.devices.devicesGet().then(d => d.data),
-            groups: await this.traccar.groups.groupsGet().then(d => d.data),
-            drivers: await this.traccar.drivers.driversGet().then(d => d.data),
-            geofences: await this.traccar.geofences.geofencesGet().then(d => d.data),
-            byGroup: false
-        }
-    }
-    this.speedingReport = (from, to, userData) => {
-        return require('./speeding-report').createSpeedingReport(from, to, userData, this.traccar)
-    }
-
-    this.speedingReportToPDF = (userData, reportData) => {
-        return require('./speeding-report').exportSpeedingReportToPDF(userData, reportData)
-    }
-
-    this.speedingReportToExcel = (userData, reportData) => {
-        return require('./speeding-report').exportSpeedingReportToExcel(userData, reportData)
-    }
-
-    this.tripReport = (from, to, userData) => {
-        return require('./trip-report').createTripReport(from, to, userData, this.traccar)
-    }
-    this.tripReportToPDF = (userData, reportData) => {
-        return require('./trip-report').exportTripReportToPDF(userData, reportData)
-    }
-    this.tripReportToExcel = (userData, reportData) => {
-        return require('./trip-report').exportTripReportToExcel(userData, reportData)
-    }
-
-    this.zoneReport = (from, to, userData) => {
-        return require('./zone-report').createZoneReport(from, to, userData, this.traccar)
-    }
-
-    this.zoneReportToPDF = (userData, reportData) => {
-        return require('./zone-report').exportZoneReportToPDF(userData, reportData)
-    }
-
-    this.zoneReportToExcel = (userData, reportData) => {
-        return require('./zone-report').exportZoneReportToExcel(userData, reportData)
-    }
-
-    this.refuelingReport = (from, to, userData) => {
-        return require('./refueling-report').createRefuelingReport(from, to, userData, this.traccar)
-    }
-
-    this.fuelDropReport = (from, to, userData) => {
-        return require('./fueldrop-report').createFuelDropReport(from, to, userData, this.traccar)
-    }
-
-    this.eventsReport = (from, to, userData) => {
-        return require('./events-report').createEventsReport(from, to, userData, this.traccar)
-    }
-
-    this.eventsReportToPDF = (userData, reportData) => {
-        return require('./events-report').exportSpeedingReportToPDF(userData, reportData)
-    }
-
-    this.eventsReportToExcel = (userData, reportData) => {
-        return require('./events-report').exportSpeedingReportToExcel(userData, reportData)
-    }
-
-    this.fuelConsumptionReport = (from, to, userData) => {
-        return require('./fuelconsumption-report').createFuelConsumptionReport(from, to, userData, this.traccar)
-    }
-
-    this.locationReport = (from, to, userData) => {
-        return require('./location-report').createLocationReport(from, to, userData, this.traccar)
-    }
-
-    this.locationReportToPDF = (userData, reportData) => {
-        return require('./location-report').exportLocationReportToPDF(userData, reportData)
-    }
-
-    this.locationReportToExcel = (userData, reportData) => {
-        return require('./location-report').exportLocationReportToExcel(userData, reportData)
-    }
-
-    this.activityReport = (from, to, userData) => {
-        return require('./activity-report').createActivityReport(from, to, userData, this.traccar)
-    }
-
-    this.activityReportToPDF = (userData, reportData) => {
-        return require('./activity-report').exportActivityReportToPDF(userData, reportData)
-    }
-
-    this.activityReportToExcel = (userData, reportData) => {
-        return require('./activity-report').exportActivityReportToExcel(userData, reportData)
-    }
-
-    this.kmsReport = (from, to, userData) => {
-        return require('./kms-report').createKmsReport(from, to, userData, this.traccar)
-    }
-
-    this.kmsReportToPDF = (userData, reportData) => {
-        return require('./kms-report').exportKmsReportToPDF(userData, reportData)
-    }
-
-    this.reportToWord = require('./word').reportToWord
-
-    this.kmsReportToExcel = (userData, reportData) => {
-        return require('./kms-report').exportKmsReportToExcel(userData, reportData)
-    }
-
-    this.vistaWasteActivityReport = (from, to, userData) => {
-        return require('./custom/vistawasteActivity-report').createVistaWasteActivityReport(from, to, userData, this.traccar)
-    }
-
-    this.vistaWasteActivityReportToPDF = (userData, reportData) => {
-        return require('./custom/vistawasteActivity-report').exportVistaWasteActivityReportToPDF(userData, reportData)
-    }
-
-    this.vistaWasteActivityReportToExcel = (userData, reportData) => {
-        return require('./custom/vistawasteActivity-report').exportVistaWasteActivityReportToExcel(userData, reportData)
-    }
-
-    this.idleReport = (from, to, userData) => {
-        return require('./idle-report').createIdleReport(from, to, userData, this.traccar)
-    }
-    this.idleReportToPDF = (userData, reportData) => {
-        return require('./idle-report').exportIdleReportToPDF(userData, reportData)
-    }
-    this.idleReportToExcel = (userData, reportData) => {
-        return require('./idle-report').exportIdleReportToExcel(userData, reportData)
-    }
+function Reports (config, axios, cookieJar) {
+  const { ReportsApi, PositionsApi, SessionApi, DevicesApi, GroupsApi, DriversApi, GeofencesApi } = require('traccar-api')
+  this.traccar = {
+    reports: new ReportsApi(config, null, axios),
+    positions: new PositionsApi(config, null, axios),
+    session: new SessionApi(config, null, axios),
+    devices: new DevicesApi(config, null, axios),
+    groups: new GroupsApi(config, null, axios),
+    drivers: new DriversApi(config, null, axios),
+    geofences: new GeofencesApi(config, null, axios),
+    axios: axios || require('axios').create({ ...config.baseOptions, baseURL: config.basePath }),
+    cookieJar
+  }
+  this.getUserData = async () => {
+    return {
+      user: await this.traccar.session.sessionGet().then(d => d.data),
+      devices: await this.traccar.devices.devicesGet().then(d => d.data),
+      groups: await this.traccar.groups.groupsGet().then(d => d.data),
+      drivers: await this.traccar.drivers.driversGet().then(d => d.data),
+      geofences: await this.traccar.geofences.geofencesGet().then(d => d.data),
+      byGroup: false
+    }
+  }
+  this.speedingReport = (from, to, userData) => {
+    return require('./speeding-report').createSpeedingReport(from, to, userData, this.traccar)
+  }
+
+  this.speedingReportToPDF = (userData, reportData) => {
+    return require('./speeding-report').exportSpeedingReportToPDF(userData, reportData)
+  }
+
+  this.speedingReportToExcel = (userData, reportData) => {
+    return require('./speeding-report').exportSpeedingReportToExcel(userData, reportData)
+  }
+
+  this.tripReport = (from, to, userData) => {
+    return require('./trip-report').createTripReport(from, to, userData, this.traccar)
+  }
+  this.tripReportToPDF = (userData, reportData) => {
+    return require('./trip-report').exportTripReportToPDF(userData, reportData)
+  }
+  this.tripReportToExcel = (userData, reportData) => {
+    return require('./trip-report').exportTripReportToExcel(userData, reportData)
+  }
+
+  this.zoneReport = (from, to, userData) => {
+    return require('./zone-report').createZoneReport(from, to, userData, this.traccar)
+  }
+
+  this.zoneReportToPDF = (userData, reportData) => {
+    return require('./zone-report').exportZoneReportToPDF(userData, reportData)
+  }
+
+  this.zoneReportToExcel = (userData, reportData) => {
+    return require('./zone-report').exportZoneReportToExcel(userData, reportData)
+  }
+
+  this.refuelingReport = (from, to, userData) => {
+    return require('./refueling-report').createRefuelingReport(from, to, userData, this.traccar)
+  }
+
+  this.refuelingReportToPDF = (userData, reportData) => {
+    return require('./refueling-report').exportRefuelingReportToPDF(userData, reportData)
+  }
+
+  this.refuelingReportToExcel = (userData, reportData) => {
+    return require('./refueling-report').exportRefuelingReportToExcel(userData, reportData)
+  }
+
+  this.fuelDropReport = (from, to, userData) => {
+    return require('./fueldrop-report').createFuelDropReport(from, to, userData, this.traccar)
+  }
+
+  this.fuelDropReportToExcel = (userData, reportData) => {
+    return require('./fueldrop-report').exportFuelDropReportToExcel(userData, reportData)
+  }
+
+  this.fuelDropReportToPDF = (userData, reportData) => {
+    return require('./fueldrop-report').exportFuelDropReportToPDF(userData, reportData)
+  }
+
+  this.eventsReport = (from, to, userData) => {
+    return require('./events-report').createEventsReport(from, to, userData, this.traccar)
+  }
+
+  this.eventsReportToPDF = (userData, reportData) => {
+    return require('./events-report').exportSpeedingReportToPDF(userData, reportData)
+  }
+
+  this.eventsReportToExcel = (userData, reportData) => {
+    return require('./events-report').exportSpeedingReportToExcel(userData, reportData)
+  }
+
+  this.fuelConsumptionReport = (from, to, userData) => {
+    return require('./fuelconsumption-report').createFuelConsumptionReport(from, to, userData, this.traccar)
+  }
+
+  this.fuelConsumptionReportToPDF = (userData, reportData) => {
+    return require('./fuelconsumption-report').exportFuelConsumptionReportToPDF(userData, reportData)
+  }
+
+  this.fuelConsumptionReportToExcel = (userData, reportData) => {
+    return require('./fuelconsumption-report').exportFuelConsumptionReportToExcel(userData, reportData)
+  }
+
+  this.locationReport = (from, to, userData) => {
+    return require('./location-report').createLocationReport(from, to, userData, this.traccar)
+  }
+
+  this.locationReportToPDF = (userData, reportData) => {
+    return require('./location-report').exportLocationReportToPDF(userData, reportData)
+  }
+
+  this.locationReportToExcel = (userData, reportData) => {
+    return require('./location-report').exportLocationReportToExcel(userData, reportData)
+  }
+
+  this.activityReport = (from, to, userData) => {
+    return require('./activity-report').createActivityReport(from, to, userData, this.traccar)
+  }
+
+  this.activityReportToPDF = (userData, reportData) => {
+    return require('./activity-report').exportActivityReportToPDF(userData, reportData)
+  }
+
+  this.activityReportToExcel = (userData, reportData) => {
+    return require('./activity-report').exportActivityReportToExcel(userData, reportData)
+  }
+
+  this.kmsReport = (from, to, userData) => {
+    return require('./kms-report').createKmsReport(from, to, userData, this.traccar)
+  }
+
+  this.kmsReportToPDF = (userData, reportData) => {
+    return require('./kms-report').exportKmsReportToPDF(userData, reportData)
+  }
+
+  this.reportToWord = require('./word').reportToWord
+
+  this.kmsReportToExcel = (userData, reportData) => {
+    return require('./kms-report').exportKmsReportToExcel(userData, reportData)
+  }
+
+  this.vistaWasteActivityReport = (from, to, userData) => {
+    return require('./custom/vistawasteActivity-report').createVistaWasteActivityReport(from, to, userData, this.traccar)
+  }
+
+  this.vistaWasteActivityReportToPDF = (userData, reportData) => {
+    return require('./custom/vistawasteActivity-report').exportVistaWasteActivityReportToPDF(userData, reportData)
+  }
+
+  this.vistaWasteActivityReportToExcel = (userData, reportData) => {
+    return require('./custom/vistawasteActivity-report').exportVistaWasteActivityReportToExcel(userData, reportData)
+  }
+
+  this.idleReport = (from, to, userData) => {
+    return require('./idle-report').createIdleReport(from, to, userData, this.traccar)
+  }
+  this.idleReportToPDF = (userData, reportData) => {
+    return require('./idle-report').exportIdleReportToPDF(userData, reportData)
+  }
+  this.idleReportToExcel = (userData, reportData) => {
+    return require('./idle-report').exportIdleReportToExcel(userData, reportData)
+  }
 }
 module.exports = Reports
-

package/src/refueling-report.js

@@ -2,6 +2,7 @@ const helpers = require('@turf/helpers')
 const automaticReports = require('./automaticReports')
 const { devicesToProcess } = require('./util/device')
 const distance = require('@turf/distance')
+const messages = require('../lang')
 
 const positionsToCheck = 15
 
@@ -175,5 +176,49 @@ async function calculateRefuelingPositions (userData, d, data) {
   return refuelingPositions
 }
 
+function exportRefuelingReportToExcel (userData, reportData) {
+  console.log('Export to Excel')
+  const lang = userData.user.attributes.lang
+  const translations = messages[lang] ? messages[lang] : messages['en-GB']
+
+  const settings = {
+    sheetName: 'RefuelingReport', // The name of the sheet
+    fileName: 'RefuelingReport' // The name of the spreadsheet
+  }
+  const headers = [
+    { label: translations.report.name, value: 'name' },
+    { label: translations.report.driver, value: 'driver' },
+    { label: translations.report.date, value: 'fixTime' },
+    { label: translations.report.address, value: 'address' },
+    { label: translations.report.refueling, value: 'diff' }
+  ]
+  let data = []
+  if (reportData.devices) {
+    reportData.devices.forEach(d => {
+      data = data.concat(d.refuelings.map(r => {
+        return {
+          driver: r.driverName,
+          diff: r.diff,
+          fixTime: new Date(r.position.fixTime).toLocaleString(),
+          name: d.device.name,
+          address: r.geofenceName || r.position.address
+        }
+      }))
+    })
+  }
+
+  return {
+    headers,
+    data,
+    settings
+  }
+}
+
+function exportRefuelingReportToPDF (userData, reportData) {
+  console.log('Export to PDF')
+}
+
 exports.createRefuelingReport = createRefuelingReport
 exports.calculateRefuelingPositions = calculateRefuelingPositions
+exports.exportRefuelingReportToPDF = exportRefuelingReportToPDF
+exports.exportRefuelingReportToExcel = exportRefuelingReportToExcel

package/src/trip-report.js

@@ -358,7 +358,7 @@ function exportTripReportToExcel (userData, reportData) {
   }
   const headers = userData.byDriver
     ? [
-        { label: translations.report.driver, value: 'driver' },
+        { label: translations.report.driver, value: 'name' },
         { label: translations.report.date, value: 'date' },
         { label: translations.report.start, value: 'start' },
         { label: translations.report.end, value: 'end' },
@@ -369,7 +369,7 @@ function exportTripReportToExcel (userData, reportData) {
         { label: translations.report.distance, value: 'distance' },
         { label: translations.report.avgSpeed, value: 'averageSpeed' },
         { label: translations.report.maxSpeed, value: 'maxSpeed' },
-        { label: translations.report.vehicle, value: 'name' }
+        { label: translations.report.vehicle, value: 'subname' }
       ]
     : [
         { label: translations.report.vehicle, value: 'name' },
@@ -383,7 +383,7 @@ function exportTripReportToExcel (userData, reportData) {
         { label: translations.report.distance, value: 'distance' },
         { label: translations.report.avgSpeed, value: 'averageSpeed' },
         { label: translations.report.maxSpeed, value: 'maxSpeed' },
-        { label: translations.report.driver, value: 'driver' }
+        { label: translations.report.driver, value: 'subname' }
       ]
   let data = []
   if (tripsData) {
@@ -391,7 +391,7 @@ function exportTripReportToExcel (userData, reportData) {
       data = data.concat([{}])
       data = data.concat(d.trips.map(a => {
         return {
-          name: a.deviceName,
+          name: userData.byDriver ? getDriverName(userData.drivers, a.driverUniqueId) : a.deviceName,
           date: getTripDate(userData.user, a),
           start: getTripStart(userData.user, a),
           end: getTripEnd(userData.user, a),
@@ -402,9 +402,20 @@ function exportTripReportToExcel (userData, reportData) {
           distance: Number(a.totalKms.toFixed(2)),
           averageSpeed: Math.round(a.averageSpeed * 1.85200),
           maxSpeed: Math.round(a.maxSpeed * 1.85200),
-          driver: getDriverName(userData.drivers, a.driverUniqueId)
+          subname: userData.byDriver ? a.deviceName : getDriverName(userData.drivers, a.driverUniqueId)
         }
       }))
+      // Totals
+      data = data.concat([{
+        name: d.trips.length,
+        tripTime: convertMS(d.trips.reduce((a, b) => a + b.duration, 0)),
+        idleTime: convertMS(d.trips.reduce((a, b) => a + b.stopEngineHours, 0)),
+        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)
+      }])
+      data = data.concat([{}])
     })
     console.log(data)
     return {