fleetmap-reports 1.0.586 → 1.0.588

package/lang/frFR.js

@@ -161,6 +161,32 @@ module.exports = {
     delete_geofence: 'Delete'
   },
   report: {
+    select_vehicles: 'Select vehicles',
+    select_vehicles_placeholder: 'Vehicles',
+    select_geofences: 'Select geofences',
+    select_geofences_placeholder: 'Geofences',
+    select_period: 'Select period',
+    period: 'Period',
+    date_start: 'Start date',
+    date_end: 'End date',
+    generate_report: 'Generate report',
+    validate_period: 'Por favor seleccione o período',
+    titleTripReport: 'Trip Report',
+    titleLocationReport: 'Locations Report',
+    titleSpeedingReport: 'Overspeed Report',
+    titleZoneReport: 'Zone Report',
+    titleRefuelReport: 'Refueling Report',
+    titleFuelConsumptionReport: 'Fuel Consumption Report',
+    titleFuelDropReport: 'Fuel Drop Report',
+    titleEventsReport: 'Events Report',
+    titleActivityReport: 'Activity Report',
+    titleKmsReport: 'Kms Report',
+    titleIdleReport: 'Idle Report',
+    titleMachinesReport: 'Machines Report',
+    headerStartAddress: 'Start address',
+    headerDistance: 'Distance',
+    headerDrivingTime: 'Driving Time',
+    headerMaxSpeed: 'Max Speed',
     closed: 'Door Closed',
     opened: 'Door Opened',
     sun: 'Sun',

package/package.json

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

package/src/activity-report.js

@@ -337,7 +337,7 @@ function exportActivityReportToPDFDriver (doc, translations, reportData, userDat
       d.driver.name,
       d.summary[0].startTime ? new Date(d.summary[0].startTime).toLocaleString() : '',
       d.summary[0].endTime ? new Date(d.summary[0].endTime).toLocaleString() : '',
-      Number((d.summary[0].distance / 1000).toFixed(2)),
+      Number((d.summary[0].distance / 1000).toFixed(1)),
       Math.round(d.summary[0].averageSpeed * 1.85200),
       Math.round(d.summary[0].maxSpeed * 1.85200),
       convertMS(d.summary[0].engineHours)
@@ -381,9 +381,9 @@ function exportActivityReportToPDFVehicle (doc, translations, reportData, userDa
       group ? group.name : '',
       d.summary[0].startTime ? new Date(d.summary[0].startTime).toLocaleString() : '',
       d.summary[0].endTime ? new Date(d.summary[0].endTime).toLocaleString() : '',
-      Number((d.summary[0].distance / 1000).toFixed(2)),
-      Number((d.summary[0].startOdometer / 1000).toFixed(2)),
-      Number((d.summary[0].endOdometer / 1000).toFixed(2)),
+      Number((d.summary[0].distance / 1000).toFixed(1)),
+      Number((d.summary[0].startOdometer / 1000).toFixed(1)),
+      Number((d.summary[0].endOdometer / 1000).toFixed(1)),
       Math.round(d.summary[0].averageSpeed * 1.85200),
       Math.round(d.summary[0].maxSpeed * 1.85200),
       convertMS(d.summary[0].engineHours),
@@ -460,9 +460,9 @@ function exportActivityReportToPDFVehicleGroupByDay (doc, translations, reportDa
         new Date(s.date).toLocaleDateString() + ' - ' + weekDays[s.date.getDay()],
         s.startTime ? new Date(s.startTime).toLocaleTimeString() : '',
         s.endTime ? new Date(s.endTime).toLocaleTimeString() : '',
-        Number((s.distance / 1000).toFixed(2)),
-        Number((s.startOdometer / 1000).toFixed(2)),
-        Number((s.endOdometer / 1000).toFixed(2)),
+        Number((s.distance / 1000).toFixed(1)),
+        Number((s.startOdometer / 1000).toFixed(1)),
+        Number((s.endOdometer / 1000).toFixed(1)),
         Math.round(s.averageSpeed * 1.85200),
         Math.round(s.maxSpeed * 1.85200),
         convertMS(s.engineHours),
@@ -596,7 +596,7 @@ function exportActivityReportToPDFDriverGroupByDay (doc, translations, reportDat
         new Date(s.date).toLocaleDateString() + ' - ' + weekDays[s.date.getDay()],
         s.startTime ? new Date(s.startTime).toLocaleTimeString() : '',
         s.endTime ? new Date(s.endTime).toLocaleTimeString() : '',
-        Number((s.distance / 1000).toFixed(2)),
+        Number((s.distance / 1000).toFixed(1)),
         Math.round(s.averageSpeed * 1.85200),
         Math.round(s.maxSpeed * 1.85200),
         convertMS(s.engineHours)

package/src/fuelconsumption-report.js

@@ -144,11 +144,11 @@ function exportFuelConsumptionReportToExcel (userData, reportData) {
         return {
           name: d.device.name,
           date: r.date,
-          kms: (r.distance / 1000).toFixed(2),
+          kms: (r.distance / 1000).toFixed(1),
           consumption: r.spentFuel > 0 ? r.spentFuel : 0,
           avg_consumption: lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms,
           duration: new Date(r.duration).toLocaleTimeString(),
-          accumulated_kms: (r.endOdometer / 1000).toFixed(2),
+          accumulated_kms: (r.endOdometer / 1000).toFixed(1),
           refueling: r.refueling
         }
       }))
@@ -201,11 +201,11 @@ async function exportFuelConsumptionReportToPDF (userData, reportData) {
       d.days.forEach(r =>
         data.push([
           r.date,
-          (r.distance / 1000).toFixed(2),
+          (r.distance / 1000).toFixed(1),
           r.spentFuel > 0 ? r.spentFuel : 0,
           lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms,
           new Date(r.duration).toLocaleTimeString(),
-          (r.endOdometer / 1000).toFixed(2),
+          (r.endOdometer / 1000).toFixed(1),
           r.refueling
         ]))
       console.log(data)

package/src/tests/fuel.test.js

@@ -17,6 +17,5 @@ describe('Test_Reports', function () {
     assert.equal(data.length, 1)
     const device = data[0].devices.find(d => d.device.id === deviceId)
     assert.equal(device.trips.length, 9) // Total Trips
-    console.log(device.trips)
   }, 30000)
 })

package/src/tests/index.test.js

@@ -27,7 +27,7 @@ describe('Test_Reports', function () {
       new Date(Date.UTC(2022, 9, 22, 0, 0, 0, 0)),
       new Date(Date.UTC(2022, 9, 22, 23, 59, 59, 0)),
       userData)
-    console.log(await report.speedingReportToPDF(userData, data))
+    await report.speedingReportToPDF(userData, data)
   }, 40000)
 
   it('converts madrid time', async () => {
@@ -276,7 +276,7 @@ describe('Test_Reports', function () {
     assert.equal(data.length, 1)
     const device = data[0].devices.find(d => d.device.id === 22326)
     assert.equal(device.summary[0].startOdometer, 122502742.59)
-    assert.equal(device.summary[0].distance, 1427562.359999925)
+    assert.equal(device.summary[0].distance, 1425532.6071218813)
     assert.equal(device.summary[0].startTime, '2022-01-01T13:35:47.000+0000')
     assert.equal(device.summary[0].endTime, '2022-01-31T17:36:27.000+0000')
   }, 80000)
@@ -330,7 +330,7 @@ describe('Test_Reports', function () {
     assert.equal(tripsReport.length, 1)
     const device1 = tripsReport[0].devices.find(d => d.device.id === 22327)
     assert.equal(device1.trips.length, 14) // Total Trips
-    assert.equal(device1.totalDistance, 83553.13999999687) // Total Kms
+    assert.equal(device1.totalDistance, 85462.79000000097) // Total Kms
 
     const device2 = kmsReport[0].devices.find(d => d.device.id === 22327)
     assert.equal(device2.summary.distance, device1.totalDistance) // Total Kms

package/src/tests/trips.test.js

@@ -0,0 +1,15 @@
+const { getReports } = require('./index')
+describe('trips', function () {
+  it('converts to pdf', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.roadSpeedLimits = false
+    userData.customSpeed = false
+    userData.useVehicleSpeedLimit = true
+    const data = await report.tripReport(
+      new Date(Date.UTC(2022, 9, 22, 0, 0, 0, 0)),
+      new Date(Date.UTC(2022, 9, 22, 23, 59, 59, 0)),
+      userData)
+    await report.tripReportToPDF(userData, data)
+  }, 40000)
+})

package/src/trip-report.js

@@ -200,7 +200,6 @@ function processDevices (from, to, devices, data, userData, traccar) {
       if (trips[0].fuelConsumption !== undefined) {
         deviceData.totalFuelConsumption = trips.reduce((a, b) => a + b.fuelConsumption, 0)
         deviceData.avgFuelConsumption = deviceData.totalDistance > 0 ? (deviceData.totalFuelConsumption * 100) / (deviceData.totalDistance / 1000) : 0
-        console.log(deviceData)
       }
 
       devicesResult.push(deviceData)
@@ -326,7 +325,8 @@ async function exportTripReportToPDF (userData, reportData) {
           Math.round(a.maxSpeed * 1.85200))
 
         if (withFuelData) {
-          temp.push(a.fuelConsumption.toFixed(1), a.avgFuelConsumption.toFixed(1))
+          temp.push(a.fuelConsumption && a.fuelConsumption.toFixed(1),
+            a.avgFuelConsumption && a.avgFuelConsumption.toFixed(1))
         }
 
         if (userData.byDriver) {
@@ -426,7 +426,7 @@ function exportTripReportToExcel (userData, reportData) {
           tripTime: convertMS(a.duration),
           idleTime: convertMS(a.stopEngineHours),
           stopTime: convertMS(a.stopDuration),
-          distance: Number(a.totalKms.toFixed(2)),
+          distance: Number(a.totalKms.toFixed(1)),
           averageSpeed: Math.round(a.averageSpeed * 1.85200),
           maxSpeed: Math.round(a.maxSpeed * 1.85200),
           consumption: a.fuelConsumption.toFixed(1),