fleetmap-reports 2.0.36 → 2.0.38

package/package.json

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

package/src/fuelconsumption-report.js

@@ -136,7 +136,7 @@ function exportFuelConsumptionReportToExcel (userData, reportData) {
       data = data.concat(d.days.map((r) => {
         return {
           name: d.device.name,
-          date: r.date,
+          date: r.date.toLocaleDateString(),
           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),
@@ -203,7 +203,7 @@ async function exportFuelConsumptionReportToPDF (userData, reportData) {
 
       d.days.forEach(r =>
         data.push([
-          r.date,
+          r.date.toLocaleDateString(),
           formatNumber(r.distance / 1000, lang),
           r.spentFuel > 0 ? formatNumber(r.spentFuel, lang) : 0,
           formatNumber(lang === 'pt-BR' ? r.avgConsumption.byLiters : r.avgConsumption.byKms, lang),

package/src/trip-report.js

@@ -183,21 +183,33 @@ async function processDevices (from, to, devices, data, userData, traccar) {
       }
 
       if (userData.includeTemperature) {
-        const tripRoute = deviceRoute.filter(p => trip.startTime <= p.fixTime && trip.endTime >= p.fixTime && p.attributes.temp1 !== 175)
-        trip.maxTemp = tripRoute.length > 0
-          ? tripRoute.reduce((a, b) => {
-            return a && a > b.attributes.temp1 ? a : b.attributes.temp1
+        const tripRoute = deviceRoute.filter(p => trip.startTime <= p.fixTime && trip.endTime >= p.fixTime)
+
+        const temperatureValues = tripRoute.map(p => {
+          for (let i = 1; i <= 3; i++) {
+            const temp = 'temp' + i
+            if (p.attributes[temp] && parseFloat(p.attributes[temp]) !== 175) {
+              return parseFloat(p.attributes[temp])
+            }
+          }
+
+          return undefined
+        }).filter(a => a !== undefined)
+
+        trip.maxTemp = temperatureValues.length > 0
+          ? temperatureValues.reduce((a, b) => {
+            return a > b ? a : b
           })
           : 0
-        trip.minTemp = tripRoute.length > 0
-          ? tripRoute.reduce((a, b) => {
-            return a && a < b.attributes.temp1 ? a : b.attributes.temp1
+        trip.minTemp = temperatureValues.length > 0
+          ? temperatureValues.reduce((a, b) => {
+            return a < b ? a : b
           })
           : 0
-        trip.avgTemp = tripRoute.length > 0
-          ? (tripRoute.reduce((a, b) => {
-              return a + b.attributes.temp1
-            }, 0)) / tripRoute.length
+        trip.avgTemp = temperatureValues.length > 0
+          ? (temperatureValues.reduce((a, b) => {
+              return a + b
+            }, 0)) / temperatureValues.length
           : 0
       }