fleetmap-reports 1.0.951 → 1.0.952

package/package.json

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

package/src/activity-report.js

@@ -17,6 +17,7 @@ const { devicesToProcess } = require('./util/device')
 const { getDriverData } = require('./util/driver')
 const { calculateConsumption } = require('./util/fuel')
 const axios = require('axios')
+const { getSummaryByDay } = require('./util/traccar')
 
 const fileName = 'ActivityReport'
 
@@ -101,6 +102,12 @@ async function createActivityReportByDevice (from, to, userData, traccarInstance
     const sliced = automaticReports.sliceArray(allDevices, 10)
     await executeServerSide(allData, sliced, from, to, userData, allDevices.length)
   } else {
+    let summaryByDay = []
+    if (userData.allWeek && userData.groupByDay) {
+      const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
+      summaryByDay = await getSummaryByDay(dates, userData, traccarInstance, allDevices, true)
+    }
+
     let deviceCount = 0
     const sliced = automaticReports.sliceArray(allDevices, 20)
     for (const devices of sliced) {
@@ -113,7 +120,7 @@ async function createActivityReportByDevice (from, to, userData, traccarInstance
 
       // Process report data
       if (summary.length || trips.length) {
-        allData.devices = allData.devices.concat(await processDevices(from, to, devices, { summary, trips, route }, userData, traccarInstance))
+        allData.devices = allData.devices.concat(await processDevices(from, to, devices, { summaryByDay, summary, trips, route }, userData, traccarInstance))
       }
       deviceCount += devices.length
     }
@@ -201,9 +208,12 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
             })
           }
         } else {
+          const summaryByDay = data.summaryByDay.find(a => a.date.getTime() === date.getTime())
+          const summaryByDevice = summaryByDay.summary.find(a => a.deviceId === d.id)
+
           const summaryCurrentDay = { date, deviceId: d.id }
           summaryCurrentDay.engineHours = tripsByDay.reduce((a, b) => a + b.duration, 0)
-          summaryCurrentDay.distance = distance
+          summaryCurrentDay.distance = summaryByDevice.distance
           summaryCurrentDay.averageSpeed = distance > 0 ? ((tripsByDay.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: routeByDay })
@@ -211,8 +221,8 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
           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 = tripsByDay.length ? tripsByDay[0].startOdometer : 0
-          summaryCurrentDay.endOdometer = tripsByDay.length ? tripsByDay[tripsByDay.length - 1].endOdometer : 0
+          summaryCurrentDay.startOdometer = summaryByDevice.startOdometer
+          summaryCurrentDay.endOdometer = summaryByDevice.endOdometer
           summaryCurrentDay.startTimeIsOut = tripsByDay.some(t => t.startTimeIsOut)
           summaryCurrentDay.endTimeIsOut = tripsByDay.some(t => t.endTimeIsOut)
           summary.push(summaryCurrentDay)

package/src/util/traccar.js

@@ -129,7 +129,7 @@ async function getAllInOne (
   }
 }
 
-async function getSummaryByDay (dates, userData, traccarInstance, allDevices) {
+async function getSummaryByDay (dates, userData, traccarInstance, allDevices, ignorePercentage = false) {
   const days = []
   let counter = 0
   for (const date of dates) {
@@ -143,7 +143,9 @@ async function getSummaryByDay (dates, userData, traccarInstance, allDevices) {
     } = await getAllInOne(traccarInstance, startDate, endDate, allDevices, false, false, false, true, 0, allDevices.length, allDevices.length, allDevices.length, undefined, true)
 
     counter = counter + 1
-    console.log(`PROGRESS_PERC:${counter / dates.length * 100}`)
+    if (!ignorePercentage) {
+      console.log(`PROGRESS_PERC:${counter / dates.length * 100}`)
+    }
     days.push({
       date,
       summary