fleetmap-reports 1.0.755 → 1.0.757

package/package.json

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

package/src/partnerReports/performance-report.js

@@ -22,25 +22,25 @@ async function createPerformanceReport (from, to, userData, traccar) {
         deviceTrips.push(uncompletedTrip)
       }
 
-      const endTripData = getEndTripMessages(deviceRoute).map(m => parseEndTripMessage(m.xpertString || m))
-      const canDriverStyle = getCanDriverStyleMessages(deviceRoute).map(m => parseCanDriverStyleMessage(m.xpertString || m))
+      const endTripData = getEndTripMessages(deviceRoute).map(m => parseEndTripMessage(m.xpertString || m)).sort((a, b) => a.date.localeCompare(b.date))
+      const canDriverStyle = getCanDriverStyleMessages(deviceRoute).map(m => parseCanDriverStyleMessage(m.xpertString || m)).sort((a, b) => a.date.localeCompare(b.date))
 
       const deviceData = {
         device: d.name,
-        drivingTime: endTripData.reduce((a, b) => a + b.totalTimeDriving, 0),
-        idleTime: endTripData.reduce((a, b) => a + b.totalTimeInIdle, 0),
-        drivingConsumption: endTripData.reduce((a, b) => a + b.totalFuelConsumptionDriving, 0),
-        idleConsumption: endTripData.reduce((a, b) => a + b.totalFuelConsumptionInIdle, 0),
-        drivingDistance: endTripData.reduce((a, b) => a + b.totalDistanceTravelled, 0),
-        cruiseControlTime: endTripData.reduce((a, b) => a + b.totalTimeWithCruiseControl, 0),
-        cruiseControlConsumption: endTripData.reduce((a, b) => a + b.totalFuelConsumptionWithCruiseControl, 0),
-        cruiseControlDistance: endTripData.reduce((a, b) => a + b.totalDistanceTravelledWithCruiseControl, 0),
-        economicTime: canDriverStyle.reduce((a, b) => a + b.totalTimeInEcoRange, 0),
-        economicConsumption: canDriverStyle.reduce((a, b) => a + b.totalFuelConsumptionInEcoRange, 0),
-        economicDistance: canDriverStyle.reduce((a, b) => a + b.totalDistanceInEcoRange, 0),
-        highEngineRPM: canDriverStyle.reduce((a, b) => a + b.totalTimeWithHighRpmAndTorque, 0),
-        hardBreaking: canDriverStyle.reduce((a, b) => a + b.totalNumberOfHarshBrakes, 0),
-        hardAcceleration: canDriverStyle.reduce((a, b) => a + b.totalNumberOfHarshAccelerations, 0)
+        drivingTime: endTripData.length > 1 ? endTripData[endTripData.length - 1].totalTimeDriving - endTripData[0].totalTimeDriving : 0,
+        idleTime: endTripData.length > 1 ? endTripData[endTripData.length - 1].totalTimeInIdle - endTripData[0].totalTimeInIdle : 0,
+        drivingConsumption: endTripData.length > 1 ? endTripData[endTripData.length - 1].totalFuelConsumptionDriving - endTripData[0].totalFuelConsumptionDriving : 0,
+        idleConsumption: endTripData.length > 1 ? endTripData[endTripData.length - 1].totalFuelConsumptionInIdle - endTripData[0].totalFuelConsumptionInIdle : 0,
+        drivingDistance: endTripData.length > 1 ? endTripData[endTripData.length - 1].totalDistanceTravelled - endTripData[0].totalDistanceTravelled : 0,
+        cruiseControlTime: endTripData.length > 1 ? endTripData[endTripData.length - 1].totalTimeWithCruiseControl - endTripData[0].totalTimeWithCruiseControl : 0,
+        cruiseControlConsumption: endTripData.length > 1 ? endTripData[endTripData.length - 1].totalFuelConsumptionWithCruiseControl - endTripData[0].totalFuelConsumptionWithCruiseControl : 0,
+        cruiseControlDistance: endTripData.length > 1 ? endTripData[endTripData.length - 1].totalDistanceTravelledWithCruiseControl - endTripData[0].totalDistanceTravelledWithCruiseControl : 0,
+        economicTime: canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalTimeInEcoRange - canDriverStyle[0].totalTimeInEcoRange : 0,
+        economicConsumption: canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalFuelConsumptionInEcoRange - canDriverStyle[0].totalFuelConsumptionInEcoRange : 0,
+        economicDistance: canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalDistanceInEcoRange - canDriverStyle[0].totalDistanceInEcoRange : 0,
+        highEngineRPM: canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalTimeWithHighRpmAndTorque - canDriverStyle[0].totalTimeWithHighRpmAndTorque : 0,
+        hardBreaking: canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalNumberOfHarshBrakes - canDriverStyle[0].totalNumberOfHarshBrakes : 0,
+        hardAcceleration: canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalNumberOfHarshAccelerations - canDriverStyle[0].totalNumberOfHarshAccelerations : 0
       }
       reportData.push(deviceData)
     })

package/src/tests/zones.test.js

@@ -69,4 +69,20 @@ describe('zones', function () {
     assert.equal(first.distanceIn, 93.03917199839687)
     assert.equal(first.distanceOut, 819.6685737216337)
   }, 4000000)
+
+  it('works with casais 3', async () => {
+    const report = await getReports(process.env.USER_CASAIS, process.env.PASS_CASAIS)
+    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 raio verde ' || g.name === 'baliza raio amarelo ')
+    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)),
+        userData)
+    const first = result[0].devices[0].geofences[0]
+    console.log(first)
+    assert.equal(first.name, 'baliza raio verde ')
+    assert.equal(first.distanceIn, '1069.343491503579')
+  }, 4000000)
 })

package/src/util/xpert.js

@@ -2,6 +2,7 @@ function parseEndTripMessage (xpertMessage) {
   const data = xpertMessage.split(',')
 
   return {
+    date: data[1],
     totalDistanceTravelled: Number(data[2]),
     totalDistanceTravelledWithCruiseControl: Number(data[3]),
     totalFuelConsumption: Number(data[4]),
@@ -22,6 +23,7 @@ function parseCanDriverStyleMessage (xpertMessage) {
   const data = xpertMessage.split(',')
 
   return {
+    date: data[1],
     totalFuelConsumptionInEcoRange: Number(data[2]),
     totalTimeInEcoRange: Number(data[3]),
     totalDistanceInEcoRange: Number(data[4]),

package/src/zone-report.js

@@ -70,8 +70,13 @@ async function createZoneReport (from, to, userData, traccar) {
       deviceCount, devices.length, sliceSize, deviceChunk, undefined)
 
     const route = filterPositions(data.route)
-    const alerts = await parallel('zone-report', 'getInAndOutEvents', slice, cleanPositions(route), userData)
-    allData.devices.push(...await processDevices(from, to, devices, userData, { alerts, route }))
+    const alerts = []
+    if (isClientSide()) {
+      alerts.push(...(await getInAndOutEvents(slice, cleanPositions(route), userData)))
+    } else {
+      alerts.push(...(await parallel('zone-report', 'getInAndOutEvents', slice, cleanPositions(route), userData)))
+    }
+    allData.devices.push(...await processDevices(from, to, devices, userData, { alerts, route, summary: data.summary }))
 
     deviceCount = deviceCount + slice.length
   }
@@ -98,7 +103,7 @@ async function processDevices (from, to, devices, userData, data) {
 
     const zoneInOutData = analyseAlerts(alerts, deviceRoute, userData, from, to).filter(d => !userData.onlyWithStop || d.stopped)
 
-    if (userData.groupByDay) {
+    if (userData.groupByDay || userData.zonesByColumn) {
       const dates = getDates(from, to, userData.user.attributes.timezone)
 
       const geofencesData = []
@@ -175,13 +180,45 @@ async function processDevices (from, to, devices, userData, data) {
         })
       }
 
-      devicesResult.push({
-        device: d,
-        from,
-        to,
-        groupByDay: true,
-        geofences: geofencesData
-      })
+      if (userData.zonesByColumn) {
+        const groupByDay = []
+        for (const date of dates) {
+          const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
+          const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
+
+          const dayRoute = deviceRoute.filter(p => new Date(p.fixTime) >= fromByDay && new Date(p.fixTime) < toByDay)
+          const totalDistance = calculateDistance(dayRoute)
+
+          const geofences = geofencesData.map(g => {
+            return {
+              geofenceName: g.geofenceName,
+              distanceIn: g.days.find(day => day.date === date).distanceIn
+            }
+          })
+
+          groupByDay.push({
+            date,
+            geofences,
+            distanceOut: totalDistance - geofences.reduce((a, b) => a + (b.distanceIn || 0), 0)
+          })
+        }
+
+        devicesResult.push({
+          device: d,
+          from,
+          to,
+          zonesByColumn: true,
+          days: groupByDay
+        })
+      } else {
+        devicesResult.push({
+          device: d,
+          from,
+          to,
+          groupByDay: true,
+          geofences: geofencesData
+        })
+      }
     } else {
       if (zoneInOutData.length > 0) {
         devicesResult.push({