fleetmap-reports 1.0.814 → 1.0.816

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.814",
+  "version": "1.0.816",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -20,7 +20,7 @@
     "file-saver": "^2.0.5",
     "fleetmap-partners": "^1.0.76",
     "json-as-xlsx": "^1.2.1",
-    "jspdf": "^2.3.1",
+    "jspdf": "^2.5.1",
     "jspdf-autotable": "^3.5.14",
     "moment": "^2.29.4",
     "tough-cookie": "^4.0.0",

package/src/activity-report.js

@@ -59,7 +59,6 @@ async function createActivityReportByGroup (from, to, userData, traccarInstance)
       devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
       if (summary.length > 0) {
-        console.log('Summary:' + summary.length)
         groupData.devices = processDevices(from, to, devices, { summary, trips }, userData)
 
         reportData.push(groupData)
@@ -85,6 +84,7 @@ async function executeServerSide (allData, sliced, from, to, userData, totalDevi
 }
 
 async function createActivityReportByDevice (from, to, userData, traccarInstance) {
+  console.log('createActivityReportByDevice')
   const allDevices = devicesToProcess(userData)
 
   const allData = {
@@ -120,23 +120,36 @@ async function createActivityReportByDevice (from, to, userData, traccarInstance
 }
 
 async function createActivityReportByDriver (from, to, userData, traccarInstance) {
-  const devices = await traccarInstance.devices.devicesGet().then(d => d.data)
-
-  let tripsData = []
-  let routeData = []
-  if (devices.length > 0) {
-    const allInOne = await traccar.getAllInOne(traccarInstance, from, to, devices, true, true, false, false)
-    tripsData = allInOne.trips
-    routeData = allInOne.route
-  }
+  console.log('createActivityReportByDriver')
+  const allDevices = await traccarInstance.devices.devicesGet().then(d => d.data)
 
   const allData = {
     drivers: [],
     from,
     to
   }
+  const driversData = new Map()
+
+  let deviceCount = 0
+  const sliced = automaticReports.sliceArray(allDevices, 10)
+  for (const devices of sliced) {
+    const data = await traccar.getAllInOne(traccarInstance, from, to, devices, true, true, false, false, deviceCount, allDevices.length)
+
+    userData.drivers.forEach(d => {
+      const { trips, route } = getDriverData(d, data)
+      let driverData = driversData.get(d.id)
+      if (!driverData) {
+        driverData = { trips: [], route: [] }
+        driversData.set(d.id, driverData)
+      }
+      driverData.trips = driverData.trips.concat(...(trips || []))
+      driverData.route = driverData.route.concat(...(route || []))
+    })
+
+    deviceCount += devices.length
+  }
 
-  allData.drivers = processDrivers(from, to, userData.drivers, { trips: tripsData, route: routeData }, userData)
+  allData.drivers = processDrivers(from, to, userData.drivers, driversData, userData)
 
   return allData
 }
@@ -253,10 +266,10 @@ function processDevices (from, to, devices, data, userData) {
   return devicesResult
 }
 
-function processDrivers (from, to, drivers, data, userData) {
+function processDrivers (from, to, drivers, driversData, userData) {
   const driversResult = []
   drivers.forEach(d => {
-    const { route, trips } = getDriverData(d, data)
+    const { trips, route } = driversData.get(d.id)
     trips.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
     if (trips.length > 0) {
       const driverData = {
@@ -526,7 +539,6 @@ function exportActivityReportToExcelVehicleGroupByDay (settings, translations, r
         }
       }))
     })
-    console.log(data)
     return {
       headers,
       data,
@@ -651,7 +663,6 @@ function exportActivityReportToExcelDriverGroupByDay (settings, translations, re
         }
       }))
     })
-    console.log(data)
     return {
       headers,
       data,
@@ -682,7 +693,6 @@ function exportActivityReportToExcelDriver (settings, translations, reportData)
         engineHours: convertMS(d.summary[0].engineHours)
       }])
     })
-    console.log(data)
     return {
       headers,
       data,
@@ -725,7 +735,6 @@ function exportActivityReportToExcelVehicle (settings, translations, reportData,
         }])
       }
     })
-    console.log(data)
     return {
       headers,
       data,

package/src/util/pdfDocument.js

@@ -1,16 +1,16 @@
 require('jspdf-autotable')
 const { getStyle } = require('../reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
-const { getImgFromUrl } = require('./utils')
+const { getLogoUrl } = require('./utils')
 
-async function header (doc, title, hostname, style, orientation) {
+function header (doc, title, hostname, style, orientation) {
   doc.setFontSize(16)
   doc.setFont('helvetica', 'bold')
   doc.text(title, 15, 15)
 
   if (style.imgWidth && style.imgHeight) {
     try {
-      const image = await getImgFromUrl(hostname)
+      const image = getLogoUrl(hostname)
       if (image) {
         doc.addImage(image, 'PNG', (orientation === 'l' ? 220 : 135) + (style.imgWidth < 50 ? 25 : 0), 5, style.imgWidth, style.imgHeight)
       }

package/src/util/utils.js

@@ -253,3 +253,4 @@ exports.calculateDistance = (positions) => {
 }
 
 exports.sortPositions = (a, b) => new Date(a.fixTime).getTime() - new Date(b.fixTime).getTime()
+exports.getLogoUrl = getLogoUrl