fleetmap-reports 1.0.907 → 1.0.908

package/package.json

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

package/src/activity-report.js

@@ -1,7 +1,7 @@
 const automaticReports = require('./automaticReports')
 const {
   convertMS, getDates, getTranslations, weekDaySelected, convertToLocaleString, isClientSide,
-  getLanguage, convertFromUTC, convertFromLocal
+  getLanguage
 } = require('./util/utils')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
@@ -12,7 +12,7 @@ const {
 const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const traccar = require('./util/traccar')
-const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, calculatePartialTrip } = require('./util/trips')
+const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay } = require('./util/trips')
 const { devicesToProcess } = require('./util/device')
 const { getDriverData } = require('./util/driver')
 const { calculateConsumption } = require('./util/fuel')
@@ -157,14 +157,6 @@ async function createActivityReportByDriver (from, to, userData, traccarInstance
   return allData
 }
 
-function checkTripsPartialInsideDate (date, userData, tripsByDay, deviceRoute) {
-  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)
-  tripsByDay.forEach(t => calculatePartialTrip(startDate, endDate, deviceRoute, t))
-}
-
 function processDevices (from, to, devices, data, userData) {
   const devicesResult = []
 
@@ -183,18 +175,11 @@ function processDevices (from, to, devices, data, userData) {
     const summary = []
     if (userData.groupByDay) {
       const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
-
       const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
       for (const date of dates) {
-        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 tripsByDay = trips.filter(t => new Date(t.endTime) > fromByDay && new Date(t.startTime) < toByDay).map(t => { return { ...t } })
+        const { tripsByDay, routeByDay } = getDataByDay(date, trips, userData, deviceRoute)
 
-        checkTripsPartialInsideDate(date, userData, tripsByDay, deviceRoute)
-
-        const routeByDay = deviceRoute.filter(p => (new Date(p.fixTime) > fromByDay && new Date(p.fixTime) < toByDay))
         const distance = tripsByDay.reduce((a, b) => a + b.distance, 0)
-
         if (!userData.allWeek && userData.weekDays && userData.dayHours) {
           if (weekDaySelected(date, userData.weekDays)) {
             summary.push({

package/src/kms-report.js

@@ -7,10 +7,10 @@ const {
 } = require('./util/pdfDocument')
 const { getUserPartner } = require('fleetmap-partners')
 const traccar = require('./util/traccar')
-const { getDates, convertFromUTC, getTranslations } = require('./util/utils')
+const { getDates, getTranslations } = require('./util/utils')
 const trips = require('./util/trips')
 const drivers = require('./util/driver')
-const { isInsideTimetable, isPartialInsideTimetable, calculateTrip } = require('./util/trips')
+const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay } = require('./util/trips')
 const traccarHelper = require('./util/traccar')
 const { devicesToProcess } = require('./util/device')
 const { getDriverData } = require('./util/driver')
@@ -43,7 +43,7 @@ async function createKmsReportByDevice (from, to, userData, traccarInstance) {
     to
   }
 
-  const needRoute = !userData.allWeek
+  const needRoute = !userData.allWeek || userData.groupByDay
   const allInOne = await traccarHelper.getAllInOne(traccarInstance, from, to, devices, needRoute, true, false, false, 0, devices.length, 20)
   const tripsData = allInOne.trips
   const routeData = allInOne.route
@@ -161,41 +161,18 @@ function processDevices (from, to, devices, data, userData) {
 
     if (userData.groupByDay) {
       if (trips.length > 0) {
-        trips.forEach(t => {
-          const tripDay = convertFromUTC(t.startTime, userData.user.attributes.timezone)
-          tripDay.setHours(12, 0, 0)
-          t.tripDay = tripDay.toISOString()
-        })
-        const groupedTrips = trips.reduce(
-          (entryMap, e) => entryMap.set(e.tripDay, [...entryMap.get(e.tripDay) || [], e]),
-          new Map()
-        )
-
-        const allDates = getDates(from, to)
-
         const days = []
-        let keys = Array.from(groupedTrips.keys())
-        allDates.forEach(d => {
-          d.setHours(12, 0, 0)
-          const day = d.toISOString()
-          if (!keys.includes(day)) {
-            groupedTrips.set(day, [])
-          }
-        })
-
-        keys = Array.from(groupedTrips.keys())
-        keys.sort((a, b) => new Date(a).getTime() - new Date(b).getTime())
-        keys.forEach(key => {
-          const currentDate = new Date(key)
-          const dayTrips = groupedTrips.get(key)
+        const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
+        const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
+        for (const date of dates) {
+          const { tripsByDay } = getDataByDay(date, trips, userData, deviceRoute)
           const day = {
-            date: currentDate,
-            kms: 0
+            date,
+            kms: tripsByDay.reduce((a, b) => a + b.distance, 0)
           }
-          day.kms = dayTrips.reduce((a, b) => a + b.distance, 0)
-
           days.push(day)
-        })
+        }
+
         devicesResult.push({
           device: d,
           days

package/src/util/trips.js

@@ -93,6 +93,24 @@ function isPartialInsideTimetable (t, userData, route) {
   return false
 }
 
+function getDataByDay (date, trips, userData, deviceRoute) {
+  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 tripsByDay = trips.filter(t => new Date(t.endTime) > fromByDay && new Date(t.startTime) < toByDay).map(t => {
+    return { ...t }
+  })
+
+  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)
+  tripsByDay.forEach(t => calculatePartialTrip(startDate, endDate, deviceRoute, t))
+  console.log(date, tripsByDay)
+
+  const routeByDay = deviceRoute.filter(p => (new Date(p.fixTime) > fromByDay && new Date(p.fixTime) < toByDay))
+  return { tripsByDay, routeByDay }
+}
+
 function isInsideTimetable (t, userData) {
   return isInside(t.startTime, t.endTime, userData)
 }
@@ -162,6 +180,7 @@ function calculateStopDuration (stop) {
 exports.checkTripsKms = checkTripsKms
 exports.isInsideTimetable = isInsideTimetable
 exports.isPartialInsideTimetable = isPartialInsideTimetable
+exports.getDataByDay = getDataByDay
 exports.calculatePartialTrip = calculatePartialTrip
 exports.calculateTrip = calculateTrip
 exports.getTripIdleTime = getTripIdleTime