fleetmap-reports 1.0.905 → 1.0.908

package/package.json

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

package/src/activity-report.js

@@ -12,7 +12,7 @@ const {
 const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const traccar = require('./util/traccar')
-const { isInsideTimetable, isPartialInsideTimetable, calculateTrip } = 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')
@@ -175,16 +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, routeByDay } = getDataByDay(date, trips, userData, deviceRoute)
 
-        const tripsByDay = trips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.startTime) < toByDay))
-        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({
@@ -201,7 +196,9 @@ function processDevices (from, to, devices, data, userData) {
               startTime: tripsByDay.length && tripsByDay[0].startTime,
               startAddress: tripsByDay.length && tripsByDay[0].startAddress,
               endTime: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endTime,
-              endAddress: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endAddress
+              endAddress: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endAddress,
+              startTimeIsOut: tripsByDay.some(t => t.startTimeIsOut),
+              endTimeIsOut: tripsByDay.some(t => t.endTimeIsOut)
             })
           }
         } else {
@@ -217,6 +214,8 @@ function processDevices (from, to, devices, data, userData) {
           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.startTimeIsOut = tripsByDay.some(t => t.startTimeIsOut)
+          summaryCurrentDay.endTimeIsOut = tripsByDay.some(t => t.endTimeIsOut)
           summary.push(summaryCurrentDay)
         }
       }

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

@@ -5,7 +5,6 @@ const minDistance = 0
 const minAvgSpeed = 0
 
 function checkTripsKms (traccarInstance, from, to, devices, data) {
-  console.log('checkTripsKms')
   const trips = data.trips.filter(t => t.distance === minDistance && t.averageSpeed > minAvgSpeed)
   if (trips.length > 0) {
     // Vehicles with imported positions. calculate trip distance with route positions
@@ -31,64 +30,85 @@ function checkTripsKms (traccarInstance, from, to, devices, data) {
   }
 }
 
-function isPartialInsideTimetable (t, userData, route) {
+function calculatePartialTrip (startDate, endDate, route, t) {
+  let isPartialInside = false
   const tripStart = new Date(t.startTime)
   const tripEnd = new Date(t.endTime)
 
-  let isPartialInside = false
+  if (startDate.getTime() > endDate.getTime()) {
+    if (tripStart.getTime() < endDate.getTime() &&
+        tripEnd.getTime() > endDate.getTime()) {
+      // Trip starts inside time period and ends outside time period
+      const routeInside = route.filter(p => new Date(p.fixTime).getTime() < new Date(endDate.toUTCString()).getTime() && new Date(p.fixTime).getTime() > new Date(t.startTime).getTime() && t.deviceId === p.deviceId)
+      updateTrip(t, routeInside)
+      t.endTime = endDate.toISOString().replace('Z', '+0000')
+      t.endTimeIsOut = true
+      isPartialInside = true
+    }
+
+    if (tripStart.getTime() < startDate.getTime() &&
+        new Date(t.endTime).getTime() > startDate.getTime()) {
+      // Trip starts outside time period and ends inside time period
+      const routeInside = route.filter(p => new Date(p.fixTime).getTime() > startDate.getTime() && new Date(p.fixTime).getTime() < new Date(t.endTime).getTime() && t.deviceId === p.deviceId)
+      updateTrip(t, routeInside)
+      t.startTime = startDate.toISOString().replace('Z', '+0000')
+      t.startTimeIsOut = true
+      isPartialInside = true
+    }
+  } else {
+    if (tripStart.getTime() < startDate.getTime() &&
+        tripEnd.getTime() > startDate.getTime()) {
+      // Trip starts outside time period and ends inside time period
+      const routeInside = route.filter(p => new Date(p.fixTime).getTime() > new Date(startDate.toUTCString()).getTime() && new Date(p.fixTime).getTime() < new Date(t.endTime).getTime() && t.deviceId === p.deviceId)
+      updateTrip(t, routeInside)
+      t.startTime = startDate.toISOString().replace('Z', '+0000')
+      t.startTimeIsOut = true
+      isPartialInside = true
+    }
+
+    if (tripStart.getTime() < endDate.getTime() &&
+        tripEnd.getTime() > endDate.getTime()) {
+      // Trip starts inside time period and ends outside time period
+      const routeInside = route.filter(p => new Date(p.fixTime).getTime() < endDate.getTime() && new Date(p.fixTime).getTime() > new Date(t.startTime).getTime() && t.deviceId === p.deviceId)
+      updateTrip(t, routeInside)
+      t.endTime = endDate.toISOString().replace('Z', '+0000')
+      t.endTimeIsOut = true
+      isPartialInside = true
+    }
+  }
+  return isPartialInside
+}
 
-  if (weekDaySelected(tripStart, userData.weekDays)) {
+function isPartialInsideTimetable (t, userData, route) {
+  if (weekDaySelected(new Date(t.startTime), userData.weekDays)) {
     const startDateLocal = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
     const endDateLocal = new Date(convertFromUTC(t.startTime, 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)
 
-    if (startDate.getTime() > endDate.getTime()) {
-      // Trip starts outside time period and ends inside time period
-      if (tripStart.getTime() < endDate.getTime() &&
-                tripEnd.getTime() > endDate.getTime()) {
-        // Trip starts inside time period and ends outside time period
-        const routeInside = route.filter(p => new Date(p.fixTime).getTime() < new Date(endDate.toUTCString()).getTime() && new Date(p.fixTime).getTime() > new Date(t.startTime).getTime() && t.deviceId === p.deviceId)
-        updateTrip(t, routeInside)
-        t.endTime = endDate.toISOString().replace('Z', '+0000')
-        t.endTimeIsOut = true
-        isPartialInside = true
-      }
-
-      if (tripStart.getTime() < startDate.getTime() &&
-                new Date(t.endTime).getTime() > startDate.getTime()) {
-        // Trip starts outside time period and ends inside time period
-        const routeInside = route.filter(p => new Date(p.fixTime).getTime() > startDate.getTime() && new Date(p.fixTime).getTime() < new Date(t.endTime).getTime() && t.deviceId === p.deviceId)
-        updateTrip(t, routeInside)
-        t.startTime = startDate.toISOString().replace('Z', '+0000')
-        t.startTimeIsOut = true
-        isPartialInside = true
-      }
-    } else {
-      if (tripStart.getTime() < startDate.getTime() &&
-                tripEnd.getTime() > startDate.getTime()) {
-        // Trip starts outside time period and ends inside time period
-        const routeInside = route.filter(p => new Date(p.fixTime).getTime() > new Date(startDate.toUTCString()).getTime() && new Date(p.fixTime).getTime() < new Date(t.endTime).getTime() && t.deviceId === p.deviceId)
-        updateTrip(t, routeInside)
-        t.startTime = startDate.toISOString().replace('Z', '+0000')
-        t.startTimeIsOut = true
-        isPartialInside = true
-      }
-
-      if (tripStart.getTime() < endDate.getTime() &&
-                tripEnd.getTime() > endDate.getTime()) {
-        // Trip starts inside time period and ends outside time period
-        const routeInside = route.filter(p => new Date(p.fixTime).getTime() < endDate.getTime() && new Date(p.fixTime).getTime() > new Date(t.startTime).getTime() && t.deviceId === p.deviceId)
-        updateTrip(t, routeInside)
-        t.endTime = endDate.toISOString().replace('Z', '+0000')
-        t.endTimeIsOut = true
-        isPartialInside = true
-      }
-    }
+    return calculatePartialTrip(startDate, endDate, route, t)
   }
 
-  return isPartialInside
+  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) {
@@ -97,7 +117,8 @@ function isInsideTimetable (t, userData) {
 
 function updateTrip (t, route) {
   if (!route[route.length - 1]) { return }
-  const distance = route[route.length - 1].attributes.totalDistance - route[0].attributes.totalDistance
+  route = route.filter(p => p.attributes.ignition)
+  const distance = calculateDistance(route, false) * 1000
   t.distance = distance
   t.duration = new Date(route[route.length - 1].fixTime).getTime() - new Date(route[0].fixTime).getTime()
   t.maxSpeed = route.reduce((a, b) => Math.max(a, b.speed), 0)
@@ -159,6 +180,8 @@ function calculateStopDuration (stop) {
 exports.checkTripsKms = checkTripsKms
 exports.isInsideTimetable = isInsideTimetable
 exports.isPartialInsideTimetable = isPartialInsideTimetable
+exports.getDataByDay = getDataByDay
+exports.calculatePartialTrip = calculatePartialTrip
 exports.calculateTrip = calculateTrip
 exports.getTripIdleTime = getTripIdleTime
 exports.calculateStopDuration = calculateStopDuration

package/src/util/utils.js

@@ -215,13 +215,13 @@ exports.convertFromLocal = (value, timezone) => {
 }
 
 function weekDaySelected (date, weekDays) {
-  return (date.getDay() === 0 && weekDays.sunday) ||
+  return !weekDays || ((date.getDay() === 0 && weekDays.sunday) ||
     (date.getDay() === 1 && weekDays.monday) ||
     (date.getDay() === 2 && weekDays.tuesday) ||
     (date.getDay() === 3 && weekDays.wednesday) ||
     (date.getDay() === 4 && weekDays.thursday) ||
     (date.getDay() === 5 && weekDays.friday) ||
-    (date.getDay() === 6 && weekDays.saturday)
+    (date.getDay() === 6 && weekDays.saturday))
 }
 
 exports.getImgFromUrl = getImgFromUrl