fleetmap-reports 1.0.446 → 1.0.450

package/lang/enGB.js

@@ -161,6 +161,10 @@ module.exports = {
     delete_geofence: 'Delete'
   },
   report: {
+    closed: 'Door Closed',
+    opened: 'Door Opened',
+    sun: 'Sun',
+    rain: 'Rain',
     temperature: 'Temperatura',
     select_vehicles: 'Select vehicles',
     select_vehicles_placeholder: 'Vehicles',

package/lang/ptBR.js

@@ -153,6 +153,12 @@ module.exports = {
     delete_geofence: 'Apagar'
   },
   report: {
+    closed: 'Porta fechada',
+    opened: 'Porta aberta',
+    sun: 'Sol',
+    rain: 'Chuva',
+    digital_ports1: 'Portas Digitais 1',
+    digital_ports2: 'Portas Digitais 2',
     temperature: 'Temperatura',
     select_vehicles: 'Seleccionar veículos',
     select_vehicles_placeholder: 'Veículos',

package/lang/ptPT.js

@@ -157,6 +157,12 @@ module.exports = {
     delete_geofence: 'Apagar'
   },
   report: {
+    closed: 'Porta fechada',
+    opened: 'Porta aberta',
+    sun: 'Sol',
+    rain: 'Chuva',
+    digital_ports1: 'Portas Digitais 1',
+    digital_ports2: 'Portas Digitais 2',
     temperature: 'Temperatura',
     select_vehicles: 'Seleccionar veículos',
     select_vehicles_placeholder: 'Veículos',

package/package.json

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

package/src/events-report.js

@@ -219,6 +219,7 @@ function exportSpeedingReportToExcel (userData, reportData) {
     { label: translations.report.eventType, value: 'eventType' },
     { label: translations.report.date, value: 'fixTime' },
     { label: translations.report.address, value: 'address' },
+    { label: translations.report.driver, value: 'driver' },
     { label: translations.report.info, value: 'info' }
   ]
   let data = []
@@ -230,7 +231,8 @@ function exportSpeedingReportToExcel (userData, reportData) {
           eventType: a.type === 'alarm' ? translations.report['event_' + a.attributes.alarm] : translations.report['event_' + a.type],
           fixTime: getAlertDate(userData.user, a),
           address: a.geofenceName || (a.position ? a.position.address : ''),
-          info: getAlertInfo(userData.drivers, a)
+          info: getAlertInfo(userData.drivers, a),
+          driver: a.driver
         }
       }))
     })
@@ -262,7 +264,7 @@ function getAlertInfo (drivers, alert) {
     const driver = drivers.find(d => d.uniqueId === alert.attributes.driverUniqueId)
     return driver ? driver.name : alert.attributes.driverUniqueId
   }
-  return alert.driver
+  return ''
 }
 
 function getAlertDate (user, alert) {

package/src/index.test.js

@@ -15,10 +15,12 @@ async function getSpeedingReport (report, userData) {
 
 // eslint-disable-next-line no-undef
 describe('Test_Reports', function () {
+  this.timeout(500000)
   // eslint-disable-next-line no-undef
   it('Speeding by device', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
+    userData.roadSpeedLimit = true
     const { device, totalDistance, totalEventTime } = await getSpeedingReport(report, userData)
     assert.equal(device.alerts.length, 15) // Total Alerts
     assert.equal(totalDistance, 19.59984677533689) // Total Kms
@@ -49,8 +51,9 @@ describe('Test_Reports', function () {
     const device = data[0].devices.find(d => d.device.id === 22326)
     assert.equal(device.trips.length, 7) // Total Trips
     assert.equal(device.trips[0].endPOIName, 'Casa João')
+    assert.equal(device.trips[0].idleTime, 602000)
     assert.equal(device.trips[1].endPOIName, undefined)
-    assert.equal(device.totalDistance, 339204.53999999166) // Total Kms
+    assert.equal(device.totalDistance, 339170.3099999875) // Total Kms
   }, 20000)
   // eslint-disable-next-line no-undef
   it('Trip by driver', async () => {
@@ -63,10 +66,10 @@ describe('Test_Reports', function () {
     assert.equal(data.length, 1)
     console.log(data[0].drivers)
     const driver = data[0].drivers.find(d => d.driver.id === 14020)
-    assert.equal(driver.trips.length, 9) // Total Trips
-    assert.equal(driver.totalDuration, 6274000)
-    assert.equal(driver.maxSpeed, 70.1944)
-  }, 20000)
+    assert.equal(driver.trips.length, 13) // Total Trips
+    assert.equal(driver.totalDuration, 8159000)
+    assert.equal(driver.maxSpeed, 78.8337)
+  }, 90000)
   // eslint-disable-next-line no-undef
   it('Trip without addresses', async () => {
     const report = await getReports()
@@ -224,7 +227,7 @@ describe('Test_Reports', function () {
     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(device.idleEvents.length, 9) // Total Alerts
     assert.equal(totalIdleTime, 1294000) // Total Duration
   }, 20000)
   // eslint-disable-next-line no-undef

package/src/location-report.js

@@ -169,19 +169,26 @@ async function exportLocationReportToPDF (userData, reportData) {
         translations.report.address,
         translations.report.speed,
         translations.report.ignition,
-        translations.report.vehicle,
-        translations.report.temperature
+        translations.report.vehicle
       ]
     : [
         translations.report.date,
         translations.report.address,
         translations.report.speed,
         translations.report.ignition,
-        translations.report.driver,
-        translations.report.temperature
+        translations.report.driver
       ]
 
+  if (userData.includeTemperature) {
+    headers.push(translations.report.temperature)
+  }
+
   if (positionsData) {
+    if (userData.includeDigitalPorts) {
+      headers.push(getDigitalPort1Label(userData.byDriver ? positionsData[0].driver : positionsData[0].device, translations))
+      headers.push(getDigitalPort2Label(userData.byDriver ? positionsData[0].driver : positionsData[0].device, translations))
+    }
+
     let first = true
     // eslint-disable-next-line new-cap
     const doc = new jsPDF.jsPDF('l')
@@ -210,9 +217,18 @@ async function exportLocationReportToPDF (userData, reportData) {
           a.address,
           Math.round(a.speed * 1.85200),
           a.attributes.ignition ? translations.report.ignitionOn : translations.report.ignitionOff,
-          userData.byDriver ? a.vehicleName : getDriverName(a, userData.drivers),
-          getTempValue(a)
+          userData.byDriver ? a.vehicleName : getDriverName(a, userData.drivers)
         ]
+
+        if (userData.includeTemperature) {
+          temp.push(getTempValue(a))
+        }
+
+        if (userData.includeDigitalPorts) {
+          temp.push(getDigitalPortValue(a, 1, translations))
+          temp.push(getDigitalPortValue(a, 2, translations))
+        }
+
         data.push(temp)
       })
 
@@ -257,6 +273,28 @@ function getTempValue (row) {
   )) || ''
 }
 
+function getDigitalPort1Label (row, translations) {
+  return row.attributes.door1 || translations.report.digital_ports1
+}
+
+function getDigitalPort2Label (row, translations) {
+  return row.attributes.door2 || translations.report.digital_ports2
+}
+
+function getDigitalPortValue (row, index, translations) {
+  switch (index) {
+    case 1:
+      return row.attributes && row.attributes.door1 ? translations.report[row.attributes.door1] : ''
+    case 2:
+      if (row.attributes && row.attributes.door2) {
+        return translations.report[row.attributes.door2]
+      }
+      return row.attributes && row.attributes.rain ? translations.report[row.attributes.rain] : ''
+    default:
+      return ''
+  }
+}
+
 function exportLocationReportToExcel (userData, reportData) {
   console.log('Export to Excel')
 
@@ -285,11 +323,20 @@ function exportLocationReportToExcel (userData, reportData) {
         { label: translations.report.address, value: 'address' },
         { label: translations.report.speed, value: 'speed' },
         { label: translations.report.ignition, value: 'ignition' },
-        { label: translations.report.driver, value: 'driver' },
-        { label: translations.report.temperature, value: 'temperature' }
+        { label: translations.report.driver, value: 'driver' }
       ]
+
+  if (userData.includeTemperature) {
+    headers.push({ label: translations.report.temperature, value: 'temperature' })
+  }
+
   let data = []
   if (positionsData) {
+    if (userData.includeDigitalPorts) {
+      headers.push({ label: getDigitalPort1Label(userData.byDriver ? positionsData[0].driver : positionsData[0].device, translations), value: 'digitalport1' })
+      headers.push({ label: getDigitalPort2Label(userData.byDriver ? positionsData[0].driver : positionsData[0].device, translations), value: 'digitalport2' })
+    }
+
     positionsData.forEach(d => {
       data = data.concat(d.positions.map(a => {
         return {
@@ -300,7 +347,9 @@ function exportLocationReportToExcel (userData, reportData) {
           speed: Math.round(a.speed * 1.85200),
           ignition: a.attributes.ignition ? translations.report.ignitionOn : translations.report.ignitionOff,
           driver: userData.byDriver ? d.driver.name : getDriverName(a, userData.drivers),
-          temperature: getTempValue(a)
+          temperature: getTempValue(a),
+          digitalport1: getDigitalPortValue(a, 1, translations),
+          digitalport2: getDigitalPortValue(a, 2, translations)
         }
       }))
     })

package/src/trip-report.js

@@ -169,9 +169,10 @@ function processDevices (from, to, devices, data, userData, traccar) {
       }
 
       const stop = getStop(new Date(trip.startTime), stops)
+
       if (stop && !trip.endTimeIsOut) {
         trip.stopDuration = (new Date(stop.endTime) - new Date(stop.startTime))
-        trip.stopEngineHours = stop.engineHours
+        trip.stopEngineHours = trip.idleTime + stop.idleTime
       } else {
         trip.stopDuration = 0
         trip.stopEngineHours = 0
@@ -270,6 +271,7 @@ async function exportTripReportToPDF (userData, reportData) {
   }
 
   if (tripsData) {
+    // eslint-disable-next-line new-cap
     const doc = new jsPDF.jsPDF('l')
     await headerFromUser(doc, translations.report.titleTripReport, userData.user)
 

package/src/util/odoo.js

@@ -1,14 +1,16 @@
 
-async function getOdooFuelServices(traccar, from, to) {
-    const url = `/odoo/reports/refuelingServices?startDate=${from.toDateString()}&endDate=${to.toDateString()}`
+async function getOdooFuelServices (traccar, from, to) {
+  const url = `/odoo/reports/refuelingServices?startDate=${from.toDateString()}&endDate=${to.toDateString()}`
 
-    const {data} = await traccar.axios.get(url,{
-        jar: traccar.cookieJar,
-        withCredentials: true })
+  console.log('LOADING_MESSAGE:' + url)
+  const { data } = await traccar.axios.get(url, {
+    jar: traccar.cookieJar,
+    withCredentials: true
+  })
 
-    console.log(data)
+  console.log(data)
 
-    return data
+  return data
 }
 
 exports.getOdooFuelServices = getOdooFuelServices

package/src/util/route.js

@@ -1,4 +1,5 @@
 function getIdleEvents (route, driver) {
+  const speedThreshold = 3
   const idleEvents = []
 
   const routeByDevice = route.reduce(function (a, x) {
@@ -8,8 +9,9 @@ function getIdleEvents (route, driver) {
 
   Object.keys(routeByDevice).forEach(function (key) {
     let inIdle = false
+    let last = null
     routeByDevice[key].forEach(p => {
-      if (p.attributes.ignition && p.speed === 0 && (!driver || p.attributes.driverUniqueId === driver.uniqueId)) {
+      if (p.attributes.ignition && p.speed < speedThreshold && (!driver || p.attributes.driverUniqueId === driver.uniqueId)) {
         if (!inIdle) {
           const idleEvent = {
             position: p,
@@ -17,20 +19,16 @@ function getIdleEvents (route, driver) {
           }
           idleEvents.push(idleEvent)
           inIdle = true
-        } else {
-          if (!idleEvents[idleEvents.length - 1].position.attributes.driverUniqueId) {
-            idleEvents[idleEvents.length - 1].position.attributes.driverUniqueId = p.attributes.driverUniqueId
-          }
+        }
 
-          if (p.attributes.idleTime) {
-            idleEvents[idleEvents.length - 1].idleTime = p.attributes.idleTime
-          }
+        if (!idleEvents[idleEvents.length - 1].position.attributes.driverUniqueId) {
+          idleEvents[idleEvents.length - 1].position.attributes.driverUniqueId = p.attributes.driverUniqueId
         }
+
+        last = p
       } else if (inIdle) {
         const currentIdleEvent = idleEvents[idleEvents.length - 1]
-        if (p.attributes.idleTime === undefined) {
-          currentIdleEvent.idleTime = new Date(p.fixTime) - new Date(currentIdleEvent.position.fixTime)
-        }
+        currentIdleEvent.idleTime = new Date(last.fixTime) - new Date(currentIdleEvent.position.fixTime)
         inIdle = false
       }
     })
@@ -38,5 +36,4 @@ function getIdleEvents (route, driver) {
 
   return idleEvents
 }
-
 exports.getIdleEvents = getIdleEvents