fleetmap-reports 1.0.362 → 1.0.365

package/package.json

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

package/src/activity-report.js

@@ -7,7 +7,7 @@ const {headerFromUser, addTable} = require("./util/pdfDocument")
 const {getStyle} = require("./reportStyle")
 const {getUserPartner} = require("fleetmap-partners")
 const traccar = require("./util/traccar")
-const {isInsideTimetable, isPartialInsideTimetable} = require("./util/trips");
+const {isInsideTimetable, isPartialInsideTimetable, calculateTrip} = require("./util/trips");
 const tripHelper = require("./util/trips");
 
 const fileName = 'ActivityReport'
@@ -141,32 +141,31 @@ async function createActivityReportByDriver(from, to, userData, traccarInstance)
     return allData
 }
 
-
-function getActivityEnd(deviceTrips, deviceRoute) {
-    const route = deviceRoute.filter(p => p.attributes.ignition)
-    const tripEndDate = deviceTrips.length && deviceTrips[deviceTrips.length-1].endTime
-    if(route.length && new Date(route[route.length-1].fixTime).getTime() > new Date(tripEndDate).getTime()) {
-        return route[route.length-1].fixTime
-    }
-    return tripEndDate
-}
-
 function processDevices(from, to, devices, data, userData) {
     const devicesResult = []
 
     devices.forEach(d => {
+        const deviceTrips = data.trips.filter(t => t.deviceId === d.id)
+        const deviceRoute = data.route.filter(t => t.deviceId === d.id)
+
+        let uncompletedTripRoute = []
+        if(deviceRoute.length && deviceTrips.length && deviceRoute[deviceRoute.length-1].attributes.ignition) {
+            uncompletedTripRoute = deviceRoute.filter(p => p.attributes.ignition && new Date(p.fixTime).getTime() > new Date(deviceTrips[deviceTrips.length - 1].endTime).getTime())
+            if (uncompletedTripRoute.length) {
+                deviceTrips.push(calculateTrip(d, uncompletedTripRoute))
+            }
+        }
+
         const summary = []
         if(userData.groupByDay) {
-            const route = data.route.filter(t => t.deviceId === d.id)
-            const deviceTrips = data.trips.filter(t => t.deviceId === d.id
-                && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
+            const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
 
             const dates = getDates(from, to)
             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 = deviceTrips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay))
+                const tripsByDay = trips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay))
                 const distance = tripsByDay.reduce((a, b) => a + b.distance, 0)
 
                 if(!userData.allWeek && userData.weekDays && userData.dayHours) {
@@ -203,13 +202,10 @@ function processDevices(from, to, devices, data, userData) {
 
             if (summary.length) {
                 summary.forEach(s => {
-                    const deviceTrips = data.trips.filter(t => t.deviceId === d.id)
-                    const deviceRoute = data.route.filter(t => t.deviceId === d.id)
-
                     s.distance = deviceTrips.reduce((a, b) => a + b.distance, 0)
                     s.convertedSpentFuel = automaticReports.calculateSpentFuel(s.spentFuel, d)
                     s.startTime = deviceTrips.length && deviceTrips[0].startTime
-                    s.endTime = getActivityEnd(deviceTrips, deviceRoute)
+                    s.endTime = deviceTrips.length && deviceTrips[deviceTrips.length-1].endTime
                 })
             }
         }

package/src/index.test.js

@@ -48,6 +48,20 @@ describe('Test_Reports', function() {
         assert.equal(device.trips.length, 7)  // Total Trips
         assert.equal(device.totalDistance, 339204.53999999166)  // Total Kms
     }, 20000)
+    it('Trip 2 by device', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
+        userData.devices = userData.devices.filter(d => d.id === 11437)
+
+        const data = await report.tripReport(new Date(2022, 2, 4, 0, 0, 0, 0),
+            new Date(2022, 2, 4, 23, 59, 59, 0),
+            userData)
+
+        assert.equal(data.length, 1)
+        const device = data[0].devices.find(d => d.device.id===11437)
+        assert.equal(device.trips.length, 5)  // Total Trips
+        assert.equal(device.totalDistance, 207353.2299999997)  // Total Kms
+    }, 20000)
     it('Trip by device with time period ', async () => {
         const report = await getReports()
         const userData = await report.getUserData()
@@ -127,6 +141,17 @@ describe('Test_Reports', function() {
         const device = data[0].devices.find(d => d.device.id===22326)
         assert.equal(device.summary.distance, 1193284.3100000024)  // Total Kms
     },30000)
+    it('KmsReport by device', async () => {
+        const reports = await getReports()
+        const userData = await reports.getUserData()
+        userData.devices = userData.devices.filter(d => d.id === 22326)
+        const data = await reports.kmsReport(new Date(2021, 10, 1, 0, 0,0), new Date(2021, 10, 31, 23, 59, 59),
+            userData)
+        assert.equal(data.length, 1)
+        assert.equal(data.length, 1)
+        const device = data[0].devices.find(d => d.device.id===22326)
+        assert.equal(device.summary.distance, 1193284.3100000024)  // Total Kms
+    },30000)
     it('KmsReport byDevice groupByDay', async () => {
         const reports = await getReports()
         const userData = await reports.getUserData()
@@ -163,7 +188,7 @@ describe('Test_Reports', function() {
         assert.equal(data.length, 1)
         const device = data[0].devices.find(d => d.device.id===22326)
         assert.equal(device.summary[0].startOdometer, 122502742.59)
-        assert.equal(device.summary[0].distance, 1386519.1300000101)
+        assert.equal(device.summary[0].distance, 1386539.76000001)
         assert.equal(device.summary[0].startTime, '2022-01-01T13:35:47.000+0000')
         assert.equal(device.summary[0].endTime, '2022-01-30T14:08:13.000+0000')
     }, 40000)
@@ -177,7 +202,7 @@ describe('Test_Reports', function() {
         assert.equal(data.length, 1)
         const device = data[0].devices.find(d => d.device.id===11437)
         assert.equal(device.summary[0].endTime, '2022-03-05T23:59:55.000+0000')
-
+        assert.equal(device.summary[0].distance, 232925.12000000034)
     }, 40000)
     it('Activity byDevice groupByDay', async () => {
         const report = await getReports()

package/src/kms-report.js

@@ -8,7 +8,7 @@ const traccar = require("./util/traccar")
 const {getDates, convertFromUTC} = require("./util/utils")
 const trips = require("./util/trips")
 const drivers = require("./util/driver")
-const { isInsideTimetable, isPartialInsideTimetable} = require("./util/trips")
+const { isInsideTimetable, isPartialInsideTimetable, calculateTrip} = require("./util/trips")
 
 const fileName = 'KmsReport'
 
@@ -150,14 +150,23 @@ function processDevices(from, to, devices, data, userData) {
     const devicesResult = []
 
     for (const d of devices) {
-        const route = data.route.filter(t => t.deviceId === d.id)
-        const deviceTrips = data.trips.filter(t => t.deviceId === d.id
-            && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
+        const deviceRoute = data.route.filter(t => t.deviceId === d.id)
+        const deviceTrips = data.trips.filter(t => t.deviceId === d.id)
+
+        let uncompletedTripRoute = []
+        if(deviceRoute.length && deviceTrips.length && deviceRoute[deviceRoute.length-1].attributes.ignition) {
+            uncompletedTripRoute = deviceRoute.filter(p => p.attributes.ignition && new Date(p.fixTime).getTime() > new Date(deviceTrips[deviceTrips.length-1].endTime).getTime())
+            if(uncompletedTripRoute.length) {
+                deviceTrips.push(calculateTrip(d, uncompletedTripRoute))
+            }
+        }
 
-        if (deviceTrips.length > 0) {
+        const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
+
+        if (trips.length > 0) {
             if(userData.groupByDay) {
-                deviceTrips.forEach(t => t.tripDay = convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' 12:00 PM')
-                const groupedTrips = deviceTrips.reduce(
+                trips.forEach(t => t.tripDay = convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' 12:00 PM')
+                const groupedTrips = trips.reduce(
                     (entryMap, e) => entryMap.set(e.tripDay, [...entryMap.get(e.tripDay)||[], e]),
                     new Map()
                 )
@@ -195,7 +204,7 @@ function processDevices(from, to, devices, data, userData) {
                 devicesResult.push({
                     device: d,
                     summary: {
-                        distance: deviceTrips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0),
+                        distance: trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0),
                     }
                 })
             }

package/src/location-report.js

@@ -54,10 +54,7 @@ async function createLocationReport(from, to, userData, traccar) {
 
     const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
     let data = []
-    let i = 0
     for (const a of arrayOfArrays) {
-        console.log(`PROGRESS_PERC:${++i/arrayOfArrays.length*100}`)
-        console.log('LOADING_MESSAGE:' + a.map(d => d.name).join(', '))
         const response = await traccar.reports.reportsRouteGet(from, to, a.map(d => d.id))
         data = data.concat(response.data)
     }

package/src/trip-report.js

@@ -7,7 +7,7 @@ const {headerFromUser, addTable} = require("./util/pdfDocument")
 const {getStyle} = require("./reportStyle")
 const traccarHelper = require("./util/traccar")
 const trips = require("./util/trips");
-const {isInsideTimetable, addNearestPOIs, isPartialInsideTimetable} = require("./util/trips")
+const {isInsideTimetable, addNearestPOIs, isPartialInsideTimetable, calculateTrip} = require("./util/trips")
 
 const fileName = 'TripReport'
 
@@ -114,13 +114,23 @@ async function createTripReportByDriver(from, to, userData, traccar){
     return { drivers: processDrivers(from, to, userData, {trips: tripsData, route: routeData})}
 }
 
+
+
 function processDevices(from, to, devices, data, userData) {
     const devicesResult = []
 
-    devices.forEach((d, index) => {
-        const route = data.route.filter(t => t.deviceId === d.id)
-        const trips = data.trips.filter(t => t.deviceId === d.id
-            && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
+    devices.forEach(d => {
+        const deviceRoute = data.route.filter(t => t.deviceId === d.id)
+        const deviceTrips = data.trips.filter(t => t.deviceId === d.id)
+
+        if(deviceRoute.length && deviceTrips.length && deviceRoute[deviceRoute.length-1].attributes.ignition) {
+            const uncompletedTripRoute = deviceRoute.filter(p =>  p.attributes.ignition && new Date(p.fixTime).getTime() > new Date(deviceTrips[deviceTrips.length-1].endTime).getTime())
+            if(uncompletedTripRoute.length) {
+                deviceTrips.push(calculateTrip(d, uncompletedTripRoute))
+            }
+        }
+
+        const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
         const stops = data.stops.filter(s => s.deviceId === d.id)
 
         console.log('LOADING_MESSAGE:' + d.name)

package/src/util/trips.js

@@ -155,7 +155,38 @@ function updateTrip(t, route){
     t.averageSpeed = distance > 0 ? ((route.reduce((a, b) => a + b.speed, 0)) / route.length) : 0
 }
 
+function calculateTrip(device, route) {
+    const startPos = route[0]
+    const endPos = route[route.length-1]
+
+    return {
+        deviceId: device.id,
+        deviceName: device.name,
+        distance: route.reduce((a, b) => a + b.attributes.distance, 0),
+        averageSpeed: Math.round((route.map(p => p.speed).reduce((a, b) => a + b, 0)) / route.length),
+        maxSpeed: route.map(p => p.speed).reduce(function (a, b) { return Math.max(a, b) }),
+        spentFuel: 0,
+        startOdometer: startPos.attributes.odometer || startPos.attributes.totalDistance,
+        endOdometer: endPos.attributes.odometer || endPos.attributes.totalDistance,
+        startPositionId: startPos.id,
+        endPositionId: endPos.id,
+        startLat: startPos.latitude,
+        startLon: startPos.longitude,
+        startTime: startPos.fixTime,
+        startAddress: startPos.address,
+        endLat: endPos.latitude,
+        endLon: endPos.longitude,
+        endTime: endPos.fixTime,
+        endAddress: endPos.address,
+        endTimeIsOut: true,
+        duration: new Date(endPos.fixTime).getTime() - new Date(startPos.fixTime).getTime(),
+        driverUniqueId: null,
+        driverName: null
+    }
+}
+
 exports.checkTripsKms = checkTripsKms
 exports.isInsideTimetable = isInsideTimetable
 exports.isPartialInsideTimetable = isPartialInsideTimetable
 exports.addNearestPOIs = addNearestPOIs
+exports.calculateTrip = calculateTrip