fleetmap-reports 1.0.342 → 1.0.343

package/package.json

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

package/src/index.test.js

@@ -174,7 +174,7 @@ 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)
-    }, 40000)
+    }, 60000)
     it('test allinone', async() => {
         console.log('Start')
         const reports = await getReports()
@@ -187,7 +187,28 @@ describe('Test_Reports', function() {
             true,
             true,
             false)
-        assert.equal(r.trips.length, 10)
-        assert.equal(r.stops.length, 11)
+
+        assert.equal(r.trips.filter(t => t.deviceId === 22327).length, 10)
+        assert.equal(r.stops.filter(t => t.deviceId === 22327).length, 11)
     }, 20000)
+    it('Total KMS', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
+
+        const tripsReport = await report.tripReport(new Date(2022, 1, 11, 0, 0, 0, 0),
+            new Date(2022, 1, 14, 23, 59, 59, 0),
+            userData)
+
+        const kmsReport = await report.kmsReport(new Date(2022, 1, 11, 0, 0, 0, 0),
+            new Date(2022, 1, 14, 23, 59, 59, 0),
+            userData)
+
+        assert.equal(tripsReport.length, 1)
+        const device1 = tripsReport[0].devices.find(d => d.device.id===11681)
+        assert.equal(device1.trips.length, 44)  // Total Trips
+        assert.equal(device1.totalDistance, 883076.9928612101)  // Total Kms
+
+        const device2 = kmsReport[0].devices.find(d => d.device.id===11681)
+        assert.equal(device2.summary.distance, device1.totalDistance)  // Total Kms
+    }, 30000)
 })

package/src/util/trips.js

@@ -34,7 +34,18 @@ function checkTripsKms(traccarInstance, from, to, devices, data) {
                 const tripRoute = data.route.filter(p => p.deviceId === t.deviceId
                     && new Date(p.fixTime).getTime() >= new Date(t.startTime).getTime()
                     && new Date(p.fixTime).getTime() <= new Date(t.endTime).getTime())
-                t.distance = tripRoute.reduce((a, b) => a + b.attributes.distance, 0)
+
+                let current = null
+                const distances = []
+                for(const p of tripRoute) {
+                    if(current) {
+                        distances.push(coordsDistance(parseFloat(current.longitude),parseFloat(current.latitude),
+                            parseFloat(p.longitude),parseFloat(p.latitude)))
+                    }
+                    current = p
+                }
+
+                t.distance = distances.reduce((a, b) => a + b, 0)
             }
         })
     }