fleetmap-reports 1.0.336 → 1.0.340

package/package.json

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

package/src/activity-report.js

@@ -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)
             }
@@ -85,13 +85,12 @@ async function createActivityReportByDevice(from, to, userData, traccarInstance)
     //Get report data from traccar
     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
+    let summaries = []
+    const tripsData = await traccar.getTrips(traccarInstance, from, to, devicesToProcess)
 
     if(userData.groupByDay) {
-        routeData = allInOne.route
+        routeData = await traccar.getRoute(traccarInstance, from, to, devicesToProcess)
         console.log('trips:' + tripsData.length)
 
         if (tripsData.length > 0) {
@@ -110,14 +109,14 @@ async function createActivityReportByDevice(from, to, userData, traccarInstance)
             }
         }
     } else {
-        summaries = allInOne.summary
+        summaries = await traccar.getSummary(traccarInstance, from, to, devicesToProcess)
     }
 
     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})
+        allData.devices = processDevices(from, to, devicesToProcess, {summaries: summaries, trips: tripsData, route: routeData}, userData)
     }
 
     return allData
@@ -179,7 +178,6 @@ function processDevices(from, to, devices, data, userData) {
                     })
                 } else {
                     const summaryCurrentDay = data.summaries.filter(s => {
-                        console.log(s.date.getTime(), date.getTime(), s.date.getTime() === date.getTime())
                         return  s.deviceId === d.id && s.date.getTime() === date.getTime()})
 
                     if (summaryCurrentDay.length) {

package/src/index.test.js

@@ -1,24 +1,180 @@
 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
+    }).timeout(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
+    }).timeout(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
+    }).timeout(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
+    }).timeout(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
+    }).timeout(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
+    }).timeout(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
+    }).timeout(20000)
+    it('KmsReport byDevice groupByDay', async () => {
+        const reports = await getReports()
+        const userData = await reports.getUserData()
+        userData.groupByDay = true
+        const data = await reports.kmsReport(new Date(2021, 10, 1, 0, 0,0), new Date(2021, 10, 10, 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.days.length, 10)  // Total Kms
+        assert.equal(device.days[5].kms, 23183.010000005364)  // Total Kms
+    }).timeout(20000)
+    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
+    }).timeout(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)
+    }).timeout(20000)
+    it('Activity byDevice groupByDay', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
         userData.groupByDay = true
-        const report = await reports.kmsReport(new Date(2021, 9, 30), new Date(2021, 10),
+        const data = await report.activityReport(new Date(2022, 0, 1, 0, 0, 0, 0),
+            new Date(2022, 0, 20, 23, 59, 59, 0),
             userData)
-        console.log('report', report)
-        console.log(reports.kmsReportToExcel(userData, report[0]))
-    })
+        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)
+    }).timeout(40000)
     it('test allinone', async() => {
         console.log('Start')
         const reports = await getReports()
@@ -31,6 +187,6 @@ describe('speedingReport', function() {
             true,
             true,
             false)
-        console.log('getAllInOne',r)
-    })
+        assert.equal(r.trips.length, 10)
+    }).timeout(20000)
 })

package/src/util/traccar.js

@@ -72,9 +72,9 @@ async function getAllInOne(traccar, from, to, devices, getRoutes, getTrips, getS
     if(getTrips)   url += `&type=trips`
     if(getStops)   url += `&type=stops`
     if(getSummary) url += `&type=summary`
+    console.log('LOADING_MESSAGE:' + devices.map(d => d.name).join(', '))
 
-    const devicesToSlice = devices.slice()
-    const sliced = automaticReports.sliceArray(devicesToSlice)
+    const sliced = automaticReports.sliceArray(devices)
     const requests = sliced.map(a =>
         traccar.axios.get(url + '&' + a.map(d => `deviceId=${d.id}`).join('&')).then(r => r.data).then(x => {
             console.log('LOADING_MESSAGE:' + a.map(d => d.name).join(', '))
@@ -82,10 +82,10 @@ async function getAllInOne(traccar, from, to, devices, getRoutes, getTrips, getS
         }))
     const result = await Promise.all(requests)
     return {
-        route: result.map(r => r.route).flat(),
-        trips: result.map(r => r.trips).flat(),
-        stops: result.map(r => r.stops).flat(),
-        summary: result.map(r => r.summary).flat(),
+        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(),
     }
 }