fleetmap-reports 1.0.344 → 1.0.347

package/package.json

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

package/src/activity-report.js

@@ -286,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)',
@@ -298,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),
@@ -307,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),
@@ -319,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,
@@ -337,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)),
@@ -349,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),
@@ -363,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,
@@ -412,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)),
@@ -425,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),
@@ -442,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'},
@@ -472,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)),
@@ -493,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)',
@@ -539,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),
@@ -549,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),
@@ -564,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'},
@@ -591,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),
@@ -609,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'},
@@ -619,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),
@@ -637,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'},
@@ -653,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

@@ -119,6 +119,7 @@ describe('Test_Reports', function() {
     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)
@@ -129,6 +130,7 @@ describe('Test_Reports', function() {
     it('KmsReport byDevice groupByDay', async () => {
         const reports = await getReports()
         const userData = await reports.getUserData()
+        userData.devices = userData.devices.filter(d => d.id === 22326)
         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)
@@ -137,7 +139,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
-    },90000)
+    },30000)
     it('Idle by device', async () => {
         const report = await getReports()
         const userData = await report.getUserData()
@@ -215,4 +217,33 @@ describe('Test_Reports', function() {
         const device2 = kmsReport[0].devices.find(d => d.device.id===11681)
         assert.equal(device2.summary.distance, device1.totalDistance)  // Total Kms
     }, 30000)
+    it('Refueling Report', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
+
+        const data = await report.refuelingReport(new Date(2022, 1, 2, 0, 0, 0, 0),
+            new Date(2022, 1, 2, 23, 59, 59, 0),
+            userData)
+
+        assert.equal(data.length, 1)
+        console.log(data[0])
+        const device = data[0].devices.find(d => d.device.id===16245)
+        assert.equal(device.refuelings.length, 2)
+
+    }, 30000)
+    it('Refueling2 Report', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
+
+        const data = await report.refuelingReport(new Date(2022, 1, 21, 0, 0, 0, 0),
+            new Date(2022, 1, 25, 23, 59, 59, 0),
+            userData)
+
+        assert.equal(data.length, 1)
+        console.log(data[0])
+        const device = data[0].devices.find(d => d.device.id===16245)
+        console.log(device.refuelings)
+        assert.equal(device.refuelings.length, 4)
+
+    }, 30000)
 })

package/src/refueling-report.js

@@ -1,6 +1,8 @@
 const helpers = require("turf");
 const automaticReports = require("./automaticReports");
 
+const positionsToCheck = 15
+
 async function createRefuelingReport(from, to, userData, traccar) {
     console.log('Create RefuelingReport')
 
@@ -134,10 +136,10 @@ function calculateRefuelingPositions(d, positions) {
                 const value = Math.round(diff * d.attributes.fuel_tank_capacity / 100)
                 refuelingPositions.push({position: element, diff: value})
                 lastRefuelingIndex = index
-                positionsChecked = 6 // to reset values
+                positionsChecked = positionsToCheck+1 // to reset values
             }
 
-            if(positionsChecked > 5) {
+            if(positionsChecked > positionsToCheck) {
                 refuelingActivated = false
                 currentValue = null
                 positionsChecked = 0

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
 }