fleetmap-reports 1.0.938 → 1.0.940

package/package.json

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

package/src/partnerReports/performance-report.js

@@ -2,7 +2,11 @@ const automaticReports = require('../automaticReports')
 const traccarHelper = require('../util/traccar')
 const { getUncompletedTrip } = require('../util/trips')
 const { getEndTripMessages, getCanDriverStyleMessages, parseEndTripMessage, parseCanDriverStyleMessage } = require('../util/xpert')
-const { calculateDistance } = require('../util/utils')
+const { calculateDistance, getTranslations, getLanguage } = require('../util/utils')
+const { addTable } = require('../util/pdfDocument')
+const jsPDF = require('jspdf')
+const { getStyle } = require('../reportStyle')
+const { getUserPartner } = require('fleetmap-partners')
 
 async function createPerformanceReport (from, to, userData, traccar) {
   const reportData = []
@@ -215,7 +219,41 @@ function calculateRPMSections (route, min, max) {
 }
 
 function exportPerformanceReportToPDF (userData, reportData) {
+  const timezone = userData.user.attributes.timezone
+  const translations = getTranslations(userData)
+  const lang = getLanguage(userData)
+
+  const headers = [
+    translations.report.vehicle,
+    'Totale Utilisation',
+    'Conduite',
+    'Ralenti',
+    'Totale (L)',
+    'Conduite (L)',
+    'Ralenti (L)',
+    'Conduite (Km)',
+    'Économique',
+    'Économique (L)',
+    'Économique (Km)',
+    'Cruise Control',
+    'Cruise Control (L)',
+    'Cruise Control (Km)',
+    'Tour moteur élevé',
+    'Accéleration brusque (Sum)',
+    'Freinage brusque (Sum)',
+    'Virages brusque'
+  ]
+
+  const data = []
+  reportData.devices.forEach(d => {
 
+  })
+
+  const doc = new jsPDF.jsPDF('l')
+  const style = getStyle(getUserPartner(userData.user))
+
+  addTable(doc, headers, data, footValues, style)
+  return doc
 }
 
 function exportPerformanceReportToExcel (userData, reportData) {

package/src/util/trips.js

@@ -45,7 +45,7 @@ async function calculatePartialTrip (device, startDate, endDate, route, t, tracc
         route = allInOneData.route
       }
       const routeInside = route.filter(p => new Date(p.fixTime).getTime() < new Date(endDate.toUTCString()).getTime() && new Date(p.fixTime).getTime() > new Date(t.startTime).getTime() && t.deviceId === p.deviceId)
-      updateTrip(t, routeInside)
+      updateTrip(device, t, routeInside)
       t.endTime = endDate.toISOString().replace('Z', '+0000')
       t.endTimeIsOut = true
       isPartialInside = true
@@ -59,7 +59,7 @@ async function calculatePartialTrip (device, startDate, endDate, route, t, tracc
         route = allInOneData.route
       }
       const routeInside = route.filter(p => new Date(p.fixTime).getTime() > startDate.getTime() && new Date(p.fixTime).getTime() < new Date(t.endTime).getTime() && t.deviceId === p.deviceId)
-      updateTrip(t, routeInside)
+      updateTrip(device, t, routeInside)
       t.startTime = startDate.toISOString().replace('Z', '+0000')
       t.startTimeIsOut = true
       isPartialInside = true
@@ -73,7 +73,7 @@ async function calculatePartialTrip (device, startDate, endDate, route, t, tracc
         route = allInOneData.route
       }
       const routeInside = route.filter(p => new Date(p.fixTime).getTime() > new Date(startDate.toUTCString()).getTime() && new Date(p.fixTime).getTime() < new Date(t.endTime).getTime() && t.deviceId === p.deviceId)
-      updateTrip(t, routeInside)
+      updateTrip(device, t, routeInside)
       t.startTime = startDate.toISOString().replace('Z', '+0000')
       t.startTimeIsOut = true
       isPartialInside = true
@@ -87,7 +87,7 @@ async function calculatePartialTrip (device, startDate, endDate, route, t, tracc
         route = allInOneData.route
       }
       const routeInside = route.filter(p => new Date(p.fixTime).getTime() < endDate.getTime() && new Date(p.fixTime).getTime() > new Date(t.startTime).getTime() && t.deviceId === p.deviceId)
-      updateTrip(t, routeInside)
+      updateTrip(device, t, routeInside)
       t.endTime = endDate.toISOString().replace('Z', '+0000')
       t.endTimeIsOut = true
       isPartialInside = true
@@ -138,7 +138,7 @@ function isInsideTimetable (t, userData) {
   return isInside(t.startTime, t.endTime, userData)
 }
 
-function updateTrip (t, route) {
+function updateTrip (device, t, route) {
   if (!route[route.length - 1]) { return }
   route = route.filter(p => p.attributes.ignition)
   const distance = calculateDistance(route, false) * 1000
@@ -146,6 +146,10 @@ function updateTrip (t, route) {
   t.duration = new Date(route[route.length - 1].fixTime).getTime() - new Date(route[0].fixTime).getTime()
   t.maxSpeed = route.reduce((a, b) => Math.max(a, b.speed), 0)
   t.averageSpeed = distance > 0 ? ((route.reduce((a, b) => a + b.speed, 0)) / route.length) : 0
+  t.startOdometer = !device.attributes['report.ignoreOdometer'] && route[0].attributes.odometer ? route[0].attributes.odometer : route[0].attributes.totalDistance
+  t.endOdometer = !device.attributes['report.ignoreOdometer'] && route[route.length - 1].attributes.odometer ? route[route.length - 1].attributes.odometer : route[route.length - 1].attributes.totalDistance
+  console.log('startOdometer', t.startOdometer)
+  console.log('endOdometer', t.endOdometer)
 }
 
 function getUncompletedTrip (device, deviceRoute, deviceTrips) {