fleetmap-reports 1.0.604 → 1.0.606

package/lang/esCL.js

@@ -179,7 +179,7 @@ module.exports = {
     titleKmsReport: 'Informe de Kms',
     titleIdleReport: 'Informe de Ralenti',
     titleMachinesReport: 'Informe de Maquinas',
-    titleStopReport: 'Informe de Paragens',
+    titleStopReport: 'Informe de Paradas',
     from: 'De',
     to: 'a',
     headerStartAddress: 'Lugar de início',
@@ -204,7 +204,7 @@ module.exports = {
     maxSpeed: 'Vel.Max',
     driver: 'Conductor',
     group: 'Grupo',
-    address: 'Local',
+    address: 'Dirección',
     ignition: 'Motor',
     ignitionOn: 'Encendido',
     ignitionOff: 'Apagado',

package/package.json

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

package/src/fuelconsumption-report.js

@@ -3,7 +3,7 @@ const refuelingReport = require('./refueling-report')
 const traccarHelper = require('./util/traccar')
 const odoo = require('./util/odoo')
 const { devicesToProcess } = require('./util/device')
-const { getTranslations, convertToLocaleString, getLanguage } = require('./util/utils')
+const { getTranslations, convertToLocaleString, getLanguage, convertMS, formatNumber } = require('./util/utils')
 const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const { addTable, headerFromUser } = require('./util/pdfDocument')
@@ -100,13 +100,17 @@ function getOdooAvgConsumption (refuelingPositions, trips) {
 
   if (totalKms === 0 || odooTotalfuel === 0) { return { byKms: 0, byLiters: 0 } }
 
-  return { byKms: odooTotalfuel * 100 / (totalKms / 1000), byLiters: (totalKms / 1000) / odooTotalfuel }
+  return calculateAvgConsumption(odooTotalfuel, totalKms)
 }
 
 function getCanAvgConsumption (distance, spentFuel) {
   if (distance === 0 || spentFuel === 0) { return { byKms: 0, byLiters: 0 } }
 
-  return { byKms: Math.round(spentFuel * 100 / (distance / 1000)), byLiters: Math.round((distance / 1000) / spentFuel) }
+  return calculateAvgConsumption(spentFuel, distance)
+}
+
+function calculateAvgConsumption (fuel, distance) {
+  return { byKms: Math.round(fuel * 100 / (distance / 1000)), byLiters: Math.round((distance / 1000) / fuel) }
 }
 
 function calculateConsumption (userData, d, day, avgConsumption, data) {
@@ -144,14 +148,24 @@ function exportFuelConsumptionReportToExcel (userData, reportData) {
         return {
           name: d.device.name,
           date: r.date,
-          kms: (r.distance / 1000).toFixed(1),
-          consumption: r.spentFuel > 0 ? r.spentFuel : 0,
-          avg_consumption: lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms,
-          duration: new Date(r.duration).toLocaleTimeString(),
-          accumulated_kms: (r.endOdometer / 1000).toFixed(1),
-          refueling: r.refueling
+          kms: formatNumber(r.distance / 1000, lang),
+          consumption: r.spentFuel > 0 ? formatNumber(r.spentFuel, lang) : 0,
+          avg_consumption: formatNumber(lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms, lang),
+          duration: convertMS(r.duration),
+          accumulated_kms: (r.endOdometer / 100).toFixed(1),
+          refueling: formatNumber(r.refueling, lang)
         }
       }))
+      // Totals
+      data = data.concat([{
+        date: 'Total:' + d.days.length,
+        kms: getTotalKms(userData.user, d.days),
+        consumption: getTotalConsumption(userData.user, d.days),
+        avg_consumption: getTotalAvgConsumption(userData.user, d.days),
+        duration: getTotalDuration(userData.user, d.days),
+        refueling: getTotalRefueling(userData.user, d.days)
+      }])
+      data = data.concat([{}])
     })
     return {
       headers,
@@ -202,17 +216,22 @@ async function exportFuelConsumptionReportToPDF (userData, reportData) {
       d.days.forEach(r =>
         data.push([
           r.date,
-          (r.distance / 1000).toFixed(1),
-          r.spentFuel > 0 ? r.spentFuel : 0,
-          lang === 'pt-BR' ? (r.avgConsumption.byLiters).toFixed(1) : (r.avgConsumption.byKms).toFixed(1),
-          new Date(r.duration).toLocaleTimeString(),
+          formatNumber(r.distance / 1000, lang),
+          r.spentFuel > 0 ? formatNumber(r.spentFuel, lang) : 0,
+          formatNumber(lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms, lang),
+          convertMS(r.duration),
           (r.endOdometer / 1000).toFixed(1),
           r.refueling
         ]))
       console.log(data)
       const footValues = [
         'Total:' + d.days.length,
-        '', '', '', '', '', '', ''
+        getTotalKms(userData.user, d.days),
+        getTotalConsumption(userData.user, d.days),
+        getTotalAvgConsumption(userData.user, d.days),
+        getTotalDuration(userData.user, d.days),
+        '',
+        getTotalRefueling(userData.user, d.days)
       ]
 
       const style = getStyle(getUserPartner(userData.user))
@@ -231,6 +250,34 @@ function useOdooFuelData (d, route) {
   return route.length && !route[0].attributes.fuel && d.attributes.odooId
 }
 
+function getTotalKms (user, data) {
+  const totalKms = data.reduce((a, b) => a + b.distance, 0)
+  return formatNumber(totalKms / 1000, user.attributes.lang)
+}
+
+function getTotalConsumption (user, data) {
+  const totalConsumption = data.reduce((a, b) => a + (b.spentFuel > 0 ? b.spentFuel : 0), 0)
+  return formatNumber(totalConsumption, user.attributes.lang)
+}
+
+function getTotalDuration (user, data) {
+  const totalDuration = data.reduce((a, b) => a + b.duration, 0)
+  return convertMS(totalDuration)
+}
+
+function getTotalRefueling (user, data) {
+  const totalRefueling = data.reduce((a, b) => a + b.refueling, 0)
+  return formatNumber(totalRefueling, user.attributes.lang)
+}
+
+function getTotalAvgConsumption (user, data) {
+  const values = data.map(a => a.distance * a.avgConsumption.byKms).reduce((a, b) => a + b, 0)
+  const totalKms = data.reduce((a, b) => a + b.distance, 0)
+
+  const totalAvgConsumption = values / totalKms
+  return formatNumber(totalAvgConsumption, user.attributes.lang)
+}
+
 exports.createFuelConsumptionReport = createFuelConsumptionReport
 exports.exportFuelConsumptionReportToPDF = exportFuelConsumptionReportToPDF
 exports.exportFuelConsumptionReportToExcel = exportFuelConsumptionReportToExcel

package/src/speeding-report.js

@@ -516,6 +516,10 @@ function exportSpeedingReportToExcel (userData, reportData) {
     userData.byDriver ? { label: translations.report.driver, value: 'driver' } : { label: translations.report.vehicle, value: 'name' },
     { label: translations.report.date, value: 'fixTime' },
     { label: translations.report.address, value: 'address' },
+    {
+      label: userData.roadSpeedLimits ? translations.report.roadSpeedLimit : translations.report.speedLimit,
+      value: 'speedLimit'
+    },
     { label: translations.report.overspeed, value: 'speed' },
     { label: translations.report.distance, value: 'distance' },
     { label: translations.report.maxSpeed, value: 'maxSpeed' },
@@ -523,10 +527,6 @@ function exportSpeedingReportToExcel (userData, reportData) {
     userData.byDriver ? { label: translations.report.vehicle, value: 'name' } : { label: translations.report.driver, value: 'driver' }
   ]
 
-  if (userData.roadSpeedLimits) {
-    headers.splice(3, 0, { label: translations.report.roadSpeedLimit, value: 'roadSpeedLimit' })
-  }
-
   let data = []
   if (overspeedData) {
     overspeedData.forEach(d => {
@@ -541,7 +541,11 @@ function exportSpeedingReportToExcel (userData, reportData) {
           fixTime: getAlertDate(a, userData.user),
           name: userData.byDriver ? a.deviceName : d.device.name,
           address: a.position.address + (a.geofenceName ? ' - ' + a.geofenceName : ''),
-          roadSpeedLimit: a.roadSpeedLimit
+          speedLimit: userData.roadSpeedLimits
+            ? a.roadSpeedLimit
+            : userData.useVehicleSpeedLimit
+              ? Math.round(a.attributes.speedLimit * 1.85200)
+              : userData.customSpeed
         }
       }))
     })

package/src/util/utils.js

@@ -35,6 +35,10 @@ function convertMS (duration, withSeconds) {
   return withSeconds ? hours + ':' + minutes + ':' + seconds : hours + ':' + minutes
 }
 
+exports.formatNumber = function formatNumber (value, lang) {
+  return Intl.NumberFormat(lang, { maximumFractionDigits: 1 }).format(value)
+}
+
 function coordsDistance (lon1, lat1, lon2, lat2) {
   const from = turf.point([lon1, lat1])
   const to = turf.point([lon2, lat2])