fleetmap-reports 1.0.353 → 1.0.354

package/package.json

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

package/src/activity-report.js

@@ -85,7 +85,7 @@ async function createActivityReportByDevice(from, to, userData, traccarInstance)
     devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
     let summaries = []
-    const {trips, route, summary}  = await traccar.getAllInOne(traccarInstance, from, to, devicesToProcess, userData.groupByDay && !userData.allWeek, true, false, !userData.groupByDay)
+    const {trips, route, summary}  = await traccar.getAllInOne(traccarInstance, from, to, devicesToProcess, true, true, false, !userData.groupByDay)
 
     if(userData.groupByDay) {
         console.log('trips:' + trips.length)
@@ -142,6 +142,15 @@ async function createActivityReportByDriver(from, to, userData, traccarInstance)
 }
 
 
+function getActivityEnd(deviceTrips, deviceRoute) {
+    const route = deviceRoute.filter(p => p.attributes.ignition)
+    const tripEndDate = deviceTrips.length && deviceTrips[deviceTrips.length-1].endTime
+    if(route.length && new Date(route[route.length-1].fixTime).getTime() > new Date(tripEndDate).getTime()) {
+        return route[route.length-1].fixTime
+    }
+    return tripEndDate
+}
+
 function processDevices(from, to, devices, data, userData) {
     const devicesResult = []
 
@@ -195,10 +204,12 @@ function processDevices(from, to, devices, data, userData) {
             if (summary.length) {
                 summary.forEach(s => {
                     const deviceTrips = data.trips.filter(t => t.deviceId === d.id)
+                    const deviceRoute = data.route.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
+                    s.endTime = getActivityEnd(deviceTrips, deviceRoute)
                 })
             }
         }

package/src/index.test.js

@@ -165,8 +165,20 @@ describe('Test_Reports', function() {
         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')
-    }, 90000)
+        assert.equal(device.summary[0].endTime, '2022-01-30T14:08:13.000+0000')
+    }, 40000)
+    it('Activity 2 by device', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
+        userData.devices = userData.devices.filter(d => d.id === 11437)
+        const data = await report.activityReport(new Date(2022, 2, 5, 0, 0, 0, 0),
+            new Date(2022, 2, 5, 23, 59, 59, 0),
+            userData)
+        assert.equal(data.length, 1)
+        const device = data[0].devices.find(d => d.device.id===11437)
+        assert.equal(device.summary[0].endTime, '2022-03-05T23:59:55.000+0000')
+
+    }, 40000)
     it('Activity byDevice groupByDay', async () => {
         const report = await getReports()
         const userData = await report.getUserData()