fleetmap-reports 1.0.342 → 1.0.346

package/package.json

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

package/src/activity-report.js

@@ -172,19 +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 => {
+                    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)
                     }
                 }
             }
@@ -193,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
                 })
             }
         }
@@ -234,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 {
@@ -243,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)
@@ -277,6 +286,8 @@ async function exportActivityReportToPDF(userData, reportData) {
 
 function exportActivityReportToPDF_Driver(doc, translations, reportData, userData) {
     const headers = [translations.report.driver,
+        translations.report.start,
+        translations.report.end,
         translations.report.distance,
         translations.report.speed + ' ' + translations.report.avgSpeed + ' (Km/h)',
         translations.report.speed + ' ' + translations.report.maxSpeed + ' (Km/h)',
@@ -289,6 +300,8 @@ function exportActivityReportToPDF_Driver(doc, translations, reportData, userDat
     reportData.drivers.forEach(d => {
         const temp = [
             d.driver.name,
+            d.summary[0].startTime ? new Date(d.summary[0].startTime).toLocaleString() : '',
+            d.summary[0].endTime ? new Date(d.summary[0].endTime).toLocaleString() : '',
             Number((d.summary[0].distance / 1000).toFixed(2)),
             Math.round(d.summary[0].averageSpeed * 1.85200),
             Math.round(d.summary[0].maxSpeed * 1.85200),
@@ -298,6 +311,7 @@ function exportActivityReportToPDF_Driver(doc, translations, reportData, userDat
     })
 
     const footValues = ['Total:' + reportData.drivers.length,
+        '','',
         (reportData.drivers.reduce((a, b) => a + b.summary[0].distance, 0) / 1000).toFixed(0),
         getSumAvgSpeed(reportData.drivers, userData),
         getSumMaxSpeed(reportData.drivers, userData),
@@ -310,6 +324,8 @@ function exportActivityReportToPDF_Driver(doc, translations, reportData, userDat
 function exportActivityReportToPDF_Vehicle(doc, translations, reportData, userData) {
     const headers = [translations.report.vehicle,
         translations.report.group,
+        translations.report.start,
+        translations.report.end,
         translations.report.distance,
         translations.report.start + ' ' + translations.report.odometer,
         translations.report.end + ' ' + translations.report.odometer,
@@ -328,6 +344,8 @@ function exportActivityReportToPDF_Vehicle(doc, translations, reportData, userDa
         const temp = [
             d.summary[0].deviceName,
             group ? group.name : '',
+            d.summary[0].startTime ? new Date(d.summary[0].startTime).toLocaleString() : '',
+            d.summary[0].endTime ? new Date(d.summary[0].endTime).toLocaleString() : '',
             Number((d.summary[0].distance / 1000).toFixed(2)),
             Number((d.summary[0].startOdometer / 1000).toFixed(2)),
             Number((d.summary[0].endOdometer / 1000).toFixed(2)),
@@ -340,7 +358,7 @@ function exportActivityReportToPDF_Vehicle(doc, translations, reportData, userDa
     })
 
     const footValues = ['Total:' + reportData.devices.length,
-        '',
+        '','','',
         (reportData.devices.reduce((a, b) => a + b.summary[0].distance, 0) / 1000).toFixed(0),
         '', '',
         getSumAvgSpeed(reportData.devices, userData),
@@ -354,6 +372,8 @@ function exportActivityReportToPDF_Vehicle(doc, translations, reportData, userDa
 
 function exportActivityReportToPDF_Vehicle_GroupByDay(doc, translations, reportData, userData) {
     const headers = [translations.report.date,
+        translations.report.start,
+        translations.report.end,
         translations.report.distance,
         translations.report.start + ' ' + translations.report.odometer,
         translations.report.end + ' ' + translations.report.odometer,
@@ -403,6 +423,8 @@ function exportActivityReportToPDF_Vehicle_GroupByDay(doc, translations, reportD
         d.summary.forEach(s => {
             const temp = [
                 new Date(s.date).toLocaleDateString() + ' - ' + weekDays[s.date.getDay()],
+                s.startTime ? new Date(s.startTime).toLocaleTimeString() : '',
+                s.endTime ? new Date(s.endTime).toLocaleTimeString() : '',
                 Number((s.distance / 1000).toFixed(2)),
                 Number((s.startOdometer / 1000).toFixed(2)),
                 Number((s.endOdometer / 1000).toFixed(2)),
@@ -416,6 +438,7 @@ function exportActivityReportToPDF_Vehicle_GroupByDay(doc, translations, reportD
         })
 
         const footValues = ['Total:' + d.summary.length,
+            '','',
             (d.summary.reduce((a, b) => a + b.distance, 0) / 1000).toFixed(0),
             '', '',
             getSumAvgSpeed(d.summary, userData),
@@ -433,6 +456,8 @@ function exportActivityReportToExcel_Vehicle_GroupByDay(settings, translations,
         {label: translations.report.group, value: 'group'},
         {label: translations.report.date, value: 'date'},
         {label: translations.report.weekDay, value: 'weekday'},
+        {label: translations.report.start, value: 'start'},
+        {label: translations.report.end, value: 'end'},
         {label: translations.report.distance, value: 'distance'},
         {label: translations.report.start + ' ' + translations.report.odometer, value: 'startOdometer'},
         {label: translations.report.end + ' ' + translations.report.odometer, value: 'endOdometer'},
@@ -463,6 +488,8 @@ function exportActivityReportToExcel_Vehicle_GroupByDay(settings, translations,
                     group: group ? group.name : '',
                     date: new Date(s.date).toLocaleDateString(),
                     weekday: weekDays[s.date.getDay()],
+                    start: s.startTime ? new Date(s.startTime).toLocaleTimeString() : '',
+                    end:s.endTime ? new Date(s.endTime).toLocaleTimeString() : '',
                     distance: Number((s.distance / 1000).toFixed(0)),
                     startOdometer: Number((s.startOdometer / 1000).toFixed(0)),
                     endOdometer: Number((s.endOdometer / 1000).toFixed(0)),
@@ -484,6 +511,8 @@ function exportActivityReportToExcel_Vehicle_GroupByDay(settings, translations,
 
 function exportActivityReportToPDF_Driver_GroupByDay(doc, translations, reportData, userData) {
     const headers = [translations.report.date,
+        translations.report.start,
+        translations.report.end,
         translations.report.distance,
         translations.report.avgSpeed + ' (Km/h)',
         translations.report.maxSpeed + ' (Km/h)',
@@ -530,6 +559,8 @@ function exportActivityReportToPDF_Driver_GroupByDay(doc, translations, reportDa
         d.summary.forEach(s => {
             const temp = [
                 new Date(s.date).toLocaleDateString() + ' - ' + weekDays[s.date.getDay()],
+                s.startTime ? new Date(s.startTime).toLocaleTimeString() : '',
+                s.endTime ? new Date(s.endTime).toLocaleTimeString() : '',
                 Number((s.distance / 1000).toFixed(2)),
                 Math.round(s.averageSpeed * 1.85200),
                 Math.round(s.maxSpeed * 1.85200),
@@ -540,6 +571,7 @@ function exportActivityReportToPDF_Driver_GroupByDay(doc, translations, reportDa
         })
 
         const footValues = ['Total:' + d.summary.length,
+            '','',
             (d.summary.reduce((a, b) => a + b.distance, 0) / 1000).toFixed(0),
             getSumAvgSpeed(d.summary, userData),
             getSumMaxSpeed(d.summary, userData),
@@ -555,6 +587,8 @@ function exportActivityReportToExcel_Driver_GroupByDay(settings, translations, r
         {label: translations.report.group, value: 'group'},
         {label: translations.report.date, value: 'date'},
         {label: translations.report.weekDay, value: 'weekday'},
+        {label: translations.report.start, value: 'start'},
+        {label: translations.report.end, value: 'end'},
         {label: translations.report.distance, value: 'distance'},
         {label: translations.report.speed + ' ' + translations.report.avgSpeed + ' (Km/h)', value: 'avgSpeed'},
         {label: translations.report.speed + ' ' + translations.report.maxSpeed + ' (Km/h)', value: 'maxSpeed'},
@@ -582,6 +616,8 @@ function exportActivityReportToExcel_Driver_GroupByDay(settings, translations, r
                     group: group ? group.name : '',
                     date: new Date(s.date).toLocaleDateString(),
                     weekday: weekDays[s.date.getDay()],
+                    start: s.startTime ? new Date(s.startTime).toLocaleTimeString() : '',
+                    end:s.endTime ? new Date(s.endTime).toLocaleTimeString() : '',
                     distance: Number((s.distance / 1000).toFixed(0)),
                     avgSpeed: Math.round(s.averageSpeed * 1.85200),
                     maxSpeed: Math.round(s.maxSpeed * 1.85200),
@@ -600,6 +636,8 @@ function exportActivityReportToExcel_Driver_GroupByDay(settings, translations, r
 
 function exportActivityReportToExcel_Driver(settings, translations, reportData) {
     const headers = [{label: translations.report.driver, value: 'driver'},
+        {label: translations.report.start, value: 'start'},
+        {label: translations.report.end, value: 'end'},
         {label: translations.report.distance, value: 'distance'},
         {label: translations.report.speed + ' ' + translations.report.avgSpeed + ' (Km/h)', value: 'avgSpeed'},
         {label: translations.report.speed + ' ' + translations.report.maxSpeed + ' (Km/h)', value: 'maxSpeed'},
@@ -610,6 +648,8 @@ function exportActivityReportToExcel_Driver(settings, translations, reportData)
         reportData.drivers.forEach(d => {
             data = data.concat([{
                 driver: d.driver.name,
+                start: d.summary[0].startTime ? new Date(d.summary[0].startTime).toLocaleString() : '',
+                end: d.summary[0].endTime ? new Date(d.summary[0].endTime).toLocaleString() : '',
                 distance: Number((d.summary[0].distance / 1000).toFixed(0)),
                 avgSpeed: Math.round(d.summary[0].averageSpeed * 1.85200),
                 maxSpeed: Math.round(d.summary[0].maxSpeed * 1.85200),
@@ -628,6 +668,8 @@ function exportActivityReportToExcel_Driver(settings, translations, reportData)
 function exportActivityReportToExcel_Vehicle(settings, translations, reportData, userData) {
     const headers = [{label: translations.report.vehicle, value: 'name'},
         {label: translations.report.group, value: 'group'},
+        {label: translations.report.start, value: 'start'},
+        {label: translations.report.end, value: 'end'},
         {label: translations.report.distance, value: 'distance'},
         {label: translations.report.start + ' ' + translations.report.odometer, value: 'startOdometer'},
         {label: translations.report.end + ' ' + translations.report.odometer, value: 'endOdometer'},
@@ -644,6 +686,8 @@ function exportActivityReportToExcel_Vehicle(settings, translations, reportData,
             data = data.concat([{
                 name: d.summary[0].deviceName,
                 group: group ? group.name : '',
+                start: d.summary[0].startTime ? new Date(d.summary[0].startTime).toLocaleString() : '',
+                end: d.summary[0].endTime ? new Date(d.summary[0].endTime).toLocaleString() : '',
                 distance: Number((d.summary[0].distance / 1000).toFixed(0)),
                 startOdometer: Number((d.summary[0].startOdometer / 1000).toFixed(0)),
                 endOdometer: Number((d.summary[0].endOdometer / 1000).toFixed(0)),

package/src/index.test.js

@@ -125,7 +125,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.distance, 1193284.3100000024)  // Total Kms
-    },20000)
+    },30000)
     it('KmsReport byDevice groupByDay', async () => {
         const reports = await getReports()
         const userData = await reports.getUserData()
@@ -137,7 +137,7 @@ describe('Test_Reports', function() {
         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
-    },20000)
+    },90000)
     it('Idle by device', async () => {
         const report = await getReports()
         const userData = await report.getUserData()
@@ -162,6 +162,8 @@ describe('Test_Reports', function() {
         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()
@@ -174,7 +176,9 @@ describe('Test_Reports', function() {
         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)
-    }, 40000)
+        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()
@@ -187,7 +191,28 @@ describe('Test_Reports', function() {
             true,
             true,
             false)
-        assert.equal(r.trips.length, 10)
-        assert.equal(r.stops.length, 11)
+
+        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/speeding-report.js

@@ -238,7 +238,6 @@ async function getHereEvents(devices, routes, threshold){
       continue
     }
     let hereAlerts = null
-    try {
       const results = await here.routeMatch(positions)
       hereAlerts = results.filter(r => r.currentSpeedKmh > (parseInt(r.speedLimit) + threshold)).map(r => {
         const position = positions.find(p => new Date(p.fixTime).getTime() === r.timestamp)
@@ -265,9 +264,6 @@ async function getHereEvents(devices, routes, threshold){
         return acc
       })
       events.push(...reduced)
-    } catch (e) {
-      console.error(hereAlerts, 'threshold', threshold,  e)
-    }
   }
   return events
 }

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)
             }
         })
     }