fleetmap-reports 1.0.585 → 1.0.587

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.585",
+  "version": "1.0.587",
   "description": "",
   "main": "src/index.js",
   "scripts": {

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)
@@ -358,6 +357,9 @@ async function exportTripReportToPDF (userData, reportData) {
         headers, data, footValues, style,
         space + (userData.allWeek ? 40 : 45),
         {
+          4: { halign: 'right' },
+          5: { halign: 'right' },
+          6: { halign: 'right' },
           7: { halign: 'right' },
           8: { halign: 'right' },
           9: { halign: 'right' },