fleetmap-reports 1.0.793 → 1.0.795

package/package.json

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

package/src/activity-report.js

@@ -10,7 +10,6 @@ const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const traccar = require('./util/traccar')
 const { isInsideTimetable, isPartialInsideTimetable, calculateTrip } = require('./util/trips')
-const tripHelper = require('./util/trips')
 const { devicesToProcess } = require('./util/device')
 const { getDriverData } = require('./util/driver')
 const { calculateConsumption } = require('./util/fuel')
@@ -102,7 +101,6 @@ async function createActivityReportByDevice (from, to, userData, traccarInstance
     let deviceCount = 0
     const sliced = automaticReports.sliceArray(allDevices, 20)
     for (const devices of sliced) {
-      let summaries = []
       const needRoute = userData.groupByDay || !userData.allWeek
       const {
         trips,
@@ -110,35 +108,9 @@ async function createActivityReportByDevice (from, to, userData, traccarInstance
         summary
       } = await traccar.getAllInOne(traccarInstance, from, to, devices, needRoute, true, false, !userData.groupByDay, deviceCount, allDevices.length, 10)
 
-      if (userData.groupByDay) {
-        console.log('trips:' + trips.length)
-
-        if (trips.length) {
-          tripHelper.checkTripsKms(traccarInstance, from, to, devices, { trips, route })
-        }
-
-        const dates = getDates(from, to)
-        for (const date of dates) {
-          if (userData.allWeek || !userData.weekDays || !userData.dayHours) {
-            const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
-            const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
-
-            const summary = await traccar.getSummary(traccarInstance, fromByDay, toByDay, devices)
-            summary.forEach(s => {
-              s.date = date
-            })
-            summaries = summaries.concat(summary)
-          }
-        }
-      } else {
-        summaries = summary
-      }
-
-      console.log('Summary:' + summaries.length)
-
       // Process report data
-      if (summaries.length || trips.length) {
-        allData.devices = allData.devices.concat(processDevices(from, to, devices, { summaries, trips, route }, userData))
+      if (summary.length || trips.length) {
+        allData.devices = allData.devices.concat(processDevices(from, to, devices, { summary, trips, route }, userData))
       }
       deviceCount += devices.length
     }
@@ -216,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)