fleetmap-reports 1.0.967 → 1.0.969

package/package.json

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

package/src/partnerReports/dailyuse-report.js

@@ -1,11 +1,11 @@
 const traccarHelper = require('../util/traccar')
 const { isInsideTimetable } = require('../util/trips')
-const { convertFromUTCDate, getTranslations, convertMS} = require('../util/utils')
+const { convertFromUTCDate, getTranslations, convertMS } = require('../util/utils')
 const automaticReports = require('../automaticReports')
-const jsPDF = require("jspdf");
-const {getStyle} = require("../reportStyle");
-const {getUserPartner} = require("fleetmap-partners");
-const {addTable, headerFromUser} = require("../util/pdfDocument");
+const jsPDF = require('jspdf')
+const { getStyle } = require('../reportStyle')
+const { getUserPartner } = require('fleetmap-partners')
+const { addTable, headerFromUser } = require('../util/pdfDocument')
 
 async function createDailyUseReport (from, to, userData, traccar) {
   const reportData = []

package/src/partnerReports/performance-report.js

@@ -3,10 +3,11 @@ const traccarHelper = require('../util/traccar')
 const { getUncompletedTrip } = require('../util/trips')
 const { getEndTripMessages, getCanDriverStyleMessages, parseEndTripMessage, parseCanDriverStyleMessage } = require('../util/xpert')
 const { calculateDistance, getTranslations, convertMS } = require('../util/utils')
-const { addTable, headerFromUser} = require('../util/pdfDocument')
+const { addTable, headerFromUser } = require('../util/pdfDocument')
 const jsPDF = require('jspdf')
 const { getStyle } = require('../reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
+const { calculateConsumption } = require('../util/fuel')
 
 async function createPerformanceReport (from, to, userData, traccar) {
   const reportData = []
@@ -138,7 +139,7 @@ function getDeviceData (allInOne, d) {
     const deviceStops = allInOne.stops.filter(t => t.deviceId === d.id)
 
     const drivingTime = deviceTrips.reduce((a, b) => a + b.duration, 0)
-    const drivingConsumption = deviceTrips.reduce((a, b) => a + b.spentFuel, 0)
+    const drivingConsumption = calculateConsumption(d, { trips: [], stops: [], route: [], summary: deviceSummary }, undefined)
     const drivingDistance = deviceSummary ? deviceSummary.distance / 1000 : 0
     const idleTime = deviceTrips.reduce((a, b) => a + b.idleTime, 0) + deviceStops.reduce((a, b) => a + b.engineHours, 0)
     const idleConsumption = deviceSummary && deviceSummary.spentFuel > drivingConsumption ? deviceSummary.spentFuel - drivingConsumption : 0

package/src/temperature-report.js

@@ -0,0 +1,11 @@
+const traccarHelper = require('./util/traccar')
+const { devicesToProcess } = require('./util/device')
+
+async function createTemperatureReport (from, to, userData, traccar) {
+  const devices = devicesToProcess(userData)
+
+  const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, false, false, false)
+  const routeData = allInOne.route
+
+
+}