fleetmap-reports 2.0.144 → 2.0.145

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "2.0.144",
+  "version": "2.0.145",
   "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, getDataByDay, getKms } = require('./util/trips')
+const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, getKms, calculateMultiDayTrips } = require('./util/trips')
 const { devicesToProcess } = require('./util/device')
 const { getDriverData } = require('./util/driver')
 const { calculateConsumption } = require('./util/fuel')
@@ -298,6 +298,8 @@ function processDrivers (from, to, drivers, driversData, userData) {
           const tripsByDay = trips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay) &&
                     (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
 
+          calculateMultiDayTrips(trips, route, tripsByDay, fromByDay, toByDay, userData.devices)
+
           driverData.summary.push({
             date,
             distance: tripsByDay.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0),

package/src/kms-report.js

@@ -11,7 +11,7 @@ const { getDates, getTranslations, isClientSide, executeServerSide } = require('
 const driversUtil = require('./util/driver')
 const {
   isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, getKms,
-  getTripTotalKms
+  getTripTotalKms, calculateMultiDayTrips
 } = require('./util/trips')
 const { devicesToProcess } = require('./util/device')
 const { getDriverData, reportByDriver } = require('./util/driver')
@@ -183,7 +183,7 @@ async function processDrivers (from, to, userData, data) {
   const driversResult = []
 
   for (const d of userData.drivers) {
-    const { trips } = await getDriverData(d, data, userData)
+    const { trips, route } = await getDriverData(d, data, userData)
 
     if (trips.length > 0) {
       const driverData = {
@@ -198,6 +198,8 @@ async function processDrivers (from, to, userData, data) {
 
           const tripsByDay = trips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay))
 
+          calculateMultiDayTrips(trips, route, tripsByDay, fromByDay, toByDay, userData.devices)
+
           driverData.days.push({
             date,
             kms: tripsByDay.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)

package/src/util/trips.js

@@ -152,6 +152,7 @@ function getUncompletedTrip (device, deviceRoute, deviceTrips) {
 }
 
 function calculateTrip (device, route) {
+  console.log('route', route.length)
   const startPos = route[0]
   const endPos = route[route.length - 1]
 
@@ -235,6 +236,22 @@ function getTripTotalKms (trip, stop, route) {
   return distance / 1000
 }
 
+function calculateMultiDayTrips (trips, route, tripsByDay, fromByDay, toByDay, devices) {
+  const startsOutside = trips.filter(t => (new Date(t.startTime) < fromByDay && new Date(t.endTime) > fromByDay))
+  if (startsOutside.length > 0) {
+    tripsByDay.push(calculateTrip(devices.find(d => d.id === startsOutside[0].deviceId),
+      route.filter(p => new Date(p.fixTime) >= fromByDay &&
+            new Date(p.fixTime) <= new Date(startsOutside[0].endTime))))
+  }
+
+  const endsOutside = trips.filter(t => (new Date(t.startTime) < toByDay && new Date(t.endTime) > toByDay))
+  if (endsOutside.length > 0) {
+    tripsByDay.push(calculateTrip(devices.find(d => d.id === endsOutside[0].deviceId),
+      route.filter(p => new Date(p.fixTime) >= new Date(endsOutside[0].startTime) &&
+            new Date(p.fixTime) <= toByDay)))
+  }
+}
+
 exports.isInsideTimetable = isInsideTimetable
 exports.isPartialInsideTimetable = isPartialInsideTimetable
 exports.getDataByDay = getDataByDay
@@ -245,3 +262,4 @@ exports.getTripIdleTime = getTripIdleTime
 exports.calculateStopDuration = calculateStopDuration
 exports.getUncompletedTrip = getUncompletedTrip
 exports.getTripTotalKms = getTripTotalKms
+exports.calculateMultiDayTrips = calculateMultiDayTrips