fleetmap-reports 2.0.157 → 2.0.159

package/lang/enGB.js

@@ -161,6 +161,7 @@ module.exports = {
     delete_geofence: 'Delete'
   },
   report: {
+    alarm: 'Alarm',
     distanceIn: 'Kms inside',
     distanceOut: 'Kms outside',
     closed: 'Door Closed',

package/lang/esCL.js

@@ -156,6 +156,7 @@ module.exports = {
     delete_geofence: 'Apagar'
   },
   report: {
+    alarm: 'Alarma',
     distanceIn: 'Kms adentro',
     distanceOut: 'Kms afuera',
     temperature: 'Temperatura',

package/lang/frFR.json

@@ -157,6 +157,7 @@
     "delete_geofence": "Éteindre"
   },
   "report": {
+    "alarm": "Alerte",
     "geofenceOut": "Sortie",
     "geofenceIn": "Entré",
     "distanceIn": "Kms à l'intérieur",

package/lang/ptBR.js

@@ -153,6 +153,7 @@ module.exports = {
     delete_geofence: 'Apagar'
   },
   report: {
+    alarm: 'Alarme',
     distanceIn: 'Kms Dentro',
     distanceOut: 'Kms Fora',
     closed: 'Porta fechada',

package/lang/ptPT.js

@@ -157,6 +157,7 @@ module.exports = {
     delete_geofence: 'Apagar'
   },
   report: {
+    alarm: 'Alarme',
     distanceIn: 'Kms Dentro',
     distanceOut: 'Kms Fora',
     closed: 'Porta fechada',

package/package.json

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

package/src/events-report.js

@@ -37,7 +37,7 @@ async function createEventsReport (from, to, userData, traccar) {
         devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
         if (data.length > 0) {
-          groupData.devices = await processDevices(from, to, devices, userData.geofences, userData.drivers, data)
+          groupData.devices = await processDevices(from, to, devices, data, traccar, userData)
           reportData.push(groupData)
         }
       }
@@ -240,11 +240,6 @@ async function exportSpeedingReportToPDF (userData, reportData) {
 }
 
 function getEventType (a, translations, device, userData) {
-  const result = _getEventType(a, translations, device, userData)
-  return a.attributes && a.attributes.info ? `${result} (${a.attributes.info})` : result
-}
-
-function _getEventType (a, translations, device, userData) {
   if (a.type === 'alarm') {
     let sensor
     if (a.attributes.alarm === 'sensor') { sensor = device.attributes.sensor1 }
@@ -284,6 +279,7 @@ function exportSpeedingReportToExcel (userData, reportData) {
     { label: translations.report.zone, value: 'geofenceName' },
     { label: translations.report.driver, value: 'driver' },
     { label: translations.report.info, value: 'info' },
+    { label: '', value: 'alarm' },
     { label: 'Latitude', value: 'latitude' },
     { label: 'Longitude', value: 'longitude' }
   ]
@@ -302,7 +298,8 @@ function exportSpeedingReportToExcel (userData, reportData) {
           info: getAlertInfo(userData.drivers, a, d.device, translations),
           driver: a.driver,
           latitude: a.position && a.position.latitude,
-          longitude: a.position && a.position.longitude
+          longitude: a.position && a.position.longitude,
+          alarm: a.attributes.notifications ? translations.report.alarm : ''
         }
       }))
     })

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/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/speeding-report.js

@@ -130,7 +130,7 @@ async function createSpeedingReportByDriver (from, to, userData, traccarInstance
 }
 
 async function getEvents (traccarInstance, from, to, devices, userData, deviceCount, totalDevices, sliceSize) {
-  if (processServerSide()) {
+  if (processServerSide() && !userData.useVehicleSpeedLimit) {
     const cookie = await axios.get('/pinmeapi/cookie/get', { withCredentials: true }).then(d => d.data)
     const url = `https://${getServerHost()}/pinmeapi/reports/speeding-report/getEvents`
     return axios.post(url, { from, to, devices, userData, deviceCount, totalDevices, sliceSize, cookie }, { withCredentials: true }).then(d => d.data)

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

@@ -65,10 +65,11 @@ describe('Kms_Reports', function () {
   it('KmsReport by timezone marrocos', async () => {
     const reports = await getReports(process.env.email, process.env.password)
     const userData = await reports.getUserData()
+    userData.groupByDay = true
     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)
+    assert.equal(device.days.length, 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/pdfDocument.js

@@ -23,7 +23,7 @@ async function header (doc, title, hostname, style, orientation) {
 
 async function headerFromUser (doc, title, user, orientation = 'l') {
   const partner = getUserPartner(user)
-  return header(doc, title, partner.host, getStyle(partner), orientation)
+  return header(doc, title, partner && partner.host, getStyle(partner), orientation)
 }
 
 function addTable (doc, headers, data, footValues, style, startY, columnStyles = {}) {