fleetmap-reports 1.0.794 → 1.0.795

package/package.json

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

package/src/activity-report.js

@@ -188,21 +188,19 @@ function processDevices (from, to, devices, data, userData) {
             })
           }
         } else {
-          const summaryCurrentDay = data.summaries.find(s => {
-            return s.deviceId === d.id && s.date.getTime() === date.getTime()
-          })
-
-          if (summaryCurrentDay) {
-            summaryCurrentDay.engineHours = tripsByDay.reduce((a, b) => a + b.duration, 0)
-            summaryCurrentDay.distance = distance
-            summaryCurrentDay.convertedSpentFuel = calculateConsumption(d, { route: deviceRoute, summary: summaryCurrentDay })
-            summaryCurrentDay.startTime = tripsByDay.length && tripsByDay[0].startTime
-            summaryCurrentDay.startAddress = tripsByDay.length && tripsByDay[0].startAddress
-            summaryCurrentDay.endTime = tripsByDay.length && tripsByDay[tripsByDay.length - 1].endTime
-            summaryCurrentDay.endAddress = tripsByDay.length && tripsByDay[tripsByDay.length - 1].endAddress
-
-            summary.push(summaryCurrentDay)
-          }
+          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.maxSpeed = tripsByDay.reduce((a, b) => { return a > b.maxSpeed ? a : b.maxSpeed }, 0)
+          summaryCurrentDay.convertedSpentFuel = calculateConsumption(d, { route: deviceRoute })
+          summaryCurrentDay.startTime = tripsByDay.length && tripsByDay[0].startTime
+          summaryCurrentDay.startAddress = tripsByDay.length && tripsByDay[0].startAddress
+          summaryCurrentDay.endTime = tripsByDay.length && tripsByDay[tripsByDay.length - 1].endTime
+          summaryCurrentDay.endAddress = tripsByDay.length && tripsByDay[tripsByDay.length - 1].endAddress
+          summaryCurrentDay.startOdometer = trips.length ? trips[0].startOdometer : 0
+          summaryCurrentDay.endOdometer = trips.length ? trips[trips.length - 1].endOdometer : 0
+          summary.push(summaryCurrentDay)
         }
       }
     } else {

package/src/tests/activity.test.js

@@ -7,9 +7,9 @@ describe('activity report', function () {
   it('Activity by device', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
-
-    const data = await report.activityReport(new Date(2022, 0, 1, 0, 0, 0, 0),
-      new Date(2022, 0, 31, 23, 59, 59, 0),
+    userData.groupByDay = true
+    const data = await report.activityReport(new Date(2023, 0, 1, 0, 0, 0, 0),
+      new Date(2023, 0, 31, 23, 59, 59, 0),
       userData)
     assert.equal(data.length, 1)
     const device = data[0].devices.find(d => d.device.id === 22326)