fleetmap-reports 2.0.122 → 2.0.123

package/package.json

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

package/src/fuel-consumption-report.js

@@ -24,7 +24,7 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
 
   const devices = devicesToProcess(userData)
 
-  const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, true, false, false)
+  const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, true, true, false)
   const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
   const summary = await getSummaryByDay(dates, userData, traccar, devices, true, from, to)
 
@@ -40,6 +40,7 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
   allData.totalDevices = 0
 
   for (const d of devices) {
+    const stops = allInOne.stops.filter(t => t.deviceId === d.id)
     const trips = allInOne.trips.filter(t => t.deviceId === d.id)
     const route = allInOne.route.filter(r => r.deviceId === d.id)
     const deviceFuelServices = fuelServicesData.filter(f => Number.parseInt(d.attributes.odooId) === f.vehicle_id[0])
@@ -48,12 +49,12 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
       const refuelingPositions = await refuelingReport.calculateRefuelingPositions(userData, d, { route, trips, fuelServices: deviceFuelServices })
       const days = []
       for (const date of dates) {
-        const { tripsByDay, routeByDay, refuelingPositionsByDay } = await getDataByDay(d, date, { trips, route, refuelingPositions }, userData, traccar)
+        const { tripsByDay, stopsByDay, routeByDay, refuelingPositionsByDay } = await getDataByDay(d, date, { trips, stops, route, refuelingPositions }, userData, traccar)
         const summaryByDay = summary.find(a => a.date === date).summary
         const summaryByDevice = summaryByDay.find(a => a.deviceId === d.id)
 
         const distance = summaryByDevice.distance
-        const spentFuel = calculateConsumption(d, { trips: tripsByDay, stops: [], route: routeByDay, summary: summaryByDevice })
+        const spentFuel = calculateConsumption(d, { trips: tripsByDay, stops: stopsByDay, route: routeByDay, summary: summaryByDevice })
 
         const dataRow = {
           date,

package/src/util/trips.js

@@ -97,6 +97,12 @@ async function getDataByDay (device, date, data, userData, traccarInstance) {
     }
   }
 
+  const stopsByDay = []
+  if (data.stops) {
+    const filteredStops = data.stops.filter(t => new Date(t.endTime) > startDate && new Date(t.startTime) < endDate)
+    stopsByDay.push(...filteredStops.map(t => { return { ...t } }))
+  }
+
   const routeByDay = data.route ? data.route.filter(p => (new Date(p.fixTime) > startDate && new Date(p.fixTime) < endDate)) : []
 
   const refuelingPositionsByDay = data.refuelingPositions ? data.refuelingPositions.filter(p => (new Date(p.date) > startDate && new Date(p.date) < endDate)) : []
@@ -106,7 +112,7 @@ async function getDataByDay (device, date, data, userData, traccarInstance) {
       (!z.outTime || (new Date(z.outTime.fixTime) > startDate)))
     : []
 
-  return { tripsByDay, routeByDay, refuelingPositionsByDay, zoneInOutDayData }
+  return { tripsByDay, stopsByDay, routeByDay, refuelingPositionsByDay, zoneInOutDayData }
 }
 
 function isValidAvgSpeed (kms, startTime, endTime) {