fleetmap-reports 1.0.826 → 1.0.828

package/lang/frFR.json

@@ -157,6 +157,8 @@
     "delete_geofence": "Éteindre"
   },
   "report": {
+    "geofenceOut": "Sortie",
+    "geofenceIn": "Entré",
     "distanceIn": "Kms à l'intérieur",
     "distanceOut": "Kms à l'extérieur",
     "period": "Période",
@@ -217,7 +219,7 @@
     "ignition": "Allumage",
     "ignitionOn": "Sur",
     "ignitionOff": "désactivé",
-    "enter": "Interdit",
+    "enter": "Entre",
     "exit": "Sortie",
     "geofence": "Zone",
     "duration": "Durée",

package/package.json

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

package/src/activity-report.js

@@ -205,7 +205,7 @@ function processDevices (from, to, devices, data, userData) {
           const summaryCurrentDay = { date, deviceId: d.id }
           summaryCurrentDay.engineHours = tripsByDay.reduce((a, b) => a + b.duration, 0)
           summaryCurrentDay.distance = distance
-          summaryCurrentDay.averageSpeed = distance > 0 ? ((trips.reduce((a, b) => a + (b.averageSpeed * b.distance), 0)) / distance) : 0
+          summaryCurrentDay.averageSpeed = distance > 0 ? ((tripsByDay.reduce((a, b) => a + (b.averageSpeed * b.distance), 0)) / distance) : 0
           summaryCurrentDay.maxSpeed = tripsByDay.reduce((a, b) => { return a > b.maxSpeed ? a : b.maxSpeed }, 0)
           summaryCurrentDay.convertedSpentFuel = calculateConsumption(d, { route: routeByDay })
           summaryCurrentDay.startTime = tripsByDay.length && tripsByDay[0].startTime

package/src/partnerReports/afriquia.js

@@ -6,11 +6,6 @@ const { convertToFeature, convertPositionToFeature } = require('../util/utils')
 function calculateLastStopTime (stopTime, to, time) {
   return stopTime + (to.getTime() - new Date(time).getTime())
 }
-
-function calculateFirstStopTime (stopTime, from, time) {
-  return stopTime + (new Date(time).getTime() - from.getTime())
-}
-
 async function createActivityReport (from, to, userData, traccarInstance) {
   const unauthorizedGeofences = []
   const authorizedGeofences = []

package/src/tests/activity.test.js

@@ -72,4 +72,14 @@ describe('activity report', function () {
     console.log(device)
     assert.equal(device.summary.reduce((a, b) => a + b.convertedSpentFuel, 0), 168.79999999999995)
   }, 800000)
+  it('Activity test performance', async () => {
+    const report = await getReports('q.trans', 'quality1214')
+    const userData = await report.getUserData()
+    console.log(userData)
+    userData.groupByDay = true
+    const data = await report.activityReport(new Date(2023, 7, 1, 0, 0, 0, 0),
+        new Date(2023, 31, 5, 23, 59, 59, 0),
+        userData)
+    assert.equal(data.length, 1)
+  }, 8000000)
 })

package/src/tests/zones.test.js

@@ -32,6 +32,18 @@ describe('zones', function () {
     console.log('result', result)
   }, 4000000)
 
+  it('works with afriquia', async () => {
+    const report = await getReports(process.env.USER_AFRIQUIA, process.env.PASS_AFRIQUIA)
+    const userData = await report.getUserData()
+    console.log(userData.devices.length)
+    console.log(userData.geofences)
+    const result = await report.zoneReport(
+        new Date(Date.UTC(2023, 5, 11, 0, 0, 0, 0)),
+        new Date(Date.UTC(2023, 5, 11, 23, 59, 59, 0)),
+        userData)
+    console.log('result', result)
+  }, 4000000)
+
   // eslint-disable-next-line no-undef
   it('works with casais', async () => {
     const report = await getReports(process.env.USER_CASAIS, process.env.PASS_CASAIS)