fleetmap-reports 1.0.976 → 1.0.977

package/package.json

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

package/src/index.js

@@ -19,6 +19,7 @@ function Reports (config, axios, cookieJar) {
       drivers: await this.traccar.drivers.driversGet().then(d => d.data),
       geofences: await this.traccar.geofences.geofencesGet().then(d => d.data),
       byGroup: false,
+      allWeek: true,
       dayHours: { startTime: '00:00', endTime: '23:59' }
     }
   }
@@ -183,5 +184,25 @@ function Reports (config, axios, cookieJar) {
   this.stopReportToExcel = (userData, reportData) => {
     return require('./stop-report').exportStopReportToExcel(userData, reportData)
   }
+
+  this.performanceReport = (from, to, userData) => {
+    return require('./partnerReports/performance-report').createPerformanceReport(from, to, userData, this.traccar)
+  }
+  this.performanceReportToPDF = (userData, reportData) => {
+    return require('./partnerReports/performance-report').exportPerformanceReportToPDF(userData, reportData)
+  }
+  this.performanceReportToExcel = (userData, reportData) => {
+    return require('./partnerReports/performance-report').exportPerformanceReportToExcel(userData, reportData)
+  }
+
+  this.dailyUseReport = (from, to, userData) => {
+    return require('./partnerReports/dailyuse-report').createDailyUseReport(from, to, userData, this.traccar)
+  }
+  this.dailyUseReportToPDF = (userData, reportData) => {
+    return require('./partnerReports/dailyuse-report').exportDailyUseReportToPDF(userData, reportData)
+  }
+  this.dailyUseReportToExcel = (userData, reportData) => {
+    return require('./partnerReports/dailyuse-report').exportDailyUseReportToExcel(userData, reportData)
+  }
 }
 module.exports = Reports

package/src/partnerReports/dailyuse-report.js

@@ -1,7 +1,11 @@
 const traccarHelper = require('../util/traccar')
 const { isInsideTimetable } = require('../util/trips')
-const { convertFromUTCDate } = require('../util/utils')
+const { convertFromUTCDate, getTranslations, convertMS } = require('../util/utils')
 const automaticReports = require('../automaticReports')
+const jsPDF = require('jspdf')
+const { getStyle } = require('../reportStyle')
+const { getUserPartner } = require('fleetmap-partners')
+const { addTable, headerFromUser } = require('../util/pdfDocument')
 
 async function createDailyUseReport (from, to, userData, traccar) {
   const reportData = []
@@ -77,4 +81,78 @@ function processDeviceData (allInOne, d, userData) {
   }
 }
 
+async function exportDailyUseReportToPDF (userData, reportData) {
+  const translations = getTranslations(userData)
+
+  const headers = [
+    translations.report.vehicle,
+    'Utilisation',
+    'Conduite',
+    'Ralenti',
+    'Totale (L)',
+    'Conduite (L)',
+    'Ralenti (L)',
+    'Conduite (Km)',
+    'Économique',
+    'Économique (L)',
+    'Économique (Km)',
+    'Cruise Control',
+    'Cruise Control (L)',
+    'Cruise Control (Km)',
+    'Tour moteur élevé',
+    'Accéleration brusque (Sum)',
+    'Freinage brusque (Sum)',
+    'Virages brusque'
+  ]
+
+  const data = []
+  reportData.forEach(d => {
+    const row = [
+      d.device,
+      convertMS((d.drivingTime + d.idleTime) * 1000),
+      convertMS(d.drivingTime * 1000),
+      convertMS(d.idleTime * 1000),
+      d.drivingConsumption + d.idleConsumption,
+      d.drivingConsumption,
+      d.idleConsumption,
+      d.drivingDistance.toFixed(2),
+      convertMS(d.economicTime * 1000),
+      d.economicConsumption.toFixed(1),
+      d.economicDistance.toFixed(2),
+      convertMS(d.cruiseControlTime * 1000),
+      d.cruiseControlConsumption.toFixed(1),
+      d.cruiseControlDistance.toFixed(2),
+      convertMS(d.highEngineRPM * 1000),
+      d.hardAcceleration,
+      d.hardBraking,
+      d.hardCornering
+    ]
+    data.push(row)
+  })
+
+  const doc = new jsPDF.jsPDF('l')
+  await headerFromUser(doc, 'Rapport de Performance', userData.user)
+  const style = getStyle(getUserPartner(userData.user))
+
+  const footValues = []
+
+  doc.setFontSize(11)
+  doc.text(new Date(userData.from).toLocaleString() + ' - ' + new Date(userData.to).toLocaleString(), 20, 33)
+
+  style.headerFontSize = 8
+  style.bodyFontSize = 7
+  const columnStyles = {}
+  for (let i = 1; i < 18; i++) {
+    columnStyles[i] = { halign: 'right' }
+  }
+  addTable(doc, headers, data, footValues, style, 40, columnStyles)
+  return doc
+}
+
+function exportDailyUseReportToExcel (userData, reportData) {
+
+}
+
 exports.createDailyUseReport = createDailyUseReport
+exports.exportDailyUseReportToPDF = exportDailyUseReportToPDF
+exports.exportDailyUseReportToExcel = exportDailyUseReportToExcel

package/src/partnerReports/passenger-report.js

@@ -0,0 +1,46 @@
+async function createPassengerReport (from, to, userData, traccar) {
+  //const allDevices = await traccar.axios.get('/devices').then(d => d.data)
+  const devices = userData.devices
+  const drivers = await traccar.axios.get('/drivers').then(d => d.data)
+  const groups = await traccar.axios.get('/groups').then(d => d.data)
+  await Promise.all(groups.map(async g => {
+    const driversByGroup = await traccar.axios.get(`/drivers?groupId=${g.id}`).then(d => d.data)
+    driversByGroup.forEach(d => {
+      const _driver = drivers.find(a => a.id === d.id)
+      if (_driver) {
+        _driver.groupName = g.name
+      }
+    })
+  }))
+  const eventsUrl = `/reports/events?${devices.map(d => 'deviceId=' + d.id).join('&')
+}&from=${from.toISOString()
+}&to=${to.toISOString()
+}`
+  const positionsUrl = `/reports/route?${devices.map(d => 'deviceId=' + d.id).join('&')
+}&from=${from.toISOString()
+}&to=${to.toISOString()
+}`
+  const events = await traccar.axios.get(eventsUrl).then(d => d.data)
+  const positions = await traccar.axios.get(positionsUrl).then(d => d.data)
+  events.forEach(e => {
+    delete e.attributes
+    const driver = getDriver(e, positions, drivers)
+    const position = positions.find(p => p.id === e.positionId)
+    e.deviceName = devices.find(d => d.id === e.deviceId).name
+    e.groupName = driver.groupName || ''
+    e.fixtime = position && new Date(position.fixTime)
+    e.notes = driver && driver.attributes.notes
+    e.driverName = (driver && driver.name) || (position && position.attributes.driverUniqueId)
+  })
+  return events
+}
+
+function getDriver (event, positions, drivers) {
+  const p = positions.find(p => p.id === event.positionId)
+  if (!p) { return '' }
+  const d = drivers.find(d => d.uniqueId === p.attributes.driverUniqueId)
+  if (!d) { return '' }
+  return d
+}
+
+exports.createPassengerReport = createPassengerReport

package/src/temperature-report.js

@@ -0,0 +1,11 @@
+const traccarHelper = require('./util/traccar')
+const { devicesToProcess } = require('./util/device')
+
+async function createTemperatureReport (from, to, userData, traccar) {
+  const devices = devicesToProcess(userData)
+
+  const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, false, false, false)
+  const routeData = allInOne.route
+
+
+}

package/src/tests/activity.test.js

@@ -35,8 +35,8 @@ describe('activity report', function () {
     const report = await getReports()
     const userData = await report.getUserData()
     userData.groupByDay = true
-    const data = await report.activityReport(new Date(2022, 0, 1, 0, 0, 0, 0),
-      new Date(2022, 0, 20, 23, 59, 59, 0),
+    const data = await report.activityReport(new Date(2023, 9, 1, 0, 0, 0, 0),
+      new Date(2023, 9, 20, 23, 59, 59, 0),
       userData)
     assert.equal(data.length, 1)
     const device = data[0].devices.find(d => d.device.id === 22326)

package/src/tests/dailyuse.test.js

@@ -0,0 +1,19 @@
+const { getReports } = require('./index')
+const assert = require('assert')
+const { createDailyUseReport } = require('../partnerReports/dailyuse-report')
+
+describe('dailyuse', function () {
+  // eslint-disable-next-line no-undef
+  it('dailyuse report', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+
+    const data = await createDailyUseReport(
+      new Date(Date.UTC(2023, 10, 1, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 10, 6, 23, 59, 59, 0)),
+      userData,
+      report.traccar)
+    console.log(data)
+    assert.equal(data[0].consumption, 19.799999999999997)
+  }, 8000000)
+})

package/src/tests/gpsjump.test.js

@@ -0,0 +1,23 @@
+const { getReports } = require('./index')
+const assert = require('assert')
+const { convertMS } = require('../util/utils')
+const { createGPSJumpReport } = require('../partnerReports/gpsjump-report')
+
+// eslint-disable-next-line no-undef
+describe('gpsjump', function () {
+  // eslint-disable-next-line no-undef
+  it('gpsjump report', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.devices = userData.devices.filter(d => d.id === 22326)
+    const data = await createGPSJumpReport(
+      new Date(Date.UTC(2023, 6, 1, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 6, 17, 23, 59, 59, 0)),
+      userData,
+      report.traccar)
+    console.log(data)
+    assert.equal(data[0].consumption, 19.799999999999997)
+    assert.equal(data[0].distance, 326.7657)
+    assert.equal(convertMS(data[1].time * 1000, false), '08:19')
+  }, 8000000)
+})

package/src/tests/performance.test.js

@@ -1,7 +1,12 @@
 const { getReports } = require('./index')
-const { createPerformanceReport } = require('../partnerReports/performance-report')
+const { createPerformanceReport, exportPerformanceReportToExcel } = require('../partnerReports/performance-report')
 const assert = require('assert')
 const { convertMS } = require('../util/utils')
+const xlsx = require('@jcardus/json-as-xlsx')
+const { createActivityReport } = require('../activity-report')
+const { createFuelConsumptionReport } = require('../fuelconsumption-report')
+const { createPassengerReport } = require('../partnerReports/passenger-report')
+
 // eslint-disable-next-line no-undef
 describe('performance', function () {
   // eslint-disable-next-line no-undef
@@ -15,22 +20,59 @@ describe('performance', function () {
       userData,
       report.traccar)
     console.log(data)
+
     assert.equal(data[0].consumption, 19.799999999999997)
-    assert.equal(data[0].distance, 326.7657)
-    assert.equal(convertMS(data[1].time * 1000, false), '08:19')
+    assert.equal(data[0].distance, 326.8844199999999)
+    assert.equal(convertMS(data[1].time * 1000, false), '08:31')
   }, 8000000)
 
   // eslint-disable-next-line no-undef
   it('performance report inofleet', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
-    userData.devices = userData.devices.filter(d => d.id === 69114)
+    userData.devices = userData.devices.filter(d => d.id === 126442)
     const data = await createPerformanceReport(
-      new Date(Date.UTC(2023, 5, 11, 0, 0, 0, 0)),
-      new Date(Date.UTC(2023, 6, 11, 23, 59, 59, 0)),
+      new Date(Date.UTC(2023, 11, 9, 14, 58, 0, 0)),
+      new Date(Date.UTC(2023, 11, 18, 9, 28, 0, 0)),
       userData,
       report.traccar)
     console.log(data)
+
+    const data2 = await createFuelConsumptionReport(
+      new Date(Date.UTC(2023, 11, 9, 14, 58, 0, 0)),
+      new Date(Date.UTC(2023, 11, 18, 9, 28, 0, 0)),
+      userData,
+      report.traccar)
+    console.log(data2)
+
     assert.equal(data[0].consumption, 168.51989999999998)
   }, 8000000)
+
+  it('performance report export excel', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    const data = await createPerformanceReport(
+      new Date(Date.UTC(2023, 6, 1, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 6, 17, 23, 59, 59, 0)),
+      userData,
+      report.traccar)
+    console.log(data)
+    const excel = exportPerformanceReportToExcel(userData, data)
+    xlsx([{
+      sheet: 'Sheet1',
+      columns: excel.headers,
+      content: excel.data
+    }], excel.settings)
+  }, 8000000)
+
+  it('passenger report export excel', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    const data = await createPassengerReport(
+      new Date(Date.UTC(2023, 11, 1, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 11, 20, 23, 59, 59, 0)),
+      userData,
+      report.traccar)
+    console.log(data)
+  }, 8000000)
 })

package/src/trip-report.js

@@ -139,7 +139,11 @@ async function createTripReportByDriver (from, to, userData, traccar) {
     d.totalDuration = d.trips.reduce((a, b) => a + b.duration, 0)
     d.totalDistance = d.trips.reduce((a, b) => a + b.distance, 0)
     d.maxSpeed = d.trips.reduce((a, b) => { return a > b.maxSpeed ? a : b.maxSpeed }, 0)
-    d.trips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
+    d.trips = d.trips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
+
+    d.trips.forEach((trip, i) => {
+      trip.stopDuration = (i !== d.trips.length - 1 ? (new Date(d.trips[i + 1].startTime) - new Date(trip.endTime)) : (to - new Date(trip.endTime))) - trip.stopEngineHours
+    })
   })
 
   return report
@@ -274,8 +278,8 @@ async function processDrivers (from, to, userData, data) {
         filteredTrips.push(t)
       }
     }
-    filteredTrips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
-    filteredTrips.forEach(function (trip, i) {
+
+    filteredTrips.forEach(trip => {
       trip.totalKms = trip.distance / 1000
 
       const nearestPOIs = getNearestPOIs(trip.endLon, trip.endLat, userData.geofences)
@@ -286,7 +290,6 @@ async function processDrivers (from, to, userData, data) {
       const stop = data.stops.find(s => s.deviceId === trip.deviceId && (new Date(s.startTime).getTime() === new Date(trip.endTime).getTime()))
 
       trip.stopEngineHours = getTripIdleTime(trip, idleEvents) + (stop ? stop.engineHours : 0)
-      trip.stopDuration = (i !== trips.length - 1 ? (new Date(trips[i + 1].startTime) - new Date(trip.endTime)) : (to - new Date(trip.endTime))) - trip.stopEngineHours
     })
 
     if (filteredTrips.length > 0) {

package/src/zone-report.js

@@ -307,33 +307,33 @@ function calculateDistanceIn (zoneInOutDayData, deviceRoute, dayRoute, fromByDay
   return distanceIn
 }
 
-function calculateDistanceOut (zoneInOutDayData, dayRoute, fromByDay, toByDay, field, device) {
+function calculateDistanceOut (zoneInOutDayData, dayRoute, from, to, field, device) {
   if (zoneInOutDayData.length) {
-    const dataInsideDay = zoneInOutDayData.filter(z => z.outTime && new Date(z.outTime.fixTime) < toByDay)
+    const dataInsideDay = zoneInOutDayData.filter(z => z.outTime && new Date(z.outTime.fixTime) < to)
     let distanceOut = dataInsideDay.reduce((a, b) => a + (b[field] || 0), 0)
 
-    if (zoneInOutDayData[0].inTime && new Date(zoneInOutDayData[0].inTime.fixTime) > fromByDay && (field !== 'distanceOutAny' || zoneInOutDayData[0].anyLastExit)) {
+    if (zoneInOutDayData[0].inTime && new Date(zoneInOutDayData[0].inTime.fixTime) > from && (field !== 'distanceOutAny' || zoneInOutDayData[0].anyLastExit)) {
       // Add distanceOut before the first entry
       const routeOut = dayRoute.filter(p =>
         new Date(p.fixTime).getTime() < new Date(zoneInOutDayData[0].inTime.fixTime).getTime() &&
-          new Date(p.fixTime).getTime() >= fromByDay.getTime()
+          new Date(p.fixTime).getTime() >= from.getTime()
       )
       distanceOut = distanceOut + calculateDistance(routeOut, device.attributes['report.ignoreOdometer'])
     }
 
-    if (zoneInOutDayData[zoneInOutDayData.length - 1].outTime && new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime) < toByDay && (field !== 'distanceOutAny' || zoneInOutDayData[zoneInOutDayData.length - 1].anyNextIn)) {
+    if (zoneInOutDayData[zoneInOutDayData.length - 1].outTime && new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime) < to && (field !== 'distanceOutAny' || zoneInOutDayData[zoneInOutDayData.length - 1].anyNextIn)) {
       // Add distanceOut after last exit
       distanceOut = distanceOut - zoneInOutDayData[zoneInOutDayData.length - 1][field]
       const routeOut = dayRoute.filter(p =>
         new Date(p.fixTime) >= new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime).getTime() &&
-          new Date(p.fixTime) < toByDay.getTime())
+          new Date(p.fixTime) < to.getTime())
       distanceOut = distanceOut + calculateDistance(routeOut, device.attributes['report.ignoreOdometer'])
     }
 
     return distanceOut
   }
 
-  return calculateDistance(dayRoute.filter(p => new Date(p.fixTime) >= fromByDay && new Date(p.fixTime) < toByDay), device.attributes['report.ignoreOdometer'])
+  return calculateDistance(dayRoute.filter(p => new Date(p.fixTime) >= from && new Date(p.fixTime) < to), device.attributes['report.ignoreOdometer'])
 }
 
 function analyseAlerts (alerts, deviceRoute, userData, from, to, device) {