fleetmap-reports 1.0.937 → 1.0.939

package/package.json

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

package/src/activity-report.js

@@ -12,7 +12,7 @@ const {
 const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const traccar = require('./util/traccar')
-const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay } = require('./util/trips')
+const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, getKms } = require('./util/trips')
 const { devicesToProcess } = require('./util/device')
 const { getDriverData } = require('./util/driver')
 const { calculateConsumption } = require('./util/fuel')
@@ -178,8 +178,7 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
       const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
       for (const date of dates) {
         const { tripsByDay, routeByDay } = await getDataByDay(d, date, { trips, route: deviceRoute }, userData, traccarInstance)
-
-        const distance = tripsByDay.reduce((a, b) => a + b.distance, 0)
+        const distance = getKms(tripsByDay)
         if (!userData.allWeek && userData.weekDays && userData.dayHours) {
           if (weekDaySelected(date, userData.weekDays)) {
             summary.push({
@@ -222,7 +221,7 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
     } else {
       if (!userData.allWeek && userData.weekDays && userData.dayHours) {
         const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
-        const distance = trips.reduce((a, b) => a + b.distance, 0)
+        const distance = getKms(trips)
         summary.push({
           deviceId: d.id,
           averageSpeed: distance > 0 ? ((trips.reduce((a, b) => a + (b.averageSpeed * b.distance), 0)) / distance) : 0,
@@ -244,7 +243,7 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
         if (summary.length) {
           summary.forEach(s => {
             s.engineHours = deviceTrips.reduce((a, b) => a + b.duration, 0)
-            s.distance = deviceTrips.reduce((a, b) => a + b.distance, 0)
+            s.distance = getKms(deviceTrips)
             s.convertedSpentFuel = calculateConsumption(d, { route: deviceRoute, summary: s })
             s.startTime = deviceTrips.length && deviceTrips[0].startTime
             s.startAddress = deviceTrips.length && deviceTrips[0].startAddress

package/src/kms-report.js

@@ -9,7 +9,7 @@ const { getUserPartner } = require('fleetmap-partners')
 const traccar = require('./util/traccar')
 const { getDates, getTranslations, isClientSide, executeServerSide } = require('./util/utils')
 const drivers = require('./util/driver')
-const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, checkTripsKms } = require('./util/trips')
+const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, checkTripsKms, getKms } = require('./util/trips')
 const traccarHelper = require('./util/traccar')
 const { devicesToProcess } = require('./util/device')
 const { getDriverData } = require('./util/driver')
@@ -178,10 +178,9 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
         const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
         const days = await Promise.all(dates.map(async date => {
           const { tripsByDay } = await getDataByDay(d, date, { trips }, userData, traccarInstance)
-          const odometerKms = tripsByDay.length > 0 ? tripsByDay[tripsByDay.length - 1].endOdometer - tripsByDay[0].startOdometer : 0
           return {
             date,
-            kms: odometerKms > 0 ? odometerKms : tripsByDay.reduce((a, b) => a + b.distance, 0)
+            kms: getKms(tripsByDay)
           }
         }))
 
@@ -193,13 +192,12 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
         })
       }
     } else {
-      const odometerKms = trips.length > 0 ? trips[trips.length - 1].endOdometer - trips[0].startOdometer : 0
       devicesResult.push({
         device: d,
         summary: {
           startOdometer: trips.length ? trips[0].startOdometer : 0,
           endOdometer: trips.length ? trips[trips.length - 1].endOdometer : 0,
-          distance: odometerKms > 0 ? odometerKms : trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
+          distance: getKms(trips)
         }
       })
     }

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
@@ -129,11 +129,16 @@ async function getDataByDay (device, date, data, userData, traccarInstance) {
   return { tripsByDay, routeByDay }
 }
 
+function getKms (trips) {
+  const odometerKms = trips.length > 0 ? trips[trips.length - 1].endOdometer - trips[0].startOdometer : 0
+  return odometerKms > 0 ? odometerKms : trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
+}
+
 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
@@ -141,6 +146,8 @@ 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
 }
 
 function getUncompletedTrip (device, deviceRoute, deviceTrips) {
@@ -199,6 +206,7 @@ exports.checkTripsKms = checkTripsKms
 exports.isInsideTimetable = isInsideTimetable
 exports.isPartialInsideTimetable = isPartialInsideTimetable
 exports.getDataByDay = getDataByDay
+exports.getKms = getKms
 exports.calculatePartialTrip = calculatePartialTrip
 exports.calculateTrip = calculateTrip
 exports.getTripIdleTime = getTripIdleTime