fleetmap-reports 1.0.339 → 1.0.344

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.339",
+  "version": "1.0.344",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -28,6 +28,7 @@
   },
   "devDependencies": {
     "axios-debug-log": "^0.8.4",
+    "jest": "^27.5.0",
     "mocha": "^9.0.3",
     "webpack": "^5.24.3",
     "webpack-cli": "^4.5.0"

package/src/activity-report.js

@@ -9,7 +9,7 @@ const {getStyle} = require("./reportStyle")
 const {getUserPartner} = require("fleetmap-partners")
 const traccar = require("./util/traccar")
 const {isInsideTimetable, isPartialInsideTimetable} = require("./util/trips");
-const trips = require("./util/trips");
+const tripHelper = require("./util/trips");
 
 const fileName = 'ActivityReport'
 
@@ -58,7 +58,7 @@ async function createActivityReportByGroup(from, to, userData, traccarInstance){
             if (summaries.length > 0) {
 
                 console.log('Summary:' + summaries.length)
-                groupData.devices = processDevices(from, to, devices, {summaries: summaries, trips: trips})
+                groupData.devices = processDevices(from, to, devices, {summaries: summaries, trips: trips}, userData)
 
                 reportData.push(groupData)
             }
@@ -86,16 +86,13 @@ async function createActivityReportByDevice(from, to, userData, traccarInstance)
     devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
     let summaries = []
-    let routeData = []
-    const allInOne  = await traccar.getAllInOne(traccarInstance, from, to, devicesToProcess, userData.groupByDay && !userData.allWeek, true, false, !userData.groupByDay)
-    const tripsData = allInOne.trips
+    const {trips, route, summary}  = await traccar.getAllInOne(traccarInstance, from, to, devicesToProcess, userData.groupByDay && !userData.allWeek, true, false, !userData.groupByDay)
 
     if(userData.groupByDay) {
-        routeData = allInOne.route
-        console.log('trips:' + tripsData.length)
+        console.log('trips:' + trips.length)
 
-        if (tripsData.length > 0) {
-            trips.checkTripsKms(traccarInstance, from, to, devicesToProcess, {trips: tripsData, route: routeData})
+        if (trips.length) {
+            tripHelper.checkTripsKms(traccarInstance, from, to, devicesToProcess, {trips, route})
         }
 
         const dates = getDates(from, to)
@@ -110,14 +107,14 @@ async function createActivityReportByDevice(from, to, userData, traccarInstance)
             }
         }
     } else {
-        summaries = allInOne.summary
+        summaries = summary
     }
 
     console.log('Summary:' + summaries.length)
 
     //Process report data
-    if (summaries.length || tripsData.length) {
-        allData.devices = processDevices(from, to, devicesToProcess, {summaries: summaries, trips: tripsData, route: routeData})
+    if (summaries.length || trips.length) {
+        allData.devices = processDevices(from, to, devicesToProcess, {summaries: summaries, trips, route}, userData)
     }
 
     return allData
@@ -175,20 +172,21 @@ function processDevices(from, to, devices, data, userData) {
                             return a > b.maxSpeed ? a : b.maxSpeed
                         }, 0),
                         endOdometer: 0,
-                        startOdometer: 0
+                        startOdometer: 0,
+                        startTime: tripsByDay.length && tripsByDay[0].startTime,
+                        endTime: tripsByDay.length && tripsByDay[tripsByDay.length-1].endTime
                     })
                 } else {
-                    const summaryCurrentDay = data.summaries.filter(s => {
-                        console.log(s.date.getTime(), date.getTime(), s.date.getTime() === date.getTime())
+                    const summaryCurrentDay = data.summaries.find(s => {
                         return  s.deviceId === d.id && s.date.getTime() === date.getTime()})
 
-                    if (summaryCurrentDay.length) {
-                        summaryCurrentDay.forEach(s => {
-                            s.distance = distance
-                            s.convertedSpentFuel = automaticReports.calculateSpentFuel(s.spentFuel, d)
-                        })
+                    if (summaryCurrentDay) {
+                        summaryCurrentDay.distance = distance
+                        summaryCurrentDay.convertedSpentFuel = automaticReports.calculateSpentFuel(summaryCurrentDay.spentFuel, d)
+                        summaryCurrentDay.startTime = tripsByDay.length && tripsByDay[0].startTime
+                        summaryCurrentDay.endTime = tripsByDay.length && tripsByDay[tripsByDay.length-1].endTime
 
-                        summary.push(...summaryCurrentDay)
+                        summary.push(summaryCurrentDay)
                     }
                 }
             }
@@ -197,8 +195,11 @@ function processDevices(from, to, devices, data, userData) {
 
             if (summary.length) {
                 summary.forEach(s => {
-                    s.distance = data.trips.filter(t => t.deviceId === d.id).reduce((a, b) => a + b.distance, 0)
+                    const deviceTrips = data.trips.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 = deviceTrips.length && deviceTrips[deviceTrips.length-1].endTime
                 })
             }
         }
@@ -238,7 +239,9 @@ function processDrivers(from, to, drivers, data, userData) {
                         distance: tripsByDay.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0),
                         engineHours: tripsByDay.reduce((a, b) => a + b.duration, 0),
                         maxSpeed: tripsByDay.reduce((a, b) => Math.max(a, b.maxSpeed), 0),
-                        averageSpeed: tripsByDay.length > 0 ? Math.round(tripsByDay.reduce((a, b) => a + b.averageSpeed, 0) / tripsByDay.length) : 0,
+                        averageSpeed: tripsByDay.length ? Math.round(tripsByDay.reduce((a, b) => a + b.averageSpeed, 0) / tripsByDay.length) : 0,
+                        startTime: tripsByDay.length && tripsByDay[0].startTime,
+                        endTime: tripsByDay.length && tripsByDay[tripsByDay.length-1].endTime
                     })
                 }
             } else {
@@ -247,6 +250,8 @@ function processDrivers(from, to, drivers, data, userData) {
                     engineHours: trips.reduce((a, b) => a + b.duration, 0),
                     maxSpeed: trips.reduce((a, b) => Math.max(a, b.maxSpeed), 0),
                     averageSpeed: Math.round(trips.reduce((a, b) => a + b.averageSpeed, 0) / trips.length),
+                    startTime: trips.length && trips[0].startTime,
+                    endTime: trips.length && trips[trips.length-1].endTime
                 })
             }
             driversResult.push(driverData)

package/src/index.test.js

@@ -1,24 +1,184 @@
 const {getReports} = require("./tests");
+const assert = require("assert");
 
-describe('speedingReport', function() {
-    this.timeout(500000)
-    it('test speeding', async () => {
+describe('Test_Reports', function() {
+    it('Speeding by device', async () => {
         const report = await getReports()
         const userData = await report.getUserData()
 
-        await report.speedingReport(new Date(2021, 2, 30, 0, 0, 0, 0),
-            new Date(2021, 2, 30, 23, 59, 59, 0),
+        const data = await report.speedingReport(new Date(2021, 11, 6, 0, 0, 0, 0),
+            new Date(2021, 11, 8, 23, 59, 59, 0),
             userData)
-    })
-    it('test kmsReport by day', async () => {
+        assert.equal(data.length, 1)
+        const device = data[0].devices.find(d => d.device.id===22326)
+        const totalDistance = device.alerts.reduce((a, b) => a + b.distance, 0)
+        const totalEventTime = device.alerts.reduce((a, b) => a + b.eventTime, 0)
+        assert.equal(device.alerts.length, 15)  // Total Alerts
+        assert.equal(totalDistance, 19.605972526552154)  // Total Kms
+        assert.equal(totalEventTime, 562000)  // Total Duration
+    }, 20000)
+    it('Speeding by device with custom speed', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
+
+        userData.useVehicleSpeedLimit = false
+        userData.customSpeed = 100
+
+        const data = await report.speedingReport(new Date(2021, 11, 6, 0, 0, 0, 0),
+            new Date(2021, 11, 8, 23, 59, 59, 0),
+            userData)
+        assert.equal(data.length, 1)
+        const device = data[0].devices.find(d => d.device.id===22326)
+        const totalDistance = device.alerts.reduce((a, b) => a + b.distance, 0)
+        const totalEventTime = device.alerts.reduce((a, b) => a + b.eventTime, 0)
+        assert.equal(device.alerts.length, 24)  // Total Alerts
+        assert.equal(totalDistance, 49.49653008204987)  // Total Kms
+        assert.equal(totalEventTime, 1523000)  // Total Duration
+    }, 20000)
+    it('Trip by device', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
+
+        const data = await report.tripReport(new Date(2022, 0, 3, 0, 0, 0, 0),
+            new Date(2022, 0, 4, 23, 59, 59, 0),
+            userData)
+
+        assert.equal(data.length, 1)
+        const device = data[0].devices.find(d => d.device.id===22326)
+        assert.equal(device.trips.length, 7)  // Total Trips
+        assert.equal(device.totalDistance, 339204.53999999166)  // Total Kms
+    }, 20000)
+    it('Trip by device with time period ', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
+
+        userData.allWeek = false
+        userData.weekDays = {
+            sunday: true,
+            monday: true,
+            tuesday: true,
+            wednesday: true,
+            thursday: true,
+            friday: true,
+            saturday: true
+        }
+        userData.dayHours = {
+            startTime: '15:00',
+            endTime: '19:00'
+        }
+
+        const data = await report.tripReport(new Date(2022, 0, 3, 0, 0, 0, 0),
+            new Date(2022, 0, 4, 23, 59, 59, 0),
+            userData)
+
+        assert.equal(data.length, 1)
+        const device = data[0].devices.find(d => d.device.id===22326)
+        assert.equal(device.trips.length, 4)  // Total Trips
+        assert.equal(device.totalDistance, 265155.1099999994)  // Total Kms
+    },20000)
+    it('Trip by device with time period 2', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
+
+        userData.allWeek = false
+        userData.weekDays = {
+            sunday: true,
+            monday: true,
+            tuesday: true,
+            wednesday: true,
+            thursday: true,
+            friday: true,
+            saturday: true
+        }
+        userData.dayHours = {
+            startTime: '18:00',
+            endTime: '09:00'
+        }
+
+        const data = await report.tripReport(new Date(2022, 0, 10, 0, 0, 0, 0),
+            new Date(2022, 0, 14, 23, 59, 59, 0),
+            userData)
+
+        assert.equal(data.length, 1)
+        const device = data[0].devices.find(d => d.device.id===22326)
+        assert.equal(device.trips.length, 18)  // Total Trips
+        assert.equal(device.totalDistance, 133505.6100000143)  // Total Kms
+    },20000)
+    it('Location by device', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
+
+        const data = await report.locationReport(new Date(2022, 0, 4, 0, 0, 0, 0),
+            new Date(2022, 0, 4, 23, 59, 59, 0),
+            userData)
+
+        assert.equal(data.length, 1)
+        const device = data[0].devices.find(d => d.device.id===22326)
+        assert.equal(device.positions.length, 708)  // Total Positions
+    },20000)
+    it('KmsReport by device', async () => {
+        const reports = await getReports()
+        const userData = await reports.getUserData()
+        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()
         userData.groupByDay = true
-        const report = await reports.kmsReport(new Date(2021, 9, 30), new Date(2021, 10),
+        const data = await reports.kmsReport(new Date(2021, 10, 1, 0, 0,0), new Date(2021, 10, 10, 23, 59, 59),
             userData)
-        console.log('report', report)
-        console.log(reports.kmsReportToExcel(userData, report[0]))
-    })
+        assert.equal(data.length, 1)
+        assert.equal(data.length, 1)
+        const device = data[0].devices.find(d => d.device.id===22326)
+        assert.equal(device.days.length, 10)  // Total Kms
+        assert.equal(device.days[5].kms, 23183.010000005364)  // Total Kms
+    },90000)
+    it('Idle by device', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
+        userData.minimumIdleMinutes = 2
+        const data = await report.idleReport(new Date(2022, 0, 3, 0, 0, 0, 0),
+            new Date(2022, 0, 7, 23, 59, 59, 0),
+            userData)
+        assert.equal(data.length, 1)
+        const device = data[0].devices.find(d => d.device.id===22326)
+        const totalIdleTime = device.idleEvents.reduce((a, b) => a + b.idleTime, 0)
+        assert.equal(device.idleEvents.length, 8)  // Total Alerts
+        assert.equal(totalIdleTime, 1294000)  // Total Duration
+    },20000)
+    it('Activity by device', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
+
+        const data = await report.activityReport(new Date(2022, 0, 1, 0, 0, 0, 0),
+            new Date(2022, 0, 31, 23, 59, 59, 0),
+            userData)
+        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].startTime, '2022-01-01T13:35:47.000+0000')
+        assert.equal(device.summary[0].endTime, '2022-01-30T13:48:18.000+0000')
+    }, 20000)
+    it('Activity byDevice groupByDay', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
+        userData.groupByDay = true
+        const data = await report.activityReport(new Date(2022, 0, 1, 0, 0, 0, 0),
+            new Date(2022, 0, 20, 23, 59, 59, 0),
+            userData)
+        assert.equal(data.length, 1)
+        const device = data[0].devices.find(d => d.device.id===22326)
+        assert.equal(device.summary[5].startOdometer, 122923290.95)
+        assert.equal(device.summary[5].distance, 77020.37999999523)
+        assert.equal(device.summary[5].startTime, '2022-01-06T18:35:04.000+0000')
+        assert.equal(device.summary[5].endTime, '2022-01-06T19:54:27.000+0000')
+    }, 60000)
     it('test allinone', async() => {
         console.log('Start')
         const reports = await getReports()
@@ -31,6 +191,28 @@ describe('speedingReport', function() {
             true,
             true,
             false)
-        console.log('getAllInOne',r)
-    })
+
+        assert.equal(r.trips.filter(t => t.deviceId === 22327).length, 10)
+        assert.equal(r.stops.filter(t => t.deviceId === 22327).length, 11)
+    }, 20000)
+    it('Total KMS', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
+
+        const tripsReport = await report.tripReport(new Date(2022, 1, 11, 0, 0, 0, 0),
+            new Date(2022, 1, 14, 23, 59, 59, 0),
+            userData)
+
+        const kmsReport = await report.kmsReport(new Date(2022, 1, 11, 0, 0, 0, 0),
+            new Date(2022, 1, 14, 23, 59, 59, 0),
+            userData)
+
+        assert.equal(tripsReport.length, 1)
+        const device1 = tripsReport[0].devices.find(d => d.device.id===11681)
+        assert.equal(device1.trips.length, 44)  // Total Trips
+        assert.equal(device1.totalDistance, 883076.9928612101)  // Total Kms
+
+        const device2 = kmsReport[0].devices.find(d => d.device.id===11681)
+        assert.equal(device2.summary.distance, device1.totalDistance)  // Total Kms
+    }, 30000)
 })

package/src/util/traccar.js

@@ -84,8 +84,8 @@ async function getAllInOne(traccar, from, to, devices, getRoutes, getTrips, getS
     return {
         route: result.filter(t => t.route).map(r => r.route).flat(),
         trips: result.filter(t => t.trips).map(r => r.trips).flat(),
-        stops: result.filter(t => t.result).map(r => r.stops).flat(),
-        summary: result.filter(t => t.summay).map(r => r.summary).flat(),
+        stops: result.filter(t => t.stops).map(r => r.stops).flat(),
+        summary: result.filter(t => t.summary).map(r => r.summary).flat(),
     }
 }
 

package/src/util/trips.js

@@ -34,7 +34,18 @@ function checkTripsKms(traccarInstance, from, to, devices, data) {
                 const tripRoute = data.route.filter(p => p.deviceId === t.deviceId
                     && new Date(p.fixTime).getTime() >= new Date(t.startTime).getTime()
                     && new Date(p.fixTime).getTime() <= new Date(t.endTime).getTime())
-                t.distance = tripRoute.reduce((a, b) => a + b.attributes.distance, 0)
+
+                let current = null
+                const distances = []
+                for(const p of tripRoute) {
+                    if(current) {
+                        distances.push(coordsDistance(parseFloat(current.longitude),parseFloat(current.latitude),
+                            parseFloat(p.longitude),parseFloat(p.latitude)))
+                    }
+                    current = p
+                }
+
+                t.distance = distances.reduce((a, b) => a + b, 0)
             }
         })
     }

package/src/here.test.js

@@ -1,25 +0,0 @@
-const here = require('./here')
-
-require('axios-debug-log')({
-    request: function (debug, config) {
-        console.log('Req headers:', config.headers.common)
-    },
-    response: function (debug, response) {
-        console.log(
-            'Response Headers:', response.headers,
-            'from', response.config.url
-        )
-    },
-    error: function (debug, error) {
-        // Read https://www.npmjs.com/package/axios#handling-errors for more info
-        console.error('Boom', error)
-    }
-})
-
-describe('here', async () => {
-    it('here', async () => {
-        console.log(process.env.HERE_API_KEY)
-        const rows = [{latitude:0, longitude:0, fixtime:new Date().toISOString(), speed:0, course:0}]
-        console.dir(await here.routeMatch(rows), {depth: null})
-    })
-})