fleetmap-reports 1.0.379 → 1.0.380

package/package.json

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

package/src/index.test.js

@@ -200,9 +200,9 @@ describe('Test_Reports', function() {
         assert.equal(data.length, 1)
         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, 1386539.76000001)
+        assert.equal(device.summary[0].distance, 1423529.600000009)
         assert.equal(device.summary[0].startTime, '2022-01-01T13:35:47.000+0000')
-        assert.equal(device.summary[0].endTime, '2022-01-30T14:08:13.000+0000')
+        assert.equal(device.summary[0].endTime, '2022-01-31T17:36:27.000+0000')
     }, 40000)
     it('Activity 2 by device', async () => {
         const report = await getReports()
@@ -235,16 +235,16 @@ describe('Test_Reports', function() {
         const reports = await getReports()
         const userData = await reports.getUserData()
         const r = await require('./util/traccar').getAllInOne(reports.traccar,
-            new Date(2022, 1, 1),
-            new Date(2022, 1, 4),
+            new Date(2022, 1, 1, 0, 0, 0, 0),
+            new Date(2022, 1, 4, 23, 59, 59, 0),
             userData.devices,
             false,
             true,
             true,
             false)
 
-        assert.equal(r.trips.filter(t => t.deviceId === 22327).length, 10)
-        assert.equal(r.stops.filter(t => t.deviceId === 22327).length, 11)
+        assert.equal(r.trips.filter(t => t.deviceId === 22327).length, 20)
+        assert.equal(r.stops.filter(t => t.deviceId === 22327).length, 21)
     }, 20000)
     it('Total KMS', async () => {
         const report = await getReports()

package/src/trip-report.js

@@ -44,17 +44,29 @@ async function createTripReportByDevice(from, to, userData, traccar) {
 
     devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
-    const devicesToSlice = devices.slice()
-    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devicesToSlice, true, true, true, false)
-    const tripsData = allInOne.trips
-    const stopsData = allInOne.stops
-    const routeData = allInOne.route
-
-    console.log('Trips:' + tripsData.length)
+    //const devicesToSlice = devices.slice()
+
+    console.log('LOADING_MESSAGE:' + devices.map(d => d.name).join(', '))
+    let deviceCount = 0
+    for(const device of devices) {
+        const allInOne = await traccarHelper.getAllInOne(traccar, from, to, [device], true, true, true, false)
+        const tripsData = allInOne.trips
+        const stopsData = allInOne.stops
+        const routeData = allInOne.route
+
+        console.log('Trips:' + tripsData.length)
+
+        if (tripsData.length > 0) {
+            trips.checkTripsKms(traccar, from, to, [device], {trips: tripsData, route: routeData})
+            allData.devices.push(...processDevices(from, to, [device], {
+                trips: tripsData,
+                stops: stopsData,
+                route: routeData
+            }, userData))
+        }
 
-    if (tripsData.length > 0) {
-        trips.checkTripsKms(traccar, from, to, devices, {trips: tripsData, route: routeData})
-        allData.devices = processDevices(from, to, devices, {trips: tripsData, stops: stopsData, route: routeData}, userData)
+        console.log('LOADING_MESSAGE:' + device.name)
+        console.log(`PROGRESS_PERC:${++deviceCount / devices.length * 100}`)
     }
 
     return allData
@@ -133,8 +145,6 @@ function processDevices(from, to, devices, data, userData) {
         const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
         const stops = data.stops.filter(s => s.deviceId === d.id)
 
-        console.log('LOADING_MESSAGE:' + d.name)
-
         addNearestPOIs(trips, userData)
 
         trips.forEach(trip => {

package/src/util/traccar.js

@@ -71,10 +71,8 @@ async function getAllInOne(traccar, from, to, devices, getRoutes, getTrips, getS
     if(getTrips)   url += `&type=trips`
     if(getStops)   url += `&type=stops`
     if(getSummary) url += `&type=summary`
-    console.log('LOADING_MESSAGE:' + devices.map(d => d.name).join(', '))
 
     const sliced = automaticReports.sliceArray(devices, 5)
-    let deviceCount = 0
     const result = []
     for(const chunk of sliced) {
         const requests = chunk.map(d =>
@@ -82,8 +80,6 @@ async function getAllInOne(traccar, from, to, devices, getRoutes, getTrips, getS
             jar: traccar.cookieJar,
             withCredentials: true
         }).then(r => r.data).then(x => {
-                console.log('LOADING_MESSAGE:' + d.name)
-                console.log(`PROGRESS_PERC:${++deviceCount / devices.length * 100}`)
                 return x
             }))
         result.push(...(await Promise.all(requests)))