fleetmap-reports 1.0.368 → 1.0.371

package/package.json

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

package/src/automaticReports.js

@@ -1,9 +1,8 @@
 const moment = require('moment')
 
-function sliceArray(longArray) {
+function sliceArray(longArray,  size = 1) {
     const arrayToSlice = longArray.slice()
 
-    const size = 1
     const arrayOfArrays = []
     for (let i=0; i<arrayToSlice.length; i+=size) {
         arrayOfArrays.push(arrayToSlice.slice(i,i+size));

package/src/index.test.js

@@ -130,6 +130,18 @@ describe('Test_Reports', function() {
         const device = data[0].devices.find(d => d.device.id===22326)
         assert.equal(device.positions.length, 708)  // Total Positions
     },20000)
+    it('Location by driver', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
+        userData.byDriver=true
+        const data = await report.locationReport(new Date(2021, 11, 6, 0, 0, 0, 0),
+            new Date(2021, 11, 9, 23, 59, 59, 0),
+            userData)
+
+        assert.equal(data.length, 1)
+        const driver = data[0].drivers.find(d => d.driver.id===14020)
+        assert.equal(driver.positions.length, 85)  // Total Positions
+    },20000)
     it('KmsReport by device', async () => {
         const reports = await getReports()
         const userData = await reports.getUserData()

package/src/kms-report.js

@@ -9,6 +9,7 @@ const {getDates, convertFromUTC} = require("./util/utils")
 const trips = require("./util/trips")
 const drivers = require("./util/driver")
 const { isInsideTimetable, isPartialInsideTimetable, calculateTrip} = require("./util/trips")
+const traccarHelper = require("./util/traccar");
 
 const fileName = 'KmsReport'
 
@@ -46,14 +47,15 @@ async function createKmsReportByDevice(from, to, userData, traccarInstance) {
     }
 
     devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
-    const route = await traccar.getRoute(traccarInstance, from, to, devicesToProcess)
-    const tripsData = await traccar.getTrips(traccarInstance, from, to, devicesToProcess)
+    const allInOne =  await traccarHelper.getAllInOne(traccarInstance, from, to, devicesToProcess, true, true, false, false)
+    const tripsData = allInOne.trips
+    const routeData = allInOne.route
 
     console.log('trips:' + tripsData.length)
 
     if (tripsData.length > 0) {
-        trips.checkTripsKms(traccarInstance, from, to, devicesToProcess, {trips: tripsData, route: route})
-        allData.devices = processDevices(from, to, devicesToProcess, {trips: tripsData, route: route}, userData)
+        trips.checkTripsKms(traccarInstance, from, to, devicesToProcess, {trips: tripsData, route: routeData})
+        allData.devices = processDevices(from, to, devicesToProcess, {trips: tripsData, route: routeData}, userData)
     }
 
     return allData
@@ -68,8 +70,10 @@ async function createKmsReportByDriver(from, to, userData, traccarInstance) {
         return { drivers: [] }
     }
 
-    const tripsData = await traccar.getTrips(traccarInstance, from, to, devices)
-    const routeData = await traccar.getRoute(traccarInstance, from, to, devices)
+    const allInOne =  await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, true, false, false)
+    const tripsData = allInOne.trips
+    const routeData = allInOne.route
+
 
     return { drivers: processDrivers(from, to, userData, {trips: tripsData, route: routeData}) }
 }

package/src/location-report.js

@@ -1,46 +1,84 @@
-const automaticReports = require("./automaticReports");
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
 const {headerFromUser} = require("./util/pdfDocument");
 const {getStyle} = require("./reportStyle")
 const {getUserPartner} = require("fleetmap-partners");
 const {convertToLocaleString, getTranslations} = require("./util/utils");
+const traccarHelper = require("./util/traccar");
 
 const fileName = 'LocationReport'
 
 async function createLocationReport(from, to, userData, traccar) {
     console.log('Create LocationReport')
-
     const reportData = []
 
-    if(userData.byGroup) {
+    if (userData.byDriver) {
+        console.log("ByDriver")
+        const report = await createLocationReportByDriver(from, to, userData, traccar)
+        reportData.push(report)
+    }
+    else if (userData.byGroup) {
         console.log("ByGroup")
-        for (const g of userData.groups) {
-            const devices = userData.devices.filter(d => d.groupId === g.id)
-
-            if(devices.length > 0) {
-                const groupData = {
-                    devices: [],
-                    group: g,
-                    xpert: devices.filter(d => d.attributes.xpert).length > 0
-                }
+        const allData = await createLocationReportByGroup(from, to, userData, traccar)
+        reportData.push(...allData)
+    } else {
+        console.log("ByDevice")
+        const report = await createLocationReportByDevice(from, to, userData, traccar)
+        reportData.push(report)
+    }
 
-                const response = await traccar.reports.reportsRouteGet(from, to,  null, [g.id])
-                const data = response.data
+    return reportData
+}
 
-                devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
+async function createLocationReportByDriver(from, to, userData, traccar) {
+    const devices = await traccar.devices.devicesGet().then(d => d.data)
+    console.log(devices.length)
 
-                if (data.length > 0) {
+    if(!devices.length){
+        //Empty report
+        return { drivers:[] }
+    }
 
-                    console.log('Locations:'+data.length)
-                    groupData.devices = processDevices(from, to, devices, userData.drivers, data)
+    const allInOne =  await traccarHelper.getAllInOne(traccar, from, to, devices, true, false, false, false)
+    const routeData = allInOne.route
 
-                    reportData.push(groupData)
-                }
+    return { drivers: processDrivers(from, to, userData, routeData)}
+}
+
+async function createLocationReportByGroup(from, to, userData, traccar) {
+    const reportData = []
+
+    for (const g of userData.groups) {
+        const devices = userData.devices.filter(d => d.groupId === g.id)
+
+        if(devices.length > 0) {
+            const groupData = {
+                devices: [],
+                group: g,
+                xpert: devices.filter(d => d.attributes.xpert).length > 0
+            }
+
+            const response = await traccar.reports.reportsRouteGet(from, to,  null, [g.id])
+            const data = response.data
+
+            devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
+
+            if (data.length > 0) {
+                console.log('Locations:'+data.length)
+                groupData.devices = processDevices(from, to, devices, userData.drivers, data)
+
+                reportData.push(groupData)
             }
         }
     }
 
+    const allData = await createLocationReportByDevice(from, to, userData, traccar)
+    reportData.push(allData)
+
+    return reportData
+}
+
+async function createLocationReportByDevice(from, to, userData, traccar) {
     const groupIds = userData.groups.map(g => g.id)
     const withoutGroupDevices = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
 
@@ -51,28 +89,16 @@ async function createLocationReport(from, to, userData, traccar) {
 
     withoutGroupDevices.sort((a, b) => (a.name > b.name) ? 1 : -1)
     const devicesToSlice = withoutGroupDevices.slice()
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devicesToSlice, true, false, false, false)
+    const routeData = allInOne.route
 
-    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
-    let data = []
-    let i = 0
-    for (const a of arrayOfArrays) {
-        console.log(`PROGRESS_PERC:${++i/arrayOfArrays.length*100}`)
-        console.log('LOADING_MESSAGE:' + a.map(d => d.name).join(', '))
-        const response = await traccar.reports.reportsRouteGet(from, to, a.map(d => d.id))
-        data = data.concat(response.data)
-    }
-
-    console.log('Locations:'+data.length)
+    console.log('Locations:'+routeData.length)
 
-    if(data.length === 0) {
-        return reportData
+    if(routeData.length > 0) {
+        allData.devices = processDevices(from, to, withoutGroupDevices, userData.drivers, routeData)
     }
 
-    allData.devices = processDevices(from, to, withoutGroupDevices, userData.drivers, data)
-
-    reportData.push(allData)
-
-    return reportData
+    return allData
 }
 
 function processDevices(from, to, devices, drivers, data) {
@@ -103,6 +129,34 @@ function processDevices(from, to, devices, drivers, data) {
     return devicesResult
 }
 
+function processDrivers(from, to, userData, route) {
+    const driversResult = []
+    userData.drivers.forEach(d => {
+        const positions = route.filter(p => p.attributes.driverUniqueId === d.uniqueId)
+        if (positions.length > 0) {
+            positions.sort((a,b)=>new Date(a.fixTime).getTime()-new Date(b.fixTime).getTime());
+
+            positions.forEach(p => {
+                const device = userData.devices.find(d => d.id === p.deviceId)
+                if(device){
+                    p.vehicleName = device.name
+                }
+            })
+
+            const driverData = {
+                driver: d,
+                from: from,
+                to: to,
+                positions: positions,
+            }
+            driversResult.push(driverData)
+        }
+    })
+    console.log(driversResult)
+
+    return driversResult
+}
+
 async function exportLocationReportToPDF(userData, reportData) {
     console.log('Export to PDF')
 
@@ -110,7 +164,16 @@ async function exportLocationReportToPDF(userData, reportData) {
     const lang = userData.user.attributes.lang || (navigator && navigator.language)
     const timezone = userData.user.attributes.timezone
 
-    const headers = [
+    const positionsData = userData.byDriver ? reportData.drivers : reportData.devices
+
+    const headers = userData.byDriver ? [
+        translations.report.date,
+        translations.report.address,
+        translations.report.speed,
+        translations.report.ignition,
+        translations.report.vehicle,
+        translations.report.temperature
+    ] : [
         translations.report.date,
         translations.report.address,
         translations.report.speed,
@@ -119,15 +182,15 @@ async function exportLocationReportToPDF(userData, reportData) {
         translations.report.temperature
     ]
 
-    if (reportData.devices) {
+    if (positionsData) {
         let first = true
         const doc = new jsPDF.jsPDF('l');
         await headerFromUser(doc, translations.report.titleLocationReport, userData.user)
 
-        reportData.devices.forEach(d => {
+        positionsData.forEach(d => {
             let data = []
-            const name = deviceName(d.device)
-            const group = deviceGroupName(userData.groups, d.device, translations)
+            const name = userData.byDriver ? d.driver.name : deviceName(d.device)
+            const group = userData.byDriver ? '' : deviceGroupName(userData.groups, d.device, translations)
 
             let space = 0
             if (!first) {
@@ -147,7 +210,7 @@ async function exportLocationReportToPDF(userData, reportData) {
                     a.address,
                     Math.round(a.speed * 1.85200),
                     a.attributes.ignition ? translations.report.ignitionOn : translations.report.ignitionOff,
-                    getDriverName(a, userData.drivers),
+                    userData.byDriver ? a.vehicleName : getDriverName(a, userData.drivers),
                     getTempValue(a)
                 ]
                 data.push(temp)
@@ -199,11 +262,21 @@ function exportLocationReportToExcel(userData, reportData) {
 
     const translations = getTranslations(userData)
 
+    const positionsData = userData.byDriver ? reportData.drivers : reportData.devices
+
     const settings = {
         sheetName: translations.report.titleLocationReport, // The name of the sheet
         fileName: fileName, // The name of the spreadsheet
     }
-    const headers = [
+    const headers = userData.byDriver ? [
+        {label: translations.report.driver, value:'driver'},
+        {label: translations.report.date, value:'date'},
+        {label: translations.report.address, value:'address'},
+        {label: translations.report.speed, value:'speed'},
+        {label: translations.report.ignition, value:'ignition'},
+        {label: translations.report.vehicle, value:'name'},
+        {label: translations.report.temperature, value:'temperature'}
+    ] : [
         {label: translations.report.vehicle, value:'name'},
         {label: translations.report.group, value:'group'},
         {label: translations.report.date, value:'date'},
@@ -214,17 +287,17 @@ function exportLocationReportToExcel(userData, reportData) {
         {label: translations.report.temperature, value:'temperature'}
     ]
     let data = []
-    if (reportData.devices) {
-        reportData.devices.forEach(d => {
+    if (positionsData) {
+        positionsData.forEach(d => {
             data = data.concat(d.positions.map(a => {
                 return {
-                    name: d.device.name,
-                    group: deviceGroupName(userData.groups, d.device),
+                    name: userData.byDriver ? a.vehicleName : d.device.name,
+                    group: userData.byDriver ? '' : deviceGroupName(userData.groups, d.device),
                     date: getLocationDate(a, userData.user),
                     address: a.address,
                     speed: Math.round(a.speed * 1.85200),
                     ignition: a.attributes.ignition ? translations.report.ignitionOn : translations.report.ignitionOff,
-                    driver: getDriverName(a, userData.drivers),
+                    driver: userData.byDriver ? d.driver.name : getDriverName(a, userData.drivers),
                     temperature: getTempValue(a)
                 }
             }))

package/src/util/traccar.js

@@ -74,15 +74,18 @@ async function getAllInOne(traccar, from, to, devices, getRoutes, getTrips, getS
     if(getSummary) url += `&type=summary`
     console.log('LOADING_MESSAGE:' + devices.map(d => d.name).join(', '))
 
-    const sliced = automaticReports.sliceArray(devices)
+    const sliced = automaticReports.sliceArray(devices, 50)
     let deviceCount = 0
-    const requests = sliced.map(a =>
-        traccar.axios.get(url + '&' + a.map(d => `deviceId=${d.id}`).join('&')).then(r => r.data).then(x => {
-            console.log('LOADING_MESSAGE:' + a.map(d => d.name).join(', '))
-            console.log(`PROGRESS_PERC:${++deviceCount/sliced.length*100}`)
-            return x
-        }))
-    const result = await Promise.all(requests)
+    const result = []
+    for(const chunk of sliced) {
+        const requests = chunk.map(d =>
+            traccar.axios.get(url + '&' + `deviceId=${d.id}`).then(r => r.data).then(x => {
+                console.log('LOADING_MESSAGE:' + d.name)
+                console.log(`PROGRESS_PERC:${++deviceCount / devices.length * 100}`)
+                return x
+            }))
+        result.push(...(await Promise.all(requests)))
+    }
     return {
         route: result.filter(t => t.route).map(r => r.route).flat(),
         trips: result.filter(t => t.trips).map(r => r.trips).flat(),