fleetmap-reports 1.0.343 → 1.0.344

package/package.json

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

package/src/activity-report.js

@@ -172,19 +172,21 @@ function processDevices(from, to, devices, data, userData) {
                             return a > b.maxSpeed ? a : b.maxSpeed
                         }, 0),
                         endOdometer: 0,
-                        startOdometer: 0
+                        startOdometer: 0,
+                        startTime: tripsByDay.length && tripsByDay[0].startTime,
+                        endTime: tripsByDay.length && tripsByDay[tripsByDay.length-1].endTime
                     })
                 } else {
-                    const summaryCurrentDay = data.summaries.filter(s => {
+                    const summaryCurrentDay = data.summaries.find(s => {
                         return  s.deviceId === d.id && s.date.getTime() === date.getTime()})
 
-                    if (summaryCurrentDay.length) {
-                        summaryCurrentDay.forEach(s => {
-                            s.distance = distance
-                            s.convertedSpentFuel = automaticReports.calculateSpentFuel(s.spentFuel, d)
-                        })
+                    if (summaryCurrentDay) {
+                        summaryCurrentDay.distance = distance
+                        summaryCurrentDay.convertedSpentFuel = automaticReports.calculateSpentFuel(summaryCurrentDay.spentFuel, d)
+                        summaryCurrentDay.startTime = tripsByDay.length && tripsByDay[0].startTime
+                        summaryCurrentDay.endTime = tripsByDay.length && tripsByDay[tripsByDay.length-1].endTime
 
-                        summary.push(...summaryCurrentDay)
+                        summary.push(summaryCurrentDay)
                     }
                 }
             }
@@ -193,8 +195,11 @@ function processDevices(from, to, devices, data, userData) {
 
             if (summary.length) {
                 summary.forEach(s => {
-                    s.distance = data.trips.filter(t => t.deviceId === d.id).reduce((a, b) => a + b.distance, 0)
+                    const deviceTrips = data.trips.filter(t => t.deviceId === d.id)
+                    s.distance = deviceTrips.reduce((a, b) => a + b.distance, 0)
                     s.convertedSpentFuel = automaticReports.calculateSpentFuel(s.spentFuel, d)
+                    s.startTime = deviceTrips.length && deviceTrips[0].startTime
+                    s.endTime = deviceTrips.length && deviceTrips[deviceTrips.length-1].endTime
                 })
             }
         }
@@ -234,7 +239,9 @@ function processDrivers(from, to, drivers, data, userData) {
                         distance: tripsByDay.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0),
                         engineHours: tripsByDay.reduce((a, b) => a + b.duration, 0),
                         maxSpeed: tripsByDay.reduce((a, b) => Math.max(a, b.maxSpeed), 0),
-                        averageSpeed: tripsByDay.length > 0 ? Math.round(tripsByDay.reduce((a, b) => a + b.averageSpeed, 0) / tripsByDay.length) : 0,
+                        averageSpeed: tripsByDay.length ? Math.round(tripsByDay.reduce((a, b) => a + b.averageSpeed, 0) / tripsByDay.length) : 0,
+                        startTime: tripsByDay.length && tripsByDay[0].startTime,
+                        endTime: tripsByDay.length && tripsByDay[tripsByDay.length-1].endTime
                     })
                 }
             } else {
@@ -243,6 +250,8 @@ function processDrivers(from, to, drivers, data, userData) {
                     engineHours: trips.reduce((a, b) => a + b.duration, 0),
                     maxSpeed: trips.reduce((a, b) => Math.max(a, b.maxSpeed), 0),
                     averageSpeed: Math.round(trips.reduce((a, b) => a + b.averageSpeed, 0) / trips.length),
+                    startTime: trips.length && trips[0].startTime,
+                    endTime: trips.length && trips[trips.length-1].endTime
                 })
             }
             driversResult.push(driverData)

package/src/index.test.js

@@ -125,7 +125,7 @@ describe('Test_Reports', function() {
         assert.equal(data.length, 1)
         const device = data[0].devices.find(d => d.device.id===22326)
         assert.equal(device.summary.distance, 1193284.3100000024)  // Total Kms
-    },20000)
+    },30000)
     it('KmsReport byDevice groupByDay', async () => {
         const reports = await getReports()
         const userData = await reports.getUserData()
@@ -137,7 +137,7 @@ describe('Test_Reports', function() {
         const device = data[0].devices.find(d => d.device.id===22326)
         assert.equal(device.days.length, 10)  // Total Kms
         assert.equal(device.days[5].kms, 23183.010000005364)  // Total Kms
-    },20000)
+    },90000)
     it('Idle by device', async () => {
         const report = await getReports()
         const userData = await report.getUserData()
@@ -162,6 +162,8 @@ describe('Test_Reports', function() {
         const device = data[0].devices.find(d => d.device.id===22326)
         assert.equal(device.summary[0].startOdometer, 122502742.59)
         assert.equal(device.summary[0].distance, 1386519.1300000101)
+        assert.equal(device.summary[0].startTime, '2022-01-01T13:35:47.000+0000')
+        assert.equal(device.summary[0].endTime, '2022-01-30T13:48:18.000+0000')
     }, 20000)
     it('Activity byDevice groupByDay', async () => {
         const report = await getReports()
@@ -174,6 +176,8 @@ describe('Test_Reports', function() {
         const device = data[0].devices.find(d => d.device.id===22326)
         assert.equal(device.summary[5].startOdometer, 122923290.95)
         assert.equal(device.summary[5].distance, 77020.37999999523)
+        assert.equal(device.summary[5].startTime, '2022-01-06T18:35:04.000+0000')
+        assert.equal(device.summary[5].endTime, '2022-01-06T19:54:27.000+0000')
     }, 60000)
     it('test allinone', async() => {
         console.log('Start')