fleetmap-reports 1.0.581 → 1.0.583

package/package.json

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

package/src/trip-report.js

@@ -163,15 +163,10 @@ function processDevices (from, to, devices, data, userData, traccar) {
     addNearestPOIs(trips, userData)
 
     trips.forEach(trip => {
-      if (deviceRoute[0].protocol === 'teltonika') {
+      if ((deviceRoute[0].protocol === 'teltonika' && deviceRoute[0].attributes.fuel) ||
+          automaticReports.deviceWithFuelInfo(d)) {
         trip.fuelConsumption = trip.spentFuel
-        trip.avgFuelConsumption = trip.totalKms > 0 ? Math.round(trip.fuelConsumption * 100 / trip.totalKms) : 0
-      } else if (automaticReports.deviceWithFuelInfo(d)) {
-        trip.fuelConsumption = Math.round((trip.spentFuel * d.attributes.fuel_tank_capacity) / 100)
-        trip.avgFuelConsumption = trip.totalKms > 0 ? Math.round(trip.fuelConsumption * 100 / trip.totalKms) : 0
-      } else {
-        trip.fuelConsumption = '-'
-        trip.avgFuelConsumption = '-'
+        trip.avgFuelConsumption = trip.totalKms > 0 ? trip.fuelConsumption * 100 / trip.totalKms : 0
       }
 
       const stop = getStop(new Date(trip.startTime), stops)
@@ -201,9 +196,11 @@ function processDevices (from, to, devices, data, userData, traccar) {
         }, 0),
         trips
       }
-      if (d.attributes.xpert) {
+
+      if (trips[0].fuelConsumption !== undefined) {
         deviceData.totalFuelConsumption = trips.reduce((a, b) => a + b.fuelConsumption, 0)
-        deviceData.avgFuelConsumption = deviceData.totalDistance > 0 ? Math.round((deviceData.totalFuelConsumption * 100) / (deviceData.totalDistance / 1000)) : 0
+        deviceData.avgFuelConsumption = deviceData.totalDistance > 0 ? (deviceData.totalFuelConsumption * 100) / (deviceData.totalDistance / 1000) : 0
+        console.log(deviceData)
       }
 
       devicesResult.push(deviceData)
@@ -257,26 +254,28 @@ async function exportTripReportToPDF (userData, reportData) {
     translations.report.start,
     translations.report.end,
     translations.report.endAddress,
-    translations.report.tripTime
+    translations.report.tripTime,
+    translations.report.idleTime,
+    translations.report.stopTime,
+    translations.report.distance,
+    translations.report.avgSpeed,
+    translations.report.maxSpeed
   ]
 
-  if (userData.byDriver) {
-    headers.push(translations.report.idleTime,
-      translations.report.stopTime,
-      translations.report.distance,
-      translations.report.avgSpeed,
-      translations.report.maxSpeed,
-      translations.report.name)
-  } else {
-    headers.push(translations.report.idleTime,
-      translations.report.stopTime,
-      translations.report.distance,
-      translations.report.avgSpeed,
-      translations.report.maxSpeed,
-      translations.report.driver)
-  }
-
   if (tripsData) {
+    const withFuelData = tripsData.reduce((a, b) => a || b.totalFuelConsumption !== undefined)
+
+    if (withFuelData) {
+      headers.push(translations.report.consumption,
+        translations.report.avg_consumption)
+    }
+
+    if (userData.byDriver) {
+      headers.push(translations.report.name)
+    } else {
+      headers.push(translations.report.driver)
+    }
+
     // eslint-disable-next-line new-cap
     const doc = new jsPDF.jsPDF('l')
     await headerFromUser(doc, translations.report.titleTripReport, userData.user)
@@ -326,6 +325,10 @@ async function exportTripReportToPDF (userData, reportData) {
           Math.round(a.averageSpeed * 1.85200),
           Math.round(a.maxSpeed * 1.85200))
 
+        if (withFuelData) {
+          temp.push(a.fuelConsumption.toFixed(1), a.avgFuelConsumption.toFixed(1))
+        }
+
         if (userData.byDriver) {
           temp.push(a.deviceName)
         } else {
@@ -346,8 +349,21 @@ async function exportTripReportToPDF (userData, reportData) {
         getSumAvgSpeed(d.trips),
         getMaxSpeed(d.trips))
 
+      if (withFuelData) {
+        footValues.push(parseFloat(d.totalFuelConsumption).toFixed(1), parseFloat(d.avgFuelConsumption).toFixed(1))
+      }
+
       const style = getStyle(getUserPartner(userData.user))
-      addTable(doc, headers, data, footValues, style, space + (userData.allWeek ? 40 : 45))
+      addTable(doc,
+        headers, data, footValues, style,
+        space + (userData.allWeek ? 40 : 45),
+        {
+          7: { halign: 'right' },
+          8: { halign: 'right' },
+          9: { halign: 'right' },
+          10: { halign: 'right' },
+          11: { halign: 'right' }
+        })
     })
     return doc
   }
@@ -364,37 +380,37 @@ function exportTripReportToExcel (userData, reportData) {
     sheetName: translations.report.titleTripReport, // The name of the sheet
     fileName // The name of the spreadsheet
   }
-  const headers = userData.byDriver
-    ? [
-        { label: translations.report.driver, value: 'name' },
-        { label: translations.report.date, value: 'date' },
-        { label: translations.report.start, value: 'start' },
-        { label: translations.report.end, value: 'end' },
-        { label: translations.report.endAddress, value: 'endAddress' },
-        { label: translations.report.tripTime, value: 'tripTime' },
-        { label: translations.report.idleTime, value: 'idleTime' },
-        { label: translations.report.stopTime, value: 'stopTime' },
-        { label: translations.report.distance, value: 'distance' },
-        { label: translations.report.avgSpeed, value: 'averageSpeed' },
-        { label: translations.report.maxSpeed, value: 'maxSpeed' },
-        { label: translations.report.vehicle, value: 'subname' }
-      ]
-    : [
-        { label: translations.report.vehicle, value: 'name' },
-        { label: translations.report.date, value: 'date' },
-        { label: translations.report.start, value: 'start' },
-        { label: translations.report.end, value: 'end' },
-        { label: translations.report.endAddress, value: 'endAddress' },
-        { label: translations.report.tripTime, value: 'tripTime' },
-        { label: translations.report.idleTime, value: 'idleTime' },
-        { label: translations.report.stopTime, value: 'stopTime' },
-        { label: translations.report.distance, value: 'distance' },
-        { label: translations.report.avgSpeed, value: 'averageSpeed' },
-        { label: translations.report.maxSpeed, value: 'maxSpeed' },
-        { label: translations.report.driver, value: 'subname' }
-      ]
+
+  const headers = [
+    { label: translations.report.date, value: 'date' },
+    { label: translations.report.start, value: 'start' },
+    { label: translations.report.end, value: 'end' },
+    { label: translations.report.endAddress, value: 'endAddress' },
+    { label: translations.report.tripTime, value: 'tripTime' },
+    { label: translations.report.idleTime, value: 'idleTime' },
+    { label: translations.report.stopTime, value: 'stopTime' },
+    { label: translations.report.distance, value: 'distance' },
+    { label: translations.report.avgSpeed, value: 'averageSpeed' },
+    { label: translations.report.maxSpeed, value: 'maxSpeed' }
+  ]
+
   let data = []
   if (tripsData) {
+    const withFuelData = tripsData.reduce((a, b) => a || b.totalFuelConsumption !== undefined)
+
+    if (withFuelData) {
+      headers.push({ label: translations.report.consumption, value: 'consumption' },
+        { label: translations.report.avg_consumption, value: 'avgConsumption' })
+    }
+
+    if (userData.byDriver) {
+      headers.unshift({ label: translations.report.driver, value: 'name' })
+      headers.push({ label: translations.report.vehicle, value: 'subname' })
+    } else {
+      headers.unshift({ label: translations.report.vehicle, value: 'name' })
+      headers.push({ label: translations.report.driver, value: 'subname' })
+    }
+
     tripsData.forEach(d => {
       data = data.concat([{}])
       data = data.concat(d.trips.map(a => {
@@ -410,6 +426,8 @@ function exportTripReportToExcel (userData, reportData) {
           distance: Number(a.totalKms.toFixed(2)),
           averageSpeed: Math.round(a.averageSpeed * 1.85200),
           maxSpeed: Math.round(a.maxSpeed * 1.85200),
+          consumption: a.fuelConsumption.toFixed(1),
+          avgConsumption: a.avgFuelConsumption.toFixed(1),
           subname: userData.byDriver ? a.deviceName : getDriverName(userData.drivers, a.driverUniqueId)
         }
       }))
@@ -421,7 +439,9 @@ function exportTripReportToExcel (userData, reportData) {
         stopTime: convertMS(d.trips.reduce((a, b) => a + b.stopDuration, 0)),
         distance: getSumTotalKms(userData.user, d.trips),
         averageSpeed: getSumAvgSpeed(d.trips),
-        maxSpeed: getMaxSpeed(d.trips)
+        maxSpeed: getMaxSpeed(d.trips),
+        consumption: parseFloat(d.totalFuelConsumption).toFixed(1),
+        avgConsumption: parseFloat(d.avgFuelConsumption).toFixed(1)
       }])
       data = data.concat([{}])
     })

package/src/util/pdfDocument.js

@@ -25,7 +25,7 @@ async function headerFromUser (doc, title, user, orientation = 'l') {
   return header(doc, title, partner.host, getStyle(partner), orientation)
 }
 
-function addTable (doc, headers, data, footValues, style, startY) {
+function addTable (doc, headers, data, footValues, style, startY, columnStyles = {}) {
   doc.autoTable({
     head: [headers],
     body: data,
@@ -45,7 +45,17 @@ function addTable (doc, headers, data, footValues, style, startY) {
       fillColor: style.pdfFooterColor,
       textColor: style.pdfFooterTextColor,
       fontSize: 9
+
+    },
+    didDrawCell: (data) => {
+      data.table.foot.forEach((footRow) => {
+        const keys = Object.keys(columnStyles)
+        keys.forEach(a => {
+          footRow.cells[a].styles.halign = 'right'
+        })
+      })
     },
+    columnStyles,
     startY
   })
 }