fleetmap-reports 1.0.966 → 1.0.968

package/package.json

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

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' }
     }
   }

package/src/partnerReports/dailyuse-report.js

@@ -5,7 +5,7 @@ const automaticReports = require('../automaticReports')
 const jsPDF = require("jspdf");
 const {getStyle} = require("../reportStyle");
 const {getUserPartner} = require("fleetmap-partners");
-const {addTable} = require("../util/pdfDocument");
+const {addTable, headerFromUser} = require("../util/pdfDocument");
 
 async function createDailyUseReport (from, to, userData, traccar) {
   const reportData = []
@@ -81,7 +81,7 @@ function processDeviceData (allInOne, d, userData) {
   }
 }
 
-function exportDailyUseReportToPDF (userData, reportData) {
+async function exportDailyUseReportToPDF (userData, reportData) {
   const translations = getTranslations(userData)
 
   const headers = [
@@ -131,6 +131,7 @@ function exportDailyUseReportToPDF (userData, reportData) {
   })
 
   const doc = new jsPDF.jsPDF('l')
+  await headerFromUser(doc, 'Rapport de Performance', userData.user)
   const style = getStyle(getUserPartner(userData.user))
 
   const footValues = []

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 = []

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/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)