fleetmap-reports 2.0.76 → 2.0.78

package/package.json

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

package/src/fuelconsumption-report.js

@@ -136,12 +136,12 @@ function exportFuelConsumptionReportToExcel (userData, reportData) {
         return {
           name: d.device.name,
           date: r.date.toLocaleDateString(),
-          kms: formatNumber(r.distance / 1000, lang),
-          consumption: r.spentFuel > 0 ? formatNumber(r.spentFuel, lang) : 0,
-          avg_consumption: formatNumber(lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms, lang),
+          kms: formatNumber(r.distance / 1000),
+          consumption: r.spentFuel > 0 ? formatNumber(r.spentFuel) : 0,
+          avg_consumption: formatNumber(lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms),
           duration: convertMS(r.duration),
-          accumulated_kms: formatNumber((r.endOdometer / 100), lang),
-          refueling: formatNumber(r.refueling, lang)
+          accumulated_kms: formatNumber((r.endOdometer / 100)),
+          refueling: formatNumber(r.refueling)
         }
       }))
       // Totals
@@ -203,12 +203,12 @@ async function exportFuelConsumptionReportToPDF (userData, reportData) {
       d.days.forEach(r =>
         data.push([
           r.date.toLocaleDateString(),
-          formatNumber(r.distance / 1000, lang),
-          r.spentFuel > 0 ? formatNumber(r.spentFuel, lang) : 0,
-          formatNumber(lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms, lang),
+          formatNumber(r.distance / 1000),
+          r.spentFuel > 0 ? formatNumber(r.spentFuel) : 0,
+          formatNumber(lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms),
           convertMS(r.duration),
-          formatNumber((r.endOdometer / 1000), lang),
-          formatNumber(r.refueling, lang)
+          formatNumber((r.endOdometer / 1000)),
+          formatNumber(r.refueling)
         ]))
 
       const footValues = [

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, convertToLocaleTimeString, isClientSide } = 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,72 @@ function processDeviceData (allInOne, d, userData) {
   }
 }
 
+async function exportDailyUseReportToPDF (userData, reportData) {
+  const translations = getTranslations(userData)
+  const timezone = userData.user.attributes.timezone
+  const lang = userData.user.attributes.lang || (isClientSide() && navigator.language)
+
+  const headers = [
+    translations.report.vehicle,
+    'Immatriculation',
+    'Groupe',
+    'Matin départ',
+    'Matin arrêt',
+    'Matin temps',
+    'Déjeuner',
+    'Après-midi départ',
+    'Après-midi arrêt',
+    'Après-midi temps',
+    'Total temps',
+    'Total conduit',
+    'Total arrêts',
+    'Total kms'
+  ]
+
+  const data = []
+  reportData.forEach(d => {
+    const row = [
+      d.device,
+      d.licensePlate,
+      d.group,
+      convertToLocaleTimeString(d.morningStart, lang, timezone, userData.user),
+      convertToLocaleTimeString(d.morningEnd, lang, timezone, userData.user),
+      convertMS(d.morningTime),
+      convertMS(d.lunch),
+      convertToLocaleTimeString(d.afternoonStart, lang, timezone, userData.user),
+      convertToLocaleTimeString(d.afternoonEnd, lang, timezone, userData.user),
+      convertMS(d.afternoonTime),
+      convertMS(d.totalTime),
+      convertMS(d.totalDrivingTime),
+      d.totalStops,
+      (d.totalDistance / 100).toFixed(1)
+    ]
+    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 = 3; i < 14; 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/delayedstart-report.js

@@ -0,0 +1,69 @@
+const automaticReports = require('../automaticReports')
+const traccarHelper = require('../util/traccar')
+const { getDates, getTranslations } = require('../util/utils')
+const { getUserPartner } = require('fleetmap-partners')
+const { getDataByDay } = require('../util/trips')
+
+async function createDelayedStartReport (from, to, userData, traccar) {
+  const reportData = []
+
+  const devices = userData.devices
+
+  const sliced = automaticReports.sliceArray(devices, 5)
+  let deviceCount = 0
+  for (const slice of sliced) {
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, false, true, true, false, deviceCount, devices.length)
+
+    for (const d of slice) {
+      const deviceData = await processDeviceData(from, to, allInOne, d, userData, traccar)
+      reportData.push(deviceData)
+    }
+
+    deviceCount = deviceCount + slice.length
+  }
+
+  return reportData
+}
+
+async function processDeviceData (from, to, allInOne, d, userData, traccar) {
+  const group = userData.groups.find(g => g.id === d.groupId)
+  const trips = allInOne.trips.filter(t => t.deviceId === d.id)
+  const translations = getTranslations(userData)
+
+  const weekDays = [
+    translations.report.sunday,
+    translations.report.monday,
+    translations.report.tuesday,
+    translations.report.wednesday,
+    translations.report.thursday,
+    translations.report.friday,
+    translations.report.saturday
+  ]
+
+  const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
+
+  const deviceData = {
+
+  }
+
+  for (const date of dates) {
+    const { tripsByDay } = await getDataByDay(d, date, { trips }, userData, traccar)
+
+    if (tripsByDay.length > 0) {
+      const startTime = tripsByDay[0].startTime
+      const stopTime = tripsByDay[tripsByDay.length].endTime
+
+      const deviceDayData = {
+        device: d.name,
+        licensePlate: d.attributes.license_plate,
+        group: group ? group.name : '',
+        driver: '',
+        weekDay: weekDays[new Date(date).getDay()],
+        startDate: '',
+        startTime: '',
+        delayDescription: '',
+        stopTime: ''
+      }
+    }
+  }
+}

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/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/fuel.test.js

@@ -20,8 +20,8 @@ describe('Test_Reports', function () {
   }, 30000)
 
   it('Fuel Consumption 1', async () => {
-    console.log('trip by device')
-    const report = await getReports('aghani@moviflotte.com', 'X8Tm<QT*')
+    console.log('Fuel Consumption')
+    const report = await getReports(process.env.email, process.env.password)
     const userData = await report.getUserData()
     userData.devices = userData.devices.filter(d => d.id === 133608)
 

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/kms.test.js

@@ -1,6 +1,7 @@
 /* eslint-disable no-undef */
 const { getReports } = require('./index')
 const assert = require('assert')
+const { convertFromLocal } = require('../util/utils')
 
 describe('Kms_Reports', function () {
   // eslint-disable-next-line no-undef
@@ -52,4 +53,22 @@ describe('Kms_Reports', function () {
     assert.equal(device.days.length, 30) // Total Kms
     assert.equal(device.days[29].kms, 136174.93281451002) // Total Kms
   }, 30000)
+  it('KmsReport by driver', async () => {
+    const reports = await getReports(process.env.USER_CTM_MOVIFLOTTE, process.env.PASS_CTM_MOVIFLOTTE)
+    const userData = await reports.getUserData()
+    userData.byDriver = true
+    console.log(userData.drivers)
+    const data = await reports.kmsReport(new Date(2024, 0, 1, 0, 0, 0), new Date(2024, 0, 31, 23, 59, 59),
+      userData)
+    assert.equal(data.length, 1)
+  }, 3000000)
+  it('KmsReport by timezone marrocos', async () => {
+    const reports = await getReports(process.env.email, process.env.password)
+    const userData = await reports.getUserData()
+    userData.devices = userData.devices.filter(d => d.id === 93497)
+    const data = await reports.kmsReport(convertFromLocal(new Date(2024, 2, 18, 0, 0, 0), userData.user.attributes.timezone), convertFromLocal(new Date(2024, 2, 18, 23, 59, 59), userData.user.attributes.timezone),
+      userData)
+    const device = data[0].devices.find(d => d.device.id === 93497)
+    assert.equal(device, 1)
+  }, 3000000)
 })

package/src/tests/zones.test.js

@@ -159,4 +159,21 @@ describe('zones', function () {
     console.log(first)
     assert.equal(first.days[6].distanceOut, 867.0554430738234)
   }, 4000000)
+
+  it('works with casais zones in columns 7', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.zonesByColumn = true
+    userData.devices = userData.devices.filter(d => d.id === 81166)
+    userData.geofences = userData.geofences.filter(g => g.name === 'baliza 1 - raio verde ' ||
+        g.name === 'baliza 2 - raio amarelo')
+    userData.onlyWithKmsOut = false
+    const result = await report.zoneReport(
+        new Date(Date.UTC(2023, 9, 9, 0, 0, 0, 0)),
+        new Date(Date.UTC(2023, 9, 31, 23, 59, 59, 0)),
+        userData)
+    const first = result[0].devices[0]
+    console.log(first)
+    assert.equal(first.days[17].distanceOut, 720.7985320478997)
+  }, 4000000)
 })

package/src/util/trips.js

@@ -138,9 +138,15 @@ async function getDataByDay (device, date, data, userData, traccarInstance) {
   return { tripsByDay, routeByDay, refuelingPositionsByDay, zoneInOutDayData }
 }
 
+function isValidAvgSpeed (kms, startTime, endTime) {
+  const totalTime = new Date(endTime).getTime() - new Date(startTime).getTime()
+  const avgSpeed = (kms / 1000) / (totalTime / (1000 * 60 * 60))
+  return avgSpeed < 200
+}
+
 function getKms (trips) {
   const odometerKms = trips.length > 0 ? trips[trips.length - 1].endOdometer - trips[0].startOdometer : 0
-  return odometerKms > 0 ? odometerKms : trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
+  return odometerKms > 0 && isValidAvgSpeed(odometerKms, trips[0].startTime, trips[trips.length - 1].endTime) ? odometerKms : trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
 }
 
 function isInsideTimetable (t, userData) {

package/src/util/utils.js

@@ -41,8 +41,8 @@ function convertMS (duration, withSeconds) {
   return withSeconds ? hours + ':' + minutes + ':' + seconds : hours + ':' + minutes
 }
 
-exports.formatNumber = function formatNumber (value, lang) {
-  return Intl.NumberFormat(lang, { maximumFractionDigits: 1, minimumFractionDigits: 1 }).format(value)
+exports.formatNumber = function formatNumber (value) {
+  return Number(value.toFixed(1))
 }
 
 function coordsDistance (lon1, lat1, lon2, lat2) {