fleetmap-reports 1.0.911 → 1.0.915

package/package.json

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

package/src/speeding-report.js

@@ -628,7 +628,8 @@ function exportSpeedingReportToExcel (userData, reportData) {
     { label: translations.report.distance, value: 'distance' },
     { label: translations.report.maxSpeed, value: 'maxSpeed' },
     { label: translations.report.duration, value: 'duration' },
-    userData.byDriver ? { label: translations.report.vehicle, value: 'name' } : { label: translations.report.driver, value: 'driver' }
+    userData.byDriver ? { label: translations.report.vehicle, value: 'name' } : { label: translations.report.driver, value: 'driver' },
+    { label: 'link', value: 'link', format: 'hyperlink' }
   ]
 
   if (userData.roadSpeedLimits) {
@@ -654,7 +655,8 @@ function exportSpeedingReportToExcel (userData, reportData) {
             : userData.useVehicleSpeedLimit
               ? Math.round(a.attributes.speedLimit * 1.85200)
               : userData.customSpeed,
-          ...(userData.roadSpeedLimits ? { info: `https://openstreetmap.org/way/${a.way_id}` } : {})
+          ...(userData.roadSpeedLimits ? { info: `https://openstreetmap.org/way/${a.way_id}` } : {}),
+          link: `https://${getUserPartner(userData.user).host}/#/map?vehicleName=${userData.byDriver ? a.deviceName : d.device.name}&date=${new Date(a.position.fixTime).toISOString()}`
         }
       }))
     })

package/src/tests/zones.test.js

@@ -45,18 +45,19 @@ describe('zones', function () {
 
   // eslint-disable-next-line no-undef
   it('works with casais zones in columns', async () => {
-    const report = await getReports(process.env.USER_CASAIS, process.env.PASS_CASAIS)
+    const report = await getReports('fleetmap.joao.penas2@gmail.com', 'penas46881')
     const userData = await report.getUserData()
     userData.zonesByColumn = true
-    userData.devices = userData.devices.filter(d => d.name === 'G-1101-E Clio')
-    userData.geofences = userData.geofences.filter(g => g.name === 'baliza 1 - raio verde ')
+    userData.devices = userData.devices.filter(d => d.name === 'G-5983-E Clio')
+    userData.geofences = userData.geofences.filter(g => g.name === 'baliza 1 - raio verde ' ||
+    g.name === 'baliza 2 - raio amarelo')
     userData.onlyWithKmsOut = true
     const result = await report.zoneReport(
-      new Date(Date.UTC(2023, 0, 1, 0, 0, 0, 0)),
-      new Date(Date.UTC(2023, 0, 31, 23, 59, 59, 0)),
+      new Date(Date.UTC(2023, 8, 1, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 8, 30, 23, 59, 59, 0)),
       userData)
-    const first = result[0].devices[0].days[0]
+    const first = result[0].devices[0]
     console.log(first)
-    assert.equal(first.distanceOut, 35.52274536571346)
+    assert.equal(first.distanceOut, 0)
   }, 4000000)
 })

package/src/zone-report.js

@@ -289,8 +289,9 @@ function calculateDistanceIn (zoneInOutDayData, deviceRoute, dayRoute, fromByDay
 
 function calculateDistanceOut (zoneInOutDayData, dayRoute, fromByDay, toByDay, field, device) {
   if (zoneInOutDayData.length) {
-    let distanceOut = zoneInOutDayData.reduce((a, b) => a + (b[field] || 0), 0) -
-        (zoneInOutDayData[zoneInOutDayData.length - 1][field] || 0)
+    const dataInsideDay = zoneInOutDayData.filter(z => (z.inTime && new Date(z.inTime.fixTime) > fromByDay) && (z.outTime && new Date(z.outTime.fixTime) > toByDay))
+    let distanceOut = dataInsideDay.reduce((a, b) => a + (b[field] || 0), 0) -
+        (dataInsideDay.length ? (dataInsideDay[dataInsideDay.length - 1][field] || 0) : 0)
 
     if (zoneInOutDayData[0].inTime && new Date(zoneInOutDayData[0].inTime.fixTime) > fromByDay) {
       // Add distanceOut before the first entry