fleetmap-reports 1.0.946 → 1.0.948

package/package.json

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

package/src/kms-report.js

@@ -7,7 +7,7 @@ const {
 } = require('./util/pdfDocument')
 const { getUserPartner } = require('fleetmap-partners')
 const traccar = require('./util/traccar')
-const { getDates, getTranslations, isClientSide, executeServerSide } = require('./util/utils')
+const { getDates, getTranslations, isClientSide, executeServerSide, convertFromUTC, convertFromLocal } = require('./util/utils')
 const drivers = require('./util/driver')
 const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, checkTripsKms, getKms } = require('./util/trips')
 const traccarHelper = require('./util/traccar')
@@ -34,6 +34,30 @@ 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)
 
@@ -47,24 +71,50 @@ async function createKmsReportByDevice (from, to, userData, traccarInstance) {
     const sliced = automaticReports.sliceArray(allDevices, 1)
     await executeServerSide('kms-report', allData, sliced, from, to, userData, allDevices.length)
   } else {
-    let deviceCount = 0
-    const sliced = automaticReports.sliceArray(allDevices, 20)
-    for (const devices of sliced) {
-      const needRoute = !userData.allWeek
-      const {
-        trips,
-        route
-      } = await traccar.getAllInOne(traccarInstance, from, to, devices, needRoute, true, false, false, deviceCount, allDevices.length, 10, 2)
-
-      // Process report data
-      if (trips.length) {
-        checkTripsKms(traccarInstance, from, to, devices, { trips, route })
-        allData.devices = allData.devices.concat(await processDevices(from, to, devices, {
+    if (userData.allWeek && userData.groupByDay) {
+      const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
+      const summary = await getSummaryByDay(dates, userData, traccarInstance, allDevices)
+      for (const device of allDevices) {
+        const days = []
+        dates.forEach(date => {
+          const summaryByDay = summary.find(a => a.date === date).summary
+          const summaryByDevice = summaryByDay.find(a => a.deviceId === device.id)
+          days.push({
+            date,
+            kms: summaryByDevice.distance,
+            startOdometer: summaryByDevice.startOdometer,
+            endOdometer: summaryByDevice.endOdometer
+          })
+        })
+        const daysWithOdometer = days.filter(a => a.startOdometer > 0)
+        allData.devices.push({
+          device,
+          startOdometer: daysWithOdometer.length > 0 ? daysWithOdometer[0].startOdometer : 0,
+          endOdometer: daysWithOdometer.length > 0 ? daysWithOdometer[daysWithOdometer.length - 1].endOdometer : 0,
+          days
+        })
+      }
+    } else {
+      let deviceCount = 0
+      const sliced = automaticReports.sliceArray(allDevices,
+        20)
+      for (const devices of sliced) {
+        const needRoute = !userData.allWeek
+        const {
           trips,
           route
-        }, userData, traccarInstance))
+        } = await traccar.getAllInOne(traccarInstance, from, to, devices, needRoute, true, false, false, deviceCount, allDevices.length, 10, 2)
+
+        // Process report data
+        if (trips.length) {
+          checkTripsKms(traccarInstance, from, to, devices, { trips, route })
+          allData.devices = allData.devices.concat(await processDevices(from, to, devices, {
+            trips,
+            route
+          }, userData, traccarInstance))
+        }
+        deviceCount += devices.length
       }
-      deviceCount += devices.length
     }
   }
 

package/src/util/trips.js

@@ -111,32 +111,25 @@ function isPartialInsideTimetable (t, userData, route) {
 }
 
 async function getDataByDay (device, date, data, userData, traccarInstance) {
-  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 convertedFromByDay = isClientSide() ? fromByDay : convertFromLocal(fromByDay, userData.user.attributes.timezone)
-  const convertedToByDay = isClientSide() ? toByDay : convertFromLocal(toByDay, userData.user.attributes.timezone)
-  console.log(fromByDay, toByDay)
-  const tripsByDay = data.trips.filter(t => new Date(t.endTime) > convertedFromByDay && new Date(t.startTime) < convertedToByDay).map(t => {
-    return { ...t }
-  })
-  console.log(date, tripsByDay.length)
   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 tripsByDay = data.trips.filter(t => new Date(t.endTime) > startDate && new Date(t.startTime) < endDate).map(t => {
+    return { ...t }
+  })
+
   for (const t of tripsByDay) {
     await calculatePartialTrip(device, startDate, endDate, data.route, t, traccarInstance)
   }
 
-  const routeByDay = data.route ? data.route.filter(p => (new Date(p.fixTime) > fromByDay && new Date(p.fixTime) < toByDay)) : []
+  const routeByDay = data.route ? data.route.filter(p => (new Date(p.fixTime) > startDate && new Date(p.fixTime) < endDate)) : []
   return { tripsByDay, routeByDay }
 }
 
 function getKms (trips) {
   const odometerKms = trips.length > 0 ? trips[trips.length - 1].endOdometer - trips[0].startOdometer : 0
-  if (trips.length > 0) {
-    console.log(trips[trips.length - 1].endOdometer, trips[0].startOdometer, odometerKms)
-  }
   return odometerKms > 0 ? odometerKms : trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
 }