fleetmap-reports 1.0.965 → 1.0.967

package/package.json

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

package/src/fuelconsumption-report.js

@@ -54,7 +54,7 @@ async function createFuelConsumptionReport (from, to, userData, traccar) {
 
         const odooAvgConsumption = useOdooFuelData(d, route) ? getOdooAvgConsumption(date, refuelingPositions, trips) : 0
         const distance = summaryByDevice.distance
-        const spentFuel = calculateConsumption(d, { trips: tripsByDay, stops: [], route: routeByDay }, odooAvgConsumption)
+        const spentFuel = calculateConsumption(d, { trips: tripsByDay, stops: [], route: routeByDay, summary: summaryByDevice }, odooAvgConsumption)
 
         const dataRow = {
           date,

package/src/index.js

@@ -19,6 +19,7 @@ function Reports (config, axios, cookieJar) {
       drivers: await this.traccar.drivers.driversGet().then(d => d.data),
       geofences: await this.traccar.geofences.geofencesGet().then(d => d.data),
       byGroup: false,
+      allWeek: true,
       dayHours: { startTime: '00:00', endTime: '23:59' }
     }
   }
@@ -193,5 +194,15 @@ function Reports (config, axios, cookieJar) {
   this.performanceReportToExcel = (userData, reportData) => {
     return require('./partnerReports/performance-report').exportPerformanceReportToExcel(userData, reportData)
   }
+
+  this.dailyUseReport = (from, to, userData) => {
+    return require('./partnerReports/dailyuse-report').createDailyUseReport(from, to, userData, this.traccar)
+  }
+  this.dailyUseReportToPDF = (userData, reportData) => {
+    return require('./partnerReports/dailyuse-report').exportDailyUseReportToPDF(userData, reportData)
+  }
+  this.dailyUseReportToExcel = (userData, reportData) => {
+    return require('./partnerReports/dailyuse-report').exportDailyUseReportToExcel(userData, reportData)
+  }
 }
 module.exports = Reports

package/src/partnerReports/dailyuse-report.js

@@ -1,7 +1,11 @@
 const traccarHelper = require('../util/traccar')
 const { isInsideTimetable } = require('../util/trips')
-const { convertFromUTCDate } = 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");
 
 async function createDailyUseReport (from, to, userData, traccar) {
   const reportData = []
@@ -77,4 +81,78 @@ function processDeviceData (allInOne, d, userData) {
   }
 }
 
+async function exportDailyUseReportToPDF (userData, reportData) {
+  const translations = getTranslations(userData)
+
+  const headers = [
+    translations.report.vehicle,
+    '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.forEach(d => {
+    const row = [
+      d.device,
+      convertMS((d.drivingTime + d.idleTime) * 1000),
+      convertMS(d.drivingTime * 1000),
+      convertMS(d.idleTime * 1000),
+      d.drivingConsumption + d.idleConsumption,
+      d.drivingConsumption,
+      d.idleConsumption,
+      d.drivingDistance.toFixed(2),
+      convertMS(d.economicTime * 1000),
+      d.economicConsumption.toFixed(1),
+      d.economicDistance.toFixed(2),
+      convertMS(d.cruiseControlTime * 1000),
+      d.cruiseControlConsumption.toFixed(1),
+      d.cruiseControlDistance.toFixed(2),
+      convertMS(d.highEngineRPM * 1000),
+      d.hardAcceleration,
+      d.hardBraking,
+      d.hardCornering
+    ]
+    data.push(row)
+  })
+
+  const doc = new jsPDF.jsPDF('l')
+  await headerFromUser(doc, 'Rapport de Performance', userData.user)
+  const style = getStyle(getUserPartner(userData.user))
+
+  const footValues = []
+
+  doc.setFontSize(11)
+  doc.text(new Date(userData.from).toLocaleString() + ' - ' + new Date(userData.to).toLocaleString(), 20, 33)
+
+  style.headerFontSize = 8
+  style.bodyFontSize = 7
+  const columnStyles = {}
+  for (let i = 1; i < 18; i++) {
+    columnStyles[i] = { halign: 'right' }
+  }
+  addTable(doc, headers, data, footValues, style, 40, columnStyles)
+  return doc
+}
+
+function exportDailyUseReportToExcel (userData, reportData) {
+
+}
+
 exports.createDailyUseReport = createDailyUseReport
+exports.exportDailyUseReportToPDF = exportDailyUseReportToPDF
+exports.exportDailyUseReportToExcel = exportDailyUseReportToExcel

package/src/partnerReports/performance-report.js

@@ -3,7 +3,7 @@ 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 } = require('../util/pdfDocument')
+const { addTable, headerFromUser} = require('../util/pdfDocument')
 const jsPDF = require('jspdf')
 const { getStyle } = require('../reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
@@ -218,7 +218,7 @@ function calculateRPMSections (route, min, max) {
   return sections
 }
 
-function exportPerformanceReportToPDF (userData, reportData) {
+async function exportPerformanceReportToPDF (userData, reportData) {
   const translations = getTranslations(userData)
 
   const headers = [
@@ -268,6 +268,8 @@ function exportPerformanceReportToPDF (userData, reportData) {
   })
 
   const doc = new jsPDF.jsPDF('l')
+  await headerFromUser(doc, 'Rapport de Performance', userData.user)
+
   const style = getStyle(getUserPartner(userData.user))
 
   const footValues = []
@@ -314,7 +316,7 @@ function exportPerformanceReportToExcel (userData, reportData) {
 
   let data = []
   data = data.concat([{}])
-  /*data = data.concat(reportData.map(d => {
+  data = data.concat(reportData.map(d => {
     return {
       name: d.device,
       totalUse: convertMS((d.drivingTime + d.idleTime) * 1000),
@@ -323,21 +325,19 @@ function exportPerformanceReportToExcel (userData, reportData) {
       totalConsumption: d.drivingConsumption + d.idleConsumption,
       drivingConsumption: d.drivingConsumption,
       idleConsumption: d.idleConsumption,
-      drivingDistance: d.drivingDistance,
+      drivingDistance: Number(d.drivingDistance.toFixed(2)),
       economicTime: convertMS(d.economicTime * 1000),
-      economicConsumption: d.economicConsumption,
-      economicDistance: d.economicDistance,
+      economicConsumption: Number(d.economicConsumption.toFixed(1)),
+      economicDistance: Number(d.economicDistance.toFixed(2)),
       cruiseControlTime: convertMS(d.cruiseControlTime * 1000),
-      cruiseControlConsumption: d.cruiseControlConsumption,
-      cruiseControlDistance: d.cruiseControlDistance,
+      cruiseControlConsumption: Number(d.cruiseControlConsumption.toFixed(1)),
+      cruiseControlDistance: Number(d.cruiseControlDistance.toFixed(2)),
       highEngineRPM: d.highEngineRPM,
       hardAcceleration: d.hardAcceleration,
       hardBraking: d.hardBraking,
       hardCornering: d.hardCornering
     }
-  }))*/
-
-  console.log(data)
+  }))
 
   return {
     headers,

package/src/tests/activity.test.js

@@ -35,8 +35,8 @@ describe('activity report', function () {
     const report = await getReports()
     const userData = await report.getUserData()
     userData.groupByDay = true
-    const data = await report.activityReport(new Date(2022, 0, 1, 0, 0, 0, 0),
-      new Date(2022, 0, 20, 23, 59, 59, 0),
+    const data = await report.activityReport(new Date(2023, 9, 1, 0, 0, 0, 0),
+      new Date(2023, 9, 20, 23, 59, 59, 0),
       userData)
     assert.equal(data.length, 1)
     const device = data[0].devices.find(d => d.device.id === 22326)

package/src/tests/index.js

@@ -16,7 +16,7 @@ axiosCookieJarSupport(axios)
 
 const getReports = async (email, password) => {
   try {
-    // console.log('email / pass', process.env.email || email, process.env.password || password)
+    console.log('email / pass', process.env.email || email, process.env.password || password)
     await new SessionApi(traccarConfig, null, axios).sessionPost(email || process.env.email, password || process.env.password)
     return new Index(traccarConfig, axios, cookieJar)
   } catch (e) {

package/src/tests/performance.test.js

@@ -1,7 +1,9 @@
 const { getReports } = require('./index')
-const { createPerformanceReport } = require('../partnerReports/performance-report')
+const { createPerformanceReport, exportPerformanceReportToExcel } = require('../partnerReports/performance-report')
 const assert = require('assert')
 const { convertMS } = require('../util/utils')
+const xlsx = require("@jcardus/json-as-xlsx");
+
 // eslint-disable-next-line no-undef
 describe('performance', function () {
   // eslint-disable-next-line no-undef
@@ -15,9 +17,10 @@ describe('performance', function () {
       userData,
       report.traccar)
     console.log(data)
+
     assert.equal(data[0].consumption, 19.799999999999997)
-    assert.equal(data[0].distance, 326.7657)
-    assert.equal(convertMS(data[1].time * 1000, false), '08:19')
+    assert.equal(data[0].distance, 326.8844199999999)
+    assert.equal(convertMS(data[1].time * 1000, false), '08:31')
   }, 8000000)
 
   // eslint-disable-next-line no-undef
@@ -33,4 +36,21 @@ describe('performance', function () {
     console.log(data)
     assert.equal(data[0].consumption, 168.51989999999998)
   }, 8000000)
+
+  it('performance report export excel', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    const data = await createPerformanceReport(
+      new Date(Date.UTC(2023, 6, 1, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 6, 17, 23, 59, 59, 0)),
+      userData,
+      report.traccar)
+    console.log(data)
+    const excel = exportPerformanceReportToExcel(userData, data)
+    xlsx([{
+      sheet: 'Sheet1',
+      columns: excel.headers,
+      content: excel.data
+    }], excel.settings)
+  }, 8000000)
 })

package/src/util/trips.js

@@ -118,9 +118,8 @@ async function getDataByDay (device, date, data, userData, traccarInstance) {
 
   const tripsByDay = []
   if (data.trips) {
-    tripsByDay.concat(data.trips.filter(t => new Date(t.endTime) > startDate && new Date(t.startTime) < endDate).map(t => {
-      return { ...t }
-    }))
+    const filteredTrips = data.trips.filter(t => new Date(t.endTime) > startDate && new Date(t.startTime) < endDate)
+    tripsByDay.push(...filteredTrips.map(t => { return { ...t } }))
 
     for (const t of tripsByDay) {
       await calculatePartialTrip(device, startDate, endDate, data.route, t, traccarInstance)

package/src/zone-report.js

@@ -110,8 +110,6 @@ async function processDevices (from, to, devices, userData, data) {
           const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
           const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
 
-          console.log(startDate, endDate)
-
           const { routeByDay, zoneInOutDayData } = await getDataByDay(d, date, { route: deviceRoute, zoneInOutData: filteredByGeofence }, userData)
 
           const firstIn = zoneInOutDayData.find(z => z.inTime && new Date(z.inTime.fixTime) > startDate)
@@ -147,8 +145,6 @@ async function processDevices (from, to, devices, userData, data) {
           const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
           const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
 
-          console.log(startDate, endDate)
-
           const { routeByDay, zoneInOutDayData } = await getDataByDay(d, date, { route: deviceRoute, zoneInOutData }, userData)
 
           const distanceOut = calculateDistanceOut(zoneInOutDayData, routeByDay, startDate, endDate, 'distanceOutAny', d)