fleetmap-reports 1.0.952 → 1.0.954

package/package.json

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

package/src/partnerReports/performance-report.js

@@ -2,11 +2,7 @@ const automaticReports = require('../automaticReports')
 const traccarHelper = require('../util/traccar')
 const { getUncompletedTrip } = require('../util/trips')
 const { getEndTripMessages, getCanDriverStyleMessages, parseEndTripMessage, parseCanDriverStyleMessage } = require('../util/xpert')
-const { calculateDistance, getTranslations, getLanguage } = require('../util/utils')
-const { addTable } = require('../util/pdfDocument')
-const jsPDF = require('jspdf')
-const { getStyle } = require('../reportStyle')
-const { getUserPartner } = require('fleetmap-partners')
+const { calculateDistance } = require('../util/utils')
 
 async function createPerformanceReport (from, to, userData, traccar) {
   const reportData = []
@@ -218,48 +214,4 @@ function calculateRPMSections (route, min, max) {
   return sections
 }
 
-function exportPerformanceReportToPDF (userData, reportData) {
-  const timezone = userData.user.attributes.timezone
-  const translations = getTranslations(userData)
-  const lang = getLanguage(userData)
-
-  const headers = [
-    translations.report.vehicle,
-    'Totale Utilisation',
-    'Conduite',
-    'Ralenti',
-    'Totale (L)',
-    'Conduite (L)',
-    'Ralenti (L)',
-    'Conduite (Km)',
-    'Économique',
-    'Économique (L)',
-    'Économique (Km)',
-    'Cruise Control',
-    'Cruise Control (L)',
-    'Cruise Control (Km)',
-    'Tour moteur élevé',
-    'Accéleration brusque (Sum)',
-    'Freinage brusque (Sum)',
-    'Virages brusque'
-  ]
-
-  const data = []
-  reportData.devices.forEach(d => {
-
-  })
-
-  const doc = new jsPDF.jsPDF('l')
-  const style = getStyle(getUserPartner(userData.user))
-
-  addTable(doc, headers, data, footValues, style)
-  return doc
-}
-
-function exportPerformanceReportToExcel (userData, reportData) {
-
-}
-
 exports.createPerformanceReport = createPerformanceReport
-exports.exportPerformanceReportToPDF = exportPerformanceReportToPDF
-exports.exportPerformanceReportToExcel = exportPerformanceReportToExcel

package/src/tests/zones.test.js

@@ -45,19 +45,20 @@ describe('zones', function () {
 
   // eslint-disable-next-line no-undef
   it('works with casais zones in columns', async () => {
-    const report = await getReports('fleetmap.joao.penas2@gmail.com', 'penas46881')
+    const report = await getReports()
     const userData = await report.getUserData()
     userData.zonesByColumn = true
-    userData.devices = userData.devices.filter(d => d.id === 81202)
+    userData.devices = userData.devices.filter(d => d.id === 81201)
     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, 6, 13, 0, 0, 0, 0)),
-      new Date(Date.UTC(2023, 6, 13, 23, 59, 59, 0)),
+      new Date(Date.UTC(2023, 7, 17, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 7, 20, 23, 59, 59, 0)),
       userData)
     const first = result[0].devices[0]
     console.log(first)
-    assert.equal(first.days[0].distanceOut, 28)
+    assert.equal(first.days[0].distanceOut, 0)
+    assert.equal(first.days[2].distanceOut, 0)
   }, 4000000)
 })

package/src/trip-report.js

@@ -62,7 +62,7 @@ async function createTripReportByDevice (from, to, userData, traccar) {
 
     if (tripsData.length > 0) {
       trips.checkTripsKms(traccar, from, to, slice, { trips: tripsData, route: routeData })
-      allData.devices.push(...processDevices(from, to, slice, {
+      allData.devices.push(...await processDevices(from, to, slice, {
         trips: tripsData,
         stops: stopsData,
         route: routeData
@@ -99,7 +99,7 @@ async function createTripReportByGroup (from, to, userData, traccar) {
 
       if (tripsData.length > 0) {
         console.log('Trips:' + tripsData.length)
-        groupData.devices = processDevices(from, to, devices, { trips: tripsData, stops: stopsData, route: routeData }, userData)
+        groupData.devices = await processDevices(from, to, devices, { trips: tripsData, stops: stopsData, route: routeData }, userData)
 
         reportData.push(groupData)
       }
@@ -145,10 +145,10 @@ async function createTripReportByDriver (from, to, userData, traccar) {
   return report
 }
 
-function processDevices (from, to, devices, data, userData, traccar) {
+async function processDevices (from, to, devices, data, userData, traccar) {
   const devicesResult = []
 
-  devices.forEach(d => {
+  for (const d of devices) {
     const deviceRoute = data.route.filter(t => t.deviceId === d.id)
     const deviceTrips = data.trips.filter(t => t.deviceId === d.id)
 
@@ -157,7 +157,17 @@ function processDevices (from, to, devices, data, userData, traccar) {
       deviceTrips.push(uncompletedTrip)
     }
 
-    const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
+    const trips = []
+
+    for (const t of deviceTrips) {
+      if (userData.allWeek ||
+        !userData.weekDays ||
+        isInsideTimetable(t, userData) ||
+        await isPartialInsideTimetable(t, userData, deviceRoute)) {
+        trips.push(t)
+      }
+    }
+
     const stops = data.stops.filter(s => s.deviceId === d.id)
 
     trips.forEach(trip => {
@@ -224,7 +234,7 @@ function processDevices (from, to, devices, data, userData, traccar) {
 
       devicesResult.push(deviceData)
     }
-  })
+  }
 
   return devicesResult
 }

package/src/zone-report.js

@@ -441,7 +441,7 @@ async function getInAndOutEvents (devices, route, userData) {
         geofencesFeatures.forEach((g, id) => {
           if (checkGeofenceIn(p, g)) {
             p.inside[id] = true
-            events.push(createEvent('geofenceIn', d.id, p, g))
+            events.push(createEvent('geofenceEnter', d.id, p, g))
           }
         })
         return

package/src/tests/gpsjump.test.js

@@ -1,23 +0,0 @@
-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)
-})