fleetmap-reports 1.0.981 → 1.0.983

package/package.json

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

package/src/kms-report.js

@@ -10,9 +10,8 @@ const traccar = require('./util/traccar')
 const { getDates, getTranslations, isClientSide, executeServerSide } = require('./util/utils')
 const drivers = require('./util/driver')
 const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, checkTripsKms, getKms } = require('./util/trips')
-const traccarHelper = require('./util/traccar')
 const { devicesToProcess } = require('./util/device')
-const { getDriverData } = require('./util/driver')
+const { getDriverData, reportByDriver } = require('./util/driver')
 const automaticReports = require('./automaticReports')
 const { getSummaryByDay } = require('./util/traccar')
 
@@ -100,16 +99,30 @@ async function createKmsReportByDevice (from, to, userData, traccarInstance) {
 
 async function createKmsReportByDriver (from, to, userData, traccarInstance) {
   const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
-  console.log(devices.length)
 
-  if (!devices.length) {
-    // empty report
-    return { drivers: [] }
-  }
+  const results = await reportByDriver(devices, traccarInstance, from, to, userData, processDrivers)
+
+  const report = { drivers: [] }
 
-  const allInOne = await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, true, false, false)
+  results.drivers.forEach(result => {
+    const driver = report.drivers.find(d => d.driver.id === result.driver.id)
+    if (driver) {
+      if (userData.groupByDay) {
+        driver.days.forEach(day => {
+          const resultDay = result.days.find(d => d.date === day.date)
+          if (resultDay) {
+            day.kms = day.kms + resultDay.kms
+          }
+        })
+      } else {
+        driver.summary.distance = driver.summary.distance + result.summary.distance
+      }
+    } else {
+      report.drivers.push(result)
+    }
+  })
 
-  return { drivers: processDrivers(from, to, userData, allInOne) }
+  return report
 }
 
 async function createKmsReportByGroup (from, to, userData, traccarInstance) {

package/src/speeding-report.js

@@ -1,5 +1,8 @@
 const jsPDF = require('jspdf')
-const { convertMS, convertToLocaleString, convertToFeature, convertPositionToFeature, getTranslations, getLanguage } = require('./util/utils')
+const {
+  convertMS, convertToLocaleString, convertToFeature, convertPositionToFeature, getTranslations, getLanguage,
+  getCountry
+} = require('./util/utils')
 const { headerFromUser, AmiriRegular } = require('./util/pdfDocument')
 require('jspdf-autotable')
 const { getStyle } = require('./reportStyle')
@@ -15,7 +18,6 @@ const booleanPointInPolygon = require('@turf/boolean-point-in-polygon')
 const automaticReports = require('./automaticReports')
 const { default: axios } = require('axios')
 const { getDriverName, getDriverData } = require('./util/driver')
-const crg = require('country-reverse-geocoding').country_reverse_geocoding()
 
 const fileName = 'SpeedingReport'
 const eventTypes = ['deviceOverspeed']
@@ -299,11 +301,6 @@ async function getCustomSpeedLimitEvents (devices, routes, customSpeed) {
   return events
 }
 
-function getCountry (position) {
-  const country = crg.get_country(position.latitude, position.longitude)
-  return country && country.code
-}
-
 async function getRoadSpeedLimits (devices, routes, threshold, minimumMinutes = 0) {
   const position = routes.find(p => getCountry(p))
   const country = position && getCountry(position)

package/src/tests/kms.test.js

@@ -52,4 +52,13 @@ describe('Kms_Reports', function () {
     assert.equal(device.days.length, 30) // Total Kms
     assert.equal(device.days[29].kms, 136174.93281451002) // Total Kms
   }, 30000)
+  it('KmsReport by driver', async () => {
+    const reports = await getReports()
+    const userData = await reports.getUserData()
+    userData.byDriver = true
+    console.log(userData.drivers)
+    const data = await reports.kmsReport(new Date(2024, 0, 24, 0, 0, 0), new Date(2024, 0, 24, 23, 59, 59),
+        userData)
+    assert.equal(data.length, 1)
+  }, 3000000)
 })

package/src/tests/speeding.test.js

@@ -1,5 +1,6 @@
 const { getReports } = require('./index')
 const assert = require('assert')
+const { getCountry } = require('../util/utils')
 
 async function getSpeedingReport (report, userData) {
   const data = await report.speedingReport(
@@ -61,4 +62,49 @@ describe('speeding tests', function () {
     assert.equal(totalDistance, 46.64576895855739) // Total Kms
     assert.equal(totalEventTime, 1402000) // Total Duration
   }, 999990000)
+
+  // eslint-disable-next-line no-undef
+  it('detects brazil', () => {
+    const p = {
+      id: 24088423790,
+      attributes: {
+        door: false,
+        hours: 2520745000,
+        motion: false,
+        distance: 0,
+        odometer: 5973617,
+        sat: 17,
+        battery: 4.03,
+        hdop: 0.7,
+        idleTime: 0,
+        output: 0,
+        input: 0,
+        driverUniqueId: '',
+        power: 12.61,
+        event: 0,
+        totalDistance: 31419705.27,
+        ignition: false,
+        adc3: 0,
+        adc2: 0,
+        status: 61,
+        tripTime: 0
+      },
+      deviceId: 28097,
+      type: null,
+      protocol: 'startek',
+      serverTime: '2024-01-20T03:01:50.000+00:00',
+      deviceTime: '2024-01-20T03:01:50.000+00:00',
+      fixTime: '2024-01-20T03:01:50.000+00:00',
+      outdated: false,
+      valid: true,
+      latitude: -22.295906,
+      longitude: -48.576135,
+      altitude: 579,
+      speed: 0,
+      course: 80,
+      address: 'Avenida Deputado Zien Nassif, 938, Vila Industrial, Jaú - SP, 17204-212, Brazil',
+      accuracy: 0
+    }
+    assert.equal('BRA', getCountry(p))
+  })
 })

package/src/util/utils.js

@@ -298,3 +298,14 @@ exports.getLogoUrl = getLogoUrl
 exports.convertFromUTCDate = (value, user) => {
   return convertFromUTC(value, user.attributes.timezone || getUserPartner(user).timezone)
 }
+
+const crg = require('country-reverse-geocoding').country_reverse_geocoding()
+
+exports.getCountry = (position) => {
+  const country = crg.get_country(position.latitude, position.longitude)
+  if (!country) {
+    const country = position && position.attributes.address && position.attributes.address.split(',').slice(-1)[0].trim()
+    return { Brazil: 'BRA' }[country]
+  }
+  return country && country.code
+}

package/src/zone-report.js

@@ -94,7 +94,7 @@ async function processDevices (from, to, devices, userData, data) {
   for (const d of devices) {
     const alerts = data.alerts.filter(t => t.deviceId === d.id)
     const deviceRoute = data.route.filter(p => p.deviceId === d.id)
-    const zoneInOutData = analyseAlerts(alerts, deviceRoute, userData, from, to, d).filter(d => !userData.onlyWithStop || d.stopped)
+    let zoneInOutData = analyseAlerts(alerts, deviceRoute, userData, from, to, d).filter(d => !userData.onlyWithStop || d.stopped)
 
     if (userData.groupByDay || userData.zonesByColumn) {
       const dates = getDates(from, to, userData.user.attributes.timezone)
@@ -191,18 +191,35 @@ async function processDevices (from, to, devices, userData, data) {
       if (zoneInOutData.length > 0) {
         if (userData.tripsBetweenZones) {
           const tripsBetweenZones = []
-          zoneInOutData.forEach((a, index) => {
-            if (index + 1 < zoneInOutData.length && a.outTime && zoneInOutData[index + 1].inTime) {
+          zoneInOutData = zoneInOutData.sort((a, b) => a.inTime && b.inTime && new Date(a.inTime.fixTime).getTime() - new Date(b.inTime.fixTime).getTime())
+          let outGeofence
+          let inGeofence
+          for (let i = 0; i < zoneInOutData.length - 1; i++) {
+            if (!outGeofence) {
+              outGeofence = zoneInOutData[i]
+            }
+            inGeofence = zoneInOutData[i + 1]
+
+            if (outGeofence.outTime &&
+                inGeofence.inTime &&
+                new Date(outGeofence.outTime.fixTime).getTime() < new Date(inGeofence.inTime.fixTime).getTime()) {
               tripsBetweenZones.push({
-                outTime: a.outTime,
-                outGeofenceName: a.geofenceName,
-                inTime: zoneInOutData[index + 1].inTime,
-                inGeofenceName: zoneInOutData[index + 1].geofenceName,
-                distanceOut: a.distanceOutAny,
-                totalOutTime: new Date(zoneInOutData[index + 1].inTime.fixTime).getTime() - new Date(a.outTime.fixTime).getTime()
+                outTime: outGeofence.outTime,
+                outGeofenceName: outGeofence.geofenceName,
+                inTime: inGeofence.inTime,
+                inGeofenceName: inGeofence.geofenceName,
+                distanceOut: outGeofence.distanceOutAny,
+                totalOutTime: new Date(inGeofence.inTime.fixTime).getTime() - new Date(outGeofence.outTime.fixTime).getTime()
               })
+              outGeofence = undefined
+            } else {
+              if (outGeofence.outTime &&
+                  inGeofence.outTime &&
+                  new Date(outGeofence.outTime.fixTime).getTime() <= new Date(inGeofence.outTime.fixTime).getTime()) {
+                outGeofence = undefined
+              }
             }
-          })
+          }
           if (tripsBetweenZones.length > 0) {
             devicesResult.push({
               device: d,