fleetmap-reports 1.0.874 → 1.0.876

package/lang/enGB.js

@@ -274,7 +274,10 @@ module.exports = {
     firstIn: 'First In',
     lastOut: 'Last Out',
     timeIn: 'Time In',
-    timeOut: 'Time Out'
+    timeOut: 'Time Out',
+    maxTemp: 'Max Temp',
+    minTemp: 'Min Temp',
+    avgTemp: 'Avg Temp'
   },
   layout: {
     deviceOnline: 'Device Online',

package/lang/esCL.js

@@ -263,7 +263,10 @@ module.exports = {
     firstIn: 'Primeira Entrada',
     lastOut: 'Última Saída',
     timeIn: 'Tempo Adentro',
-    timeOut: 'Tempo Afuera'
+    timeOut: 'Tempo Afuera',
+    maxTemp: 'Temp.Max',
+    minTemp: 'Temp.Min',
+    avgTemp: 'Temp.Média'
   },
   layout: {
     deviceOnline: 'Dispositivo en línea',

package/lang/ptBR.js

@@ -268,7 +268,10 @@ module.exports = {
     firstIn: 'Primeira Entrada',
     lastOut: 'Última Saída',
     timeIn: 'Tempo Dentro',
-    timeOut: 'Tempo Fora'
+    timeOut: 'Tempo Fora',
+    maxTemp: 'Temp.Máx',
+    minTemp: 'Temp.Min',
+    avgTemp: 'Temp.Média'
   },
   layout: {
     deviceOnline: 'Dispositivo Online',

package/lang/ptPT.js

@@ -277,7 +277,10 @@ module.exports = {
     firstIn: 'Primeira Entrada',
     lastOut: 'Última Saída',
     timeIn: 'Tempo Dentro',
-    timeOut: 'Tempo Fora'
+    timeOut: 'Tempo Fora',
+    maxTemp: 'Temp.Máx',
+    minTemp: 'Temp.Min',
+    avgTemp: 'Temp.Média'
   },
   layout: {
     test: 'Test Notification',

package/package.json

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

package/src/partnerReports/afriquia.js

@@ -6,11 +6,6 @@ const { convertToFeature, convertPositionToFeature } = require('../util/utils')
 function calculateLastStopTime (stopTime, to, time) {
   return stopTime + (to.getTime() - new Date(time).getTime())
 }
-
-function calculateFirstStopTime (stopTime, from, time) {
-  return stopTime + (new Date(time).getTime() - from.getTime())
-}
-
 async function createActivityReport (from, to, userData, traccarInstance) {
   const unauthorizedGeofences = []
   const authorizedGeofences = []

package/src/speeding-report.js

@@ -305,7 +305,7 @@ function getCountry (position) {
 }
 
 async function getRoadSpeedLimits (devices, routes, threshold, minimumMinutes = 0) {
-  const position = routes[0]
+  const position = routes.find(p => getCountry(p))
   const country = getCountry(position)
   const config = {
     CHL: getOSMSpeedingEvents,

package/src/tests/activity.test.js

@@ -72,4 +72,14 @@ describe('activity report', function () {
     console.log(device)
     assert.equal(device.summary.reduce((a, b) => a + b.convertedSpentFuel, 0), 168.79999999999995)
   }, 800000)
+  it('Activity test performance', async () => {
+    const report = await getReports('q.trans', 'quality1214')
+    const userData = await report.getUserData()
+    console.log(userData)
+    userData.groupByDay = true
+    const data = await report.activityReport(new Date(2023, 7, 1, 0, 0, 0, 0),
+        new Date(2023, 31, 5, 23, 59, 59, 0),
+        userData)
+    assert.equal(data.length, 1)
+  }, 8000000)
 })

package/src/tests/index.test.js

@@ -2,6 +2,7 @@
 const { getReports } = require('./index')
 const assert = require('assert')
 const utils = require('../util/utils')
+const { createGPSJumpReport } = require('../partnerReports/gpsjump-report')
 
 // eslint-disable-next-line no-undef
 describe('Test_Reports', function () {
@@ -18,12 +19,19 @@ describe('Test_Reports', function () {
     const pdf = await report.speedingReportToPDF(userData, data[0])
     pdf.save()
   }, 40000)
-
   it('converts madrid time', async () => {
     assert.equal(false, utils.isClientSide())
     console.log(utils.convertToLocaleString(new Date(), 'es-CL', 'Europe/Madrid'))
   })
-
+  it('gps jump device', async () => {
+    const report = await getReports('HASSANE', 'movitec.1637')
+    const userData = await report.getUserData()
+    userData.devices = userData.devices.filter(d => d.id === 148725)
+    const data = await createGPSJumpReport(new Date(2023, 8, 22, 0, 0, 0, 0),
+      new Date(2023, 8, 24, 23, 59, 59, 0),
+      userData, report.traccar)
+    console.log(data)
+  }, 40000)
   it('Idle by device', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
@@ -54,7 +62,7 @@ describe('Test_Reports', function () {
     const totalIdleTime = driver.idleEvents.reduce((a, b) => a + b.idleTime, 0)
     assert.equal(driver.idleEvents.length, 15) // Total Alerts
     assert.equal(totalIdleTime, 16000) // Total Duration
-  }, 20000)
+  }, 20000),
   // eslint-disable-next-line no-undef
   it('test allinone', async () => {
     console.log('Start')

package/src/tests/zones.test.js

@@ -27,6 +27,18 @@ describe('zones', function () {
     console.log('result', result)
   }, 4000000)
 
+  it('works with afriquia', async () => {
+    const report = await getReports(process.env.USER_AFRIQUIA, process.env.PASS_AFRIQUIA)
+    const userData = await report.getUserData()
+    console.log(userData.devices.length)
+    console.log(userData.geofences)
+    const result = await report.zoneReport(
+        new Date(Date.UTC(2023, 5, 11, 0, 0, 0, 0)),
+        new Date(Date.UTC(2023, 5, 11, 23, 59, 59, 0)),
+        userData)
+    console.log('result', result)
+  }, 4000000)
+
   // eslint-disable-next-line no-undef
   it('works with casais', async () => {
     const report = await getReports(process.env.USER_CASAIS, process.env.PASS_CASAIS)

package/src/trip-report.js

@@ -168,6 +168,21 @@ function processDevices (from, to, devices, data, userData, traccar) {
         trip.endPOIName = nearestPOIs[0].p.name
       }
 
+      if (userData.includeTemperature) {
+        const tripRoute = deviceRoute.filter(p => trip.startTime <= p.fixTime && trip.endTime >= p.fixTime && p.attributes.temp1 !== 175)
+        trip.maxTemp = tripRoute.reduce((a, b) => {
+          return a > b.attributes.temp1 ? a : b.attributes.temp1
+        }, 0)
+        trip.minTemp = tripRoute.reduce((a, b) => {
+          return a < b.attributes.temp1 ? a : b.attributes.temp1
+        }, 0)
+        trip.avgTemp = tripRoute.length > 0
+          ? (tripRoute.reduce((a, b) => {
+              return a + b.attributes.temp1
+            }, 0)) / tripRoute.length
+          : 0
+      }
+
       const stop = getStop(new Date(trip.startTime), stops)
 
       if (deviceRoute.some(r => r.attributes.fuel) ||
@@ -288,6 +303,12 @@ async function exportTripReportToPDF (userData, reportData) {
     translations.report.maxSpeed
   ]
 
+  if (userData.includeTemperature) {
+    headers.push(translations.report.maxTemp)
+    headers.push(translations.report.minTemp)
+    headers.push(translations.report.avgTemp)
+  }
+
   if (tripsData) {
     const withFuelData = tripsData.find(t => t.totalFuelConsumption !== undefined)
 
@@ -353,6 +374,12 @@ async function exportTripReportToPDF (userData, reportData) {
           Math.round(a.averageSpeed * 1.85200),
           Math.round(a.maxSpeed * 1.85200))
 
+        if (userData.includeTemperature) {
+          temp.push(a.maxTemp)
+          temp.push(a.minTemp)
+          temp.push(a.avgTemp && a.avgTemp.toFixed(1))
+        }
+
         if (withFuelData) {
           temp.push(a.fuelConsumption && a.fuelConsumption.toFixed(1),
             a.avgFuelConsumption && a.avgFuelConsumption.toFixed(1))
@@ -378,11 +405,23 @@ async function exportTripReportToPDF (userData, reportData) {
         getSumAvgSpeed(d.trips),
         getMaxSpeed(d.trips))
 
+      if (userData.includeTemperature) {
+        footValues.push(...['', '', ''])
+      }
+
       if (withFuelData) {
-        footValues.push(parseFloat(d.totalFuelConsumption).toFixed(1), parseFloat(d.avgFuelConsumption).toFixed(1))
+        footValues.push(
+          d.totalFuelConsumption && parseFloat(d.totalFuelConsumption).toFixed(1),
+          d.avgFuelConsumption && parseFloat(d.avgFuelConsumption).toFixed(1))
       }
 
       const style = getStyle(getUserPartner(userData.user))
+      if (userData.includeTemperature && withFuelData) {
+        style.headerFontSize = 8
+        style.bodyFontSize = 6
+        style.footerFontSize = 7
+      }
+
       addTable(doc,
         headers, data, footValues, style,
         space + (userData.allWeek ? 40 : 45),
@@ -393,12 +432,24 @@ async function exportTripReportToPDF (userData, reportData) {
           7: { halign: 'right' },
           8: { halign: 'right' },
           9: { halign: 'right' },
-          ...(withFuelData
+          ...(userData.includeTemperature
             ? {
                 10: { halign: 'right' },
-                11: { halign: 'right' }
+                11: { halign: 'right' },
+                12: { halign: 'right' }
               }
-            : {})
+            : {}),
+          ...(withFuelData && userData.includeTemperature
+            ? {
+                13: { halign: 'right' },
+                14: { halign: 'right' }
+              }
+            : withFuelData
+              ? {
+                  10: { halign: 'right' },
+                  11: { halign: 'right' }
+                }
+              : {})
         })
     })
     return doc
@@ -430,6 +481,12 @@ function exportTripReportToExcel (userData, reportData) {
     { label: translations.report.maxSpeed, value: 'maxSpeed' }
   ]
 
+  if (userData.includeTemperature) {
+    headers.push({ label: translations.report.maxTemp, value: 'maxTemp' })
+    headers.push({ label: translations.report.minTemp, value: 'minTemp' })
+    headers.push({ label: translations.report.avgTemp, value: 'avgTemp' })
+  }
+
   let data = []
   if (tripsData) {
     const withFuelData = tripsData.find(b => b.totalFuelConsumption !== undefined)
@@ -462,9 +519,12 @@ function exportTripReportToExcel (userData, reportData) {
           distance: Number(a.totalKms.toFixed(1)),
           averageSpeed: Math.round(a.averageSpeed * 1.85200),
           maxSpeed: Math.round(a.maxSpeed * 1.85200),
-          consumption: a.fuelConsumption && a.fuelConsumption.toFixed(1),
-          avgConsumption: a.avgFuelConsumption && a.avgFuelConsumption.toFixed(1),
-          subname: userData.byDriver ? a.deviceName : getDriverName(a.driverUniqueId, a.startTime, userData)
+          consumption: a.fuelConsumption && Number(a.fuelConsumption.toFixed(1)),
+          avgConsumption: a.avgFuelConsumption && Number(a.avgFuelConsumption.toFixed(1)),
+          subname: userData.byDriver ? a.deviceName : getDriverName(a.driverUniqueId, a.startTime, userData),
+          maxTemp: a.maxTemp,
+          minTemp: a.minTemp,
+          avgTemp: Number(a.avgTemp.toFixed(1))
         }
       }))
       // Totals
@@ -476,8 +536,8 @@ function exportTripReportToExcel (userData, reportData) {
         distance: getSumTotalKms(userData.user, d.trips),
         averageSpeed: getSumAvgSpeed(d.trips),
         maxSpeed: getMaxSpeed(d.trips),
-        consumption: parseFloat(d.totalFuelConsumption).toFixed(1),
-        avgConsumption: parseFloat(d.avgFuelConsumption).toFixed(1)
+        consumption: d.totalFuelConsumption && Number(parseFloat(d.totalFuelConsumption).toFixed(1)),
+        avgConsumption: d.avgFuelConsumption && Number(parseFloat(d.avgFuelConsumption).toFixed(1))
       }])
       data = data.concat([{}])
     })

package/src/util/pdfDocument.js

@@ -35,17 +35,17 @@ function addTable (doc, headers, data, footValues, style, startY, columnStyles =
     headStyles: {
       fillColor: style.pdfHeaderColor,
       textColor: style.pdfHeaderTextColor,
-      fontSize: 10
+      fontSize: style.headerFontSize ? style.headerFontSize : 10
     },
     bodyStyles: {
       fillColor: style.pdfBodyColor,
       textColor: style.pdfBodyTextColor,
-      fontSize: 8
+      fontSize: style.bodyFontSize ? style.bodyFontSize : 8
     },
     footStyles: {
       fillColor: style.pdfFooterColor,
       textColor: style.pdfFooterTextColor,
-      fontSize: 9
+      fontSize: style.footerFontSize ? style.footerFontSize : 9
 
     },
     didDrawCell: (data) => {