fleetmap-reports 1.0.366 → 1.0.369

package/lang/esCL.js

@@ -192,7 +192,7 @@ module.exports = {
     stopTime: 'Parada',
     distance: 'Distancia',
     speed: 'Velocidad',
-    overspeed: 'Alerta Ligado',
+    overspeed: 'Inicio del Alerta',
     roadSpeedLimit: 'Limite en la calle',
     avgSpeed: 'Vel.Média',
     maxSpeed: 'Vel.Max',
@@ -207,7 +207,7 @@ module.exports = {
     geofence: 'Geocerca',
     duration: 'Duracción',
     vehicles: 'Vehículos',
-    vehicle: 'Vehicle',
+    vehicle: 'Vehículo',
     odometer: 'Cuentaquilómetros',
     startOdometer: 'Start (Km)',
     endOdometer: 'End (Km)',
@@ -220,7 +220,7 @@ module.exports = {
     totalFuelDropLiters: 'Total Fuel Lost',
     speedLimit: 'Límite de Velocidad',
     eventType: 'Evento',
-    info: 'Informação',
+    info: 'Información',
     event_ignitionOff: 'Motor Apagado',
     event_ignitionOn: 'Motor Encendido',
     event_deviceOverspeed: 'Traspassos de velocidad',

package/package.json

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

package/src/events-report.js

@@ -205,7 +205,7 @@ async function exportSpeedingReportToPDF(userData, reportData) {
 }
 
 function exportSpeedingReportToExcel(userData, reportData) {
-    console.log('Export to Excel')
+    console.log('exportSpeedingReportToExcel')
 
     const translations = getTranslations(userData)
 
@@ -226,7 +226,7 @@ function exportSpeedingReportToExcel(userData, reportData) {
             data = data.concat(d.alerts.map(a => {
                 return {
                     name: d.device.name,
-                    eventType: a.type === 'alarm' ? translations.report['event_'+a.attributes.alarm] : translations.report['event'+a.type],
+                    eventType: a.type === 'alarm' ? translations.report['event_'+a.attributes.alarm] : translations.report['event_'+a.type],
                     fixTime: getAlertDate(userData.user, a),
                     address: a.geofenceName || (a.position ? a.position.address : ''),
                     info: getAlertInfo(userData.drivers, a)

package/src/kms-report.js

@@ -9,6 +9,7 @@ const {getDates, convertFromUTC} = require("./util/utils")
 const trips = require("./util/trips")
 const drivers = require("./util/driver")
 const { isInsideTimetable, isPartialInsideTimetable, calculateTrip} = require("./util/trips")
+const traccarHelper = require("./util/traccar");
 
 const fileName = 'KmsReport'
 
@@ -46,14 +47,15 @@ async function createKmsReportByDevice(from, to, userData, traccarInstance) {
     }
 
     devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
-    const route = await traccar.getRoute(traccarInstance, from, to, devicesToProcess)
-    const tripsData = await traccar.getTrips(traccarInstance, from, to, devicesToProcess)
+    const allInOne =  await traccarHelper.getAllInOne(traccarInstance, from, to, devicesToProcess, true, true, false, false)
+    const tripsData = allInOne.trips
+    const routeData = allInOne.route
 
     console.log('trips:' + tripsData.length)
 
     if (tripsData.length > 0) {
-        trips.checkTripsKms(traccarInstance, from, to, devicesToProcess, {trips: tripsData, route: route})
-        allData.devices = processDevices(from, to, devicesToProcess, {trips: tripsData, route: route}, userData)
+        trips.checkTripsKms(traccarInstance, from, to, devicesToProcess, {trips: tripsData, route: routeData})
+        allData.devices = processDevices(from, to, devicesToProcess, {trips: tripsData, route: routeData}, userData)
     }
 
     return allData
@@ -68,8 +70,10 @@ async function createKmsReportByDriver(from, to, userData, traccarInstance) {
         return { drivers: [] }
     }
 
-    const tripsData = await traccar.getTrips(traccarInstance, from, to, devices)
-    const routeData = await traccar.getRoute(traccarInstance, from, to, devices)
+    const allInOne =  await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, true, false, false)
+    const tripsData = allInOne.trips
+    const routeData = allInOne.route
+
 
     return { drivers: processDrivers(from, to, userData, {trips: tripsData, route: routeData}) }
 }

package/src/location-report.js

@@ -54,7 +54,10 @@ async function createLocationReport(from, to, userData, traccar) {
 
     const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
     let data = []
+    let i = 0
     for (const a of arrayOfArrays) {
+        console.log(`PROGRESS_PERC:${++i/arrayOfArrays.length*100}`)
+        console.log('LOADING_MESSAGE:' + a.map(d => d.name).join(', '))
         const response = await traccar.reports.reportsRouteGet(from, to, a.map(d => d.id))
         data = data.concat(response.data)
     }