fleetmap-reports 1.0.950 → 1.0.951

package/package.json

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

package/src/fuelconsumption-report.js

@@ -2,12 +2,14 @@ const refuelingReport = require('./refueling-report')
 const traccarHelper = require('./util/traccar')
 const odoo = require('./util/odoo')
 const { devicesToProcess } = require('./util/device')
-const { getTranslations, convertToLocaleString, getLanguage, convertMS, formatNumber } = require('./util/utils')
+const { getTranslations, convertToLocaleString, getLanguage, convertMS, formatNumber, getDates } = require('./util/utils')
 const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const { addTable, headerFromUser } = require('./util/pdfDocument')
 const jsPDF = require('jspdf')
 const { useOdooFuelData, calculateConsumption } = require('./util/fuel')
+const { getSummaryByDay } = require('./util/traccar')
+const { getDataByDay } = require('./util/trips')
 
 async function createFuelConsumptionReport (from, to, userData, traccar) {
   console.log('Create FuelConsumption Report')
@@ -22,7 +24,9 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
 
   const devices = devicesToProcess(userData)
 
-  const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, true, true, false)
+  const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, true, false, false)
+  const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
+  const summary = await getSummaryByDay(dates, userData, traccar, devices)
 
   const fuelServicesData = []
   if (devices.some(d => d.attributes.odooId)) {
@@ -38,56 +42,33 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
   for (const d of devices) {
     const trips = allInOne.trips.filter(t => t.deviceId === d.id)
     const route = allInOne.route.filter(r => r.deviceId === d.id)
-    const stops = allInOne.stops.filter(s => s.deviceId === d.id)
     const deviceFuelServices = fuelServicesData.filter(f => Number.parseInt(d.attributes.odooId) === f.vehicle_id[0])
 
     if (trips.length > 0) {
       const refuelingPositions = await refuelingReport.calculateRefuelingPositions(userData, d, { route, trips, fuelServices: deviceFuelServices })
-      const groupedRefuelingsByDay = refuelingPositions.reduce(
-        (entryMap, e) => entryMap.set(e.date.substring(0, 10), [...entryMap.get(e.date.substring(0, 10)) || [], e]),
-        new Map()
-      )
-
-      trips.forEach(t => { t.startDate = t.startTime.substring(0, 10) })
-      const groupedTripsByDay = trips.reduce(
-        (entryMap, e) => entryMap.set(e.startDate, [...entryMap.get(e.startDate) || [], e]),
-        new Map()
-      )
-
-      stops.forEach(s => { s.startDate = s.startTime.substring(0, 10) })
-      const groupedStopsByDay = stops.reduce(
-        (entryMap, e) => entryMap.set(e.startDate, [...entryMap.get(e.startDate) || [], e]),
-        new Map()
-      )
-
-      route.forEach(p => { p.startDate = p.fixTime.substring(0, 10) })
-      const groupedRouteByDay = route.reduce(
-        (entryMap, e) => entryMap.set(e.startDate, [...entryMap.get(e.startDate) || [], e]),
-        new Map()
-      )
-
       const days = []
-      const keys = Array.from(groupedTripsByDay.keys())
+      for (const date of dates) {
+        const { tripsByDay, routeByDay, refuelingPositionsByDay } = await getDataByDay(d, date, { trips, route, refuelingPositions }, userData, traccar)
+        const summaryByDay = summary.find(a => a.date === date).summary
+        const summaryByDevice = summaryByDay.find(a => a.deviceId === d.id)
 
-      keys.forEach(day => {
-        const odooAvgConsumption = useOdooFuelData(d, route) ? getOdooAvgConsumption(day, refuelingPositions, trips) : 0
-        const dayTrips = groupedTripsByDay.get(day)
-        const dayRefueling = groupedRefuelingsByDay.get(day)
-        const distance = dayTrips.reduce((a, b) => a + b.distance, 0)
-        const spentFuel = calculateConsumption(d, { trips: dayTrips, stops: groupedStopsByDay.get(day), route: groupedRouteByDay.get(day) }, odooAvgConsumption)
+        const odooAvgConsumption = useOdooFuelData(d, route) ? getOdooAvgConsumption(date, refuelingPositions, trips) : 0
+        const distance = summaryByDevice.distance
+        const spentFuel = calculateConsumption(d, { trips: tripsByDay, stops: [], route: routeByDay }, odooAvgConsumption)
 
         const dataRow = {
-          date: day,
+          date,
           distance,
           spentFuel,
           avgConsumption: useOdooFuelData(d, route) ? odooAvgConsumption : getCanAvgConsumption(distance, spentFuel),
-          endOdometer: dayTrips.slice(-1)[0].endOdometer,
-          duration: dayTrips.reduce((a, b) => a + b.duration, 0),
-          refueling: (dayRefueling && dayRefueling.length > 0) ? dayRefueling.reduce((a, b) => a + b.diff, 0) : 0
+          startOdometer: summaryByDevice.startOdometer,
+          endOdometer: summaryByDevice.endOdometer,
+          duration: tripsByDay.reduce((a, b) => a + b.duration, 0),
+          refueling: (refuelingPositionsByDay && refuelingPositionsByDay.length > 0) ? refuelingPositionsByDay.reduce((a, b) => a + b.diff, 0) : 0
         }
 
         days.push(dataRow)
-      })
+      }
 
       if (days.length > 0) {
         allData.devices.push({

package/src/kms-report.js

@@ -7,13 +7,14 @@ const {
 } = require('./util/pdfDocument')
 const { getUserPartner } = require('fleetmap-partners')
 const traccar = require('./util/traccar')
-const { getDates, getTranslations, isClientSide, executeServerSide, convertFromUTC, convertFromLocal } = require('./util/utils')
+const { getDates, getTranslations, isClientSide, executeServerSide } = require('./util/utils')
 const drivers = require('./util/driver')
 const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, checkTripsKms, getKms } = require('./util/trips')
 const traccarHelper = require('./util/traccar')
 const { devicesToProcess } = require('./util/device')
 const { getDriverData } = require('./util/driver')
 const automaticReports = require('./automaticReports')
+const { getSummaryByDay } = require('./util/traccar')
 
 const fileName = 'KmsReport'
 
@@ -34,30 +35,6 @@ async function createKmsReport (from, to, userData, traccarInstance) {
   return reportData
 }
 
-async function getSummaryByDay (dates, userData, traccarInstance, allDevices) {
-  const days = []
-  let counter = 0
-  for (const date of dates) {
-    const startDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
-    const endDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
-    const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
-    const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
-
-    const {
-      summary
-    } = await traccar.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}`)
-    days.push({
-      date,
-      summary
-    })
-  }
-
-  return days
-}
-
 async function createKmsReportByDevice (from, to, userData, traccarInstance) {
   const allDevices = devicesToProcess(userData)
 

package/src/util/traccar.js

@@ -1,4 +1,5 @@
 const automaticReports = require('../automaticReports')
+const { convertFromUTC, isClientSide, convertFromLocal } = require('./utils')
 
 async function getRoute (traccar, from, to, devices) {
   const devicesToSlice = devices.slice()
@@ -128,9 +129,34 @@ async function getAllInOne (
   }
 }
 
+async function getSummaryByDay (dates, userData, traccarInstance, allDevices) {
+  const days = []
+  let counter = 0
+  for (const date of dates) {
+    const startDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
+    const endDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
+    const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
+    const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
+
+    const {
+      summary
+    } = 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}`)
+    days.push({
+      date,
+      summary
+    })
+  }
+
+  return days
+}
+
 exports.getRoute = getRoute
 exports.getTrips = getTrips
 exports.getStops = getStops
 exports.getEvents = getEvents
 exports.getSummary = getSummary
+exports.getSummaryByDay = getSummaryByDay
 exports.getAllInOne = getAllInOne

package/src/util/trips.js

@@ -125,7 +125,10 @@ async function getDataByDay (device, date, data, userData, traccarInstance) {
   }
 
   const routeByDay = data.route ? data.route.filter(p => (new Date(p.fixTime) > startDate && new Date(p.fixTime) < endDate)) : []
-  return { tripsByDay, routeByDay }
+
+  const refuelingPositionsByDay = data.refuelingPositions ? data.refuelingPositions.filter(p => (new Date(p.date) > startDate && new Date(p.date) < endDate)) : []
+
+  return { tripsByDay, routeByDay, refuelingPositionsByDay }
 }
 
 function getKms (trips) {