fleetmap-reports 1.0.447 → 1.0.448

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.447",
+  "version": "1.0.448",
   "description": "",
   "main": "src/index.js",
   "scripts": {

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

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/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