fleetmap-reports 1.0.409 → 1.0.412

package/.eslintrc.js

@@ -0,0 +1,15 @@
+module.exports = {
+  env: {
+    browser: true,
+    commonjs: true,
+    es2021: true
+  },
+  extends: [
+    'standard'
+  ],
+  parserOptions: {
+    ecmaVersion: 'latest'
+  },
+  rules: {
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.409",
+  "version": "1.0.412",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -32,7 +32,7 @@
     "eslint": "^8.15.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-n": "^15.2.0",
+    "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
     "jest": "^27.5.0",
     "mocha": "^9.0.3",

package/src/idle-report.js

@@ -1,280 +1,350 @@
-const traccar = require("./util/traccar");
-const jsPDF = require("jspdf");
-const {headerFromUser, AmiriRegular} = require("./util/pdfDocument");
-const {convertToLocaleString, convertMS, getTranslations} = require("./util/utils");
-const {getStyle} = require("./reportStyle");
-const {getUserPartner} = require("fleetmap-partners");
-const {devicesToProcess} = require("./util/device");
+const jsPDF = require('jspdf')
+const { headerFromUser, AmiriRegular } = require('./util/pdfDocument')
+const { convertToLocaleString, convertMS, getTranslations } = require('./util/utils')
+const { getStyle } = require('./reportStyle')
+const { getUserPartner } = require('fleetmap-partners')
+const { devicesToProcess } = require('./util/device')
+const automaticReports = require('./automaticReports')
+const traccarHelper = require('./util/traccar')
 
 const fileName = 'IdleReport'
 
-async function createIdleReport(from, to, userData, traccarInstance) {
-    console.log('Create IdleReport')
-    const reportData = []
-
-    if (userData.byGroup) {
-        console.log("ByGroup")
-        const allData = await createTripReportByGroup(from, to, userData, traccarInstance)
-        reportData.push(...allData)
-    } else {
-        console.log("ByDevice")
-        const report = await createTripReportByDevice(from, to, userData, traccarInstance)
-        reportData.push(report)
-    }
-
-    return reportData
+async function createIdleReport (from, to, userData, traccarInstance) {
+  console.log('Create IdleReport')
+  const reportData = []
+
+  if (userData.byDriver) {
+    console.log('ByDriver')
+    const report = await createIdleReportByDriver(from, to, userData, traccarInstance)
+    reportData.push(report)
+  } else if (userData.byGroup) {
+    console.log('ByGroup')
+    const allData = await createIdleReportByGroup(from, to, userData, traccarInstance)
+    reportData.push(...allData)
+  } else {
+    console.log('ByDevice')
+    const report = await createIdleReportByDevice(from, to, userData, traccarInstance)
+    reportData.push(report)
+  }
+
+  return reportData
 }
 
-async function createTripReportByGroup(from, to, userData, traccarInstance) {
-    const reportData = []
-    for (const g of userData.groups) {
-        const devices = userData.devices.filter(d => d.groupId === g.id)
-        console.log(g.name + ' devices:' + devices.length)
-        if(devices.length > 0) {
-            const groupData = {
-                devices: [],
-                group: g,
-                from: from,
-                to: to
-            }
-
-            const response = await traccarInstance.reports.reportsRouteGet(from, to,  null, [g.id])
-            const routes = response.data
-
-            devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
-
-            if (routes.length > 0) {
-                console.log('Routes:' + routes.length)
-                groupData.devices = processDevices(from, to, devices, routes, userData)
-
-                reportData.push(groupData)
-            }
-        }
-    }
+async function createIdleReportByDriver (from, to, userData, traccarInstance) {
+  const devices = await traccarInstance.devices.devicesGet().then(d => d.data)
+  console.log(devices.length)
 
-    const groupIds = userData.groups.map(g => g.id)
-    const withoutGroupDevices = userData.devices.filter(d => !groupIds.includes(d.groupId))
+  if (!devices.length) {
+    // Empty report
+    return { drivers: [] }
+  }
 
-    const allData = await createTripReportByDevice(from, to, withoutGroupDevices, userData, traccarInstance)
-    reportData.push(allData)
+  const { route } = await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, false, false, false)
 
-    return reportData
+  return { drivers: processDrivers(from, to, userData, route) }
 }
 
-async function createTripReportByDevice(from, to, userData, traccarInstance) {
-    const allData = {
+async function createIdleReportByGroup (from, to, userData, traccarInstance) {
+  const reportData = []
+  for (const g of userData.groups) {
+    const devices = userData.devices.filter(d => d.groupId === g.id)
+    console.log(g.name + ' devices:' + devices.length)
+    if (devices.length > 0) {
+      const groupData = {
         devices: [],
-        from: from,
-        to: to
+        group: g,
+        from,
+        to
+      }
+
+      const response = await traccarInstance.reports.reportsRouteGet(from, to, null, [g.id])
+      const routes = response.data
+
+      devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
+
+      if (routes.length > 0) {
+        console.log('Routes:' + routes.length)
+        groupData.devices = processDevices(from, to, devices, routes, userData)
+
+        reportData.push(groupData)
+      }
     }
+  }
+
+  const groupIds = userData.groups.map(g => g.id)
+  const withoutGroupDevices = userData.devices.filter(d => !groupIds.includes(d.groupId))
 
-    const devices = devicesToProcess(userData)
+  const allData = await createIdleReportByDevice(from, to, withoutGroupDevices, userData, traccarInstance)
+  reportData.push(allData)
 
-    const route = await traccar.getRoute(traccarInstance, from, to, devices)
+  return reportData
+}
+
+async function createIdleReportByDevice (from, to, userData, traccarInstance) {
+  const allData = {
+    devices: [],
+    from,
+    to
+  }
+
+  const devices = devicesToProcess(userData)
+  const sliced = automaticReports.sliceArray(devices, 5)
 
-    console.log('Route:' + route.length)
+  let deviceCount = 0
+  for (const slice of sliced) {
+    const { route } = await traccarHelper.getAllInOne(traccarInstance, from, to, slice, true, false, false, false, deviceCount, devices.length)
 
     if (route.length > 0) {
-        allData.devices = processDevices(from, to, devices, route, userData)
+      allData.devices.push(...processDevices(from, to, slice, route, userData))
     }
 
-    return allData
+    deviceCount = deviceCount + slice.length
+  }
+
+  return allData
 }
 
-function processDevices(from, to, devices, routes, userData) {
-    const devicesResult = []
-
-    devices.forEach(d => {
-        const route = routes.filter(p => p.deviceId === d.id)
-
-        const idleEvents = []
-        let inIdle = false
-        route.forEach(p => {
-            if(p.attributes.ignition && p.speed === 0){
-                if(!inIdle) {
-                    const idleEvent = {
-                        position: p,
-                        idleTime: 0
-                    }
-                    idleEvents.push(idleEvent)
-                    inIdle = true
-                }
-            } else if(inIdle) {
-                const currentIdleEvent = idleEvents[idleEvents.length-1]
-                currentIdleEvent.idleTime = new Date(p.fixTime) - new Date(currentIdleEvent.position.fixTime)
-                inIdle = false
-            }
-        })
+function processDrivers (from, to, userData, routes) {
+  const driversResult = []
+  userData.drivers.forEach(d => {
+    const route = routes.filter(p => p.attributes.driverUniqueId === d.uniqueId || !p.attributes.ignition)
 
-        const filteredEvents = idleEvents.filter(e => userData.minimumIdleMinutes ? e.idleTime > userData.minimumIdleMinutes*60*1000 : true)
+    const idleEvents = getIdleEvents(route)
+    console.log(idleEvents)
+    if (route.length > 0) {
+      const filteredEvents = idleEvents.filter(e => userData.minimumIdleMinutes ? e.idleTime > userData.minimumIdleMinutes * 60 * 1000 : true)
 
-        if(filteredEvents.length) {
-            const deviceData = {
-                device: d,
-                idleEvents: filteredEvents
-            }
-            devicesResult.push(deviceData)
+      if (filteredEvents.length) {
+        const driverData = {
+          driver: d,
+          idleEvents: filteredEvents
         }
-    })
+        driversResult.push(driverData)
+      }
+    }
+  })
 
-    return devicesResult
+  return driversResult
 }
 
-async function exportIdleReportToPDF(userData, reportData) {
-    console.log('Export to PDF')
-
-    const timezone = userData.user.attributes.timezone
-    const lang = userData.user.attributes.lang || (navigator && navigator.language)
-    const translations = getTranslations(userData)
+function processDevices (from, to, devices, routes, userData) {
+  const devicesResult = []
 
-    const idleData = userData.byDriver ? reportData.drivers : reportData.devices
+  devices.forEach(d => {
+    const route = routes.filter(p => p.deviceId === d.id)
 
-    const headers = [
-        translations.report.date,
-        translations.report.address,
-        translations.report.duration
-    ]
+    const idleEvents = getIdleEvents(route)
+    console.log(idleEvents)
+    const filteredEvents = idleEvents.filter(e => userData.minimumIdleMinutes ? e.idleTime > userData.minimumIdleMinutes * 60 * 1000 : true)
 
-    if (userData.byDriver) {
-        headers.push(translations.report.vehicle)
-    } else {
-        headers.push(translations.report.driver)
+    if (filteredEvents.length) {
+      const deviceData = {
+        device: d,
+        idleEvents: filteredEvents
+      }
+      devicesResult.push(deviceData)
     }
+  })
 
-    if (idleData) {
-        let first = true
-        const doc = new jsPDF.jsPDF('l');
-        await headerFromUser(doc, translations.report.titleIdleReport, userData.user)
-
-        idleData.forEach(d => {
-            try {
-                let data = []
-
-                const name = userData.byDriver ? d.driver.name : deviceName(d.device)
-                const group = userData.byDriver ? userData.groups.find(g => g.drivers.includes(d.id)) : userData.groups.find(g => d.device.groupId === g.id)
-
-                let space = 0
-                if(!first) {
-                    doc.addPage()
-                } else {
-                    first = false
-                    space = 10
-                }
-                doc.setFontSize(13)
-                doc.text(name, 20, space+20 )
-                doc.setFontSize(11)
-                doc.text(group ? translations.report.group + ': ' + group.name : '', 150, space+20 )
-                doc.text(convertToLocaleString(reportData.from, lang, timezone) + ' - ' + convertToLocaleString(reportData.to, lang, timezone), 20, space+25 )
-
-                d.idleEvents.map(a => {
-                    const temp = [
-                        getIdleEventDate(a, userData.user),
-                        a.position.address,
-                        convertMS(a.idleTime, true),
-                        userData.byDriver ? a.deviceName : a.driver
-                    ]
-
-                    data.push(temp)
-                })
-
-                const footValues = [
-                    'Total:' + d.idleEvents.length,
-                    '',
-                    convertMS(d.idleEvents.reduce((a, b) => a + b.idleTime, 0), true)
-                ]
-
-                if(userData.roadSpeedLimits){
-                    footValues.splice(2, 0, '')
-                }
-
-                if(timezone === 'Asia/Qatar') {
-                    doc.addFileToVFS("Amiri-Regular.ttf", AmiriRegular());
-                    doc.addFont("Amiri-Regular.ttf", "Amiri", "normal");
-                }
-
-                const style = getStyle(getUserPartner(userData.user))
-                doc.autoTable({
-                    head: [headers],
-                    body: data,
-                    foot: [footValues],
-                    showFoot: 'lastPage',
-                    headStyles: {
-                        fillColor: style.pdfHeaderColor,
-                        textColor: style.pdfHeaderTextColor,
-                        fontSize: 10
-                    },
-                    bodyStyles: {
-                        fillColor: style.pdfBodyColor,
-                        textColor: style.pdfBodyTextColor,
-                        fontSize: 8,
-                        font: timezone === 'Asia/Qatar' ? "Amiri" : ''
-
-                    },
-                    footStyles: {
-                        fillColor: style.pdfFooterColor,
-                        textColor: style.pdfFooterTextColor,
-                        fontSize: 9
-                    },
-                    startY: space+35 });
-            } catch (e) {
-                console.error(e, 'moving on...')
-            }
-        })
+  return devicesResult
+}
 
-        return doc
-    }
+function getIdleEvents (route) {
+  const idleEvents = []
+
+  const routeByDevice = route.reduce(function (a, x) {
+    (a[x.deviceId] = a[x.deviceId] || []).push(x)
+    return a
+  }, {})
+
+  Object.keys(routeByDevice).forEach(function (key) {
+    let inIdle = false
+    routeByDevice[key].forEach(p => {
+      if (p.attributes.ignition && p.speed === 0) {
+        if (!inIdle) {
+          const idleEvent = {
+            position: p,
+            idleTime: 0
+          }
+          idleEvents.push(idleEvent)
+          inIdle = true
+        } else {
+          if (!idleEvents[idleEvents.length - 1].position.attributes.driverUniqueId) {
+            idleEvents[idleEvents.length - 1].position.attributes.driverUniqueId = p.attributes.driverUniqueId
+          }
+          if (p.attributes.idleTime) {
+            idleEvents[idleEvents.length - 1].idleTime = p.attributes.idleTime
+          }
+        }
+      } else if (inIdle) {
+        const currentIdleEvent = idleEvents[idleEvents.length - 1]
+        if (p.attributes.idleTime === undefined) {
+          currentIdleEvent.idleTime = new Date(p.fixTime) - new Date(currentIdleEvent.position.fixTime)
+        }
+        inIdle = false
+      }
+    })
+  })
+
+  return idleEvents
 }
 
-function exportIdleReportToExcel(userData, reportData) {
-    console.log('Export to Excel')
+async function exportIdleReportToPDF (userData, reportData) {
+  console.log('Export to PDF')
+
+  const timezone = userData.user.attributes.timezone
+  const lang = userData.user.attributes.lang || (navigator && navigator.language)
+  const translations = getTranslations(userData)
+
+  const idleData = userData.byDriver ? reportData.drivers : reportData.devices
+
+  const headers = [
+    translations.report.date,
+    translations.report.address,
+    translations.report.duration
+  ]
+
+  if (userData.byDriver) {
+    headers.push(translations.report.vehicle)
+  } else {
+    headers.push(translations.report.driver)
+  }
+
+  if (idleData) {
+    let first = true
+    // eslint-disable-next-line new-cap
+    const doc = new jsPDF.jsPDF('l')
+    await headerFromUser(doc, translations.report.titleIdleReport, userData.user)
+
+    idleData.forEach(d => {
+      try {
+        const data = []
+
+        const name = userData.byDriver ? d.driver.name : deviceName(d.device)
+        const group = userData.byDriver ? userData.groups.find(g => g.drivers.includes(d.id)) : userData.groups.find(g => d.device.groupId === g.id)
+
+        let space = 0
+        if (!first) {
+          doc.addPage()
+        } else {
+          first = false
+          space = 10
+        }
+        doc.setFontSize(13)
+        doc.text(name, 20, space + 20)
+        doc.setFontSize(11)
+        doc.text(group ? translations.report.group + ': ' + group.name : '', 150, space + 20)
+        doc.text(convertToLocaleString(reportData.from, lang, timezone) + ' - ' + convertToLocaleString(reportData.to, lang, timezone), 20, space + 25)
+
+        d.idleEvents.forEach(a => {
+          const temp = [
+            getIdleEventDate(a, userData.user),
+            a.position.address,
+            convertMS(a.idleTime, true),
+            userData.byDriver ? a.deviceName : a.driver
+          ]
+          data.push(temp)
+        })
+
+        const footValues = [
+          'Total:' + d.idleEvents.length,
+          '',
+          convertMS(d.idleEvents.reduce((a, b) => a + b.idleTime, 0), true)
+        ]
 
-    const translations = getTranslations(userData)
+        if (userData.roadSpeedLimits) {
+          footValues.splice(2, 0, '')
+        }
 
-    const idleData = userData.byDriver ? reportData.drivers : reportData.devices
+        if (timezone === 'Asia/Qatar') {
+          doc.addFileToVFS('Amiri-Regular.ttf', AmiriRegular())
+          doc.addFont('Amiri-Regular.ttf', 'Amiri', 'normal')
+        }
 
-    const settings = {
-        sheetName: translations.report.titleIdleReport.substring(0, 31), // The name of the sheet
-        fileName: fileName, // The name of the spreadsheet
-    }
-    const headers = [
-        userData.byDriver ? {label: translations.report.driver, value:'driver'} : {label: translations.report.vehicle, value:'name'},
-        {label: translations.report.date, value:'fixTime'},
-        {label: translations.report.address, value:'address'},
-        {label: translations.report.duration, value:'duration'},
-        userData.byDriver ? {label: translations.report.vehicle, value:'name'} : {label: translations.report.driver, value:'driver'}
-    ]
-
-    let data = []
-    if (idleData) {
-        idleData.forEach(d => {
-            data = data.concat([{}])
-            data = data.concat(d.idleEvents.map(a => {
-                return {
-                    driver: userData.byDriver ? d.driver.name : a.driver,
-                    duration:  convertMS(a.idleTime, true),
-                    fixTime: getIdleEventDate(a, userData.user),
-                    name: userData.byDriver ? a.deviceName : d.device.name,
-                    address: a.position.address + (a.geofenceName ? ' - ' + a.geofenceName : '')
-                }
-            }))
+        const style = getStyle(getUserPartner(userData.user))
+        doc.autoTable({
+          head: [headers],
+          body: data,
+          foot: [footValues],
+          showFoot: 'lastPage',
+          headStyles: {
+            fillColor: style.pdfHeaderColor,
+            textColor: style.pdfHeaderTextColor,
+            fontSize: 10
+          },
+          bodyStyles: {
+            fillColor: style.pdfBodyColor,
+            textColor: style.pdfBodyTextColor,
+            fontSize: 8,
+            font: timezone === 'Asia/Qatar' ? 'Amiri' : ''
+
+          },
+          footStyles: {
+            fillColor: style.pdfFooterColor,
+            textColor: style.pdfFooterTextColor,
+            fontSize: 9
+          },
+          startY: space + 35
         })
-        console.log(data)
+      } catch (e) {
+        console.error(e, 'moving on...')
+      }
+    })
+
+    return doc
+  }
+}
+
+function exportIdleReportToExcel (userData, reportData) {
+  console.log('Export to Excel')
+
+  const translations = getTranslations(userData)
+
+  const idleData = userData.byDriver ? reportData.drivers : reportData.devices
+
+  const settings = {
+    sheetName: translations.report.titleIdleReport.substring(0, 31), // The name of the sheet
+    fileName // The name of the spreadsheet
+  }
+  const headers = [
+    userData.byDriver ? { label: translations.report.driver, value: 'driver' } : { label: translations.report.vehicle, value: 'name' },
+    { label: translations.report.date, value: 'fixTime' },
+    { label: translations.report.address, value: 'address' },
+    { label: translations.report.duration, value: 'duration' },
+    userData.byDriver ? { label: translations.report.vehicle, value: 'name' } : { label: translations.report.driver, value: 'driver' }
+  ]
+
+  let data = []
+  if (idleData) {
+    idleData.forEach(d => {
+      data = data.concat([{}])
+      data = data.concat(d.idleEvents.map(a => {
         return {
-            headers,
-            data,
-            settings
+          driver: userData.byDriver ? d.driver.name : a.driver,
+          duration: convertMS(a.idleTime, true),
+          fixTime: getIdleEventDate(a, userData.user),
+          name: userData.byDriver ? a.deviceName : d.device.name,
+          address: a.position.address + (a.geofenceName ? ' - ' + a.geofenceName : '')
         }
+      }))
+    })
+    console.log(data)
+    return {
+      headers,
+      data,
+      settings
     }
+  }
 }
 
-function deviceName(device){
-    return device.name + (device.attributes.license_plate ? ', ' +device.attributes.license_plate : '') + (device.model ? ', ' + device.model : '')
+function deviceName (device) {
+  return device.name + (device.attributes.license_plate ? ', ' + device.attributes.license_plate : '') + (device.model ? ', ' + device.model : '')
 }
 
-function getIdleEventDate(row, user) {
-    return convertToLocaleString(row.position.fixTime, user.attributes.lang, user.attributes.timezone)
+function getIdleEventDate (row, user) {
+  return convertToLocaleString(row.position.fixTime, user.attributes.lang, user.attributes.timezone)
 }
 
-exports.createIdleReport = createIdleReport;
-exports.exportIdleReportToPDF = exportIdleReportToPDF;
-exports.exportIdleReportToExcel = exportIdleReportToExcel;
+exports.createIdleReport = createIdleReport
+exports.exportIdleReportToPDF = exportIdleReportToPDF
+exports.exportIdleReportToExcel = exportIdleReportToExcel

package/src/index.test.js

@@ -197,6 +197,21 @@ describe('Test_Reports', function () {
     assert.equal(totalIdleTime, 1294000) // Total Duration
   }, 20000)
   // eslint-disable-next-line no-undef
+  it('Idle by driver', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    userData.minimumIdleMinutes = 2
+    userData.byDriver = true
+    const data = await report.idleReport(new Date(2022, 0, 3, 0, 0, 0, 0),
+      new Date(2022, 0, 7, 23, 59, 59, 0),
+      userData)
+    assert.equal(data.length, 1)
+    const driver = data[0].drivers.find(d => d.driver.id === 14020)
+    const totalIdleTime = driver.idleEvents.reduce((a, b) => a + b.idleTime, 0)
+    assert.equal(driver.idleEvents.length, 12) // Total Alerts
+    assert.equal(totalIdleTime, 30785000) // Total Duration
+  }, 20000)
+  // eslint-disable-next-line no-undef
   it('Activity by device', async () => {
     const report = await getReports()
     const userData = await report.getUserData()

package/src/util/traccar.js

@@ -77,7 +77,8 @@ async function getAllInOne (
   currentDeviceCount = 0,
   totalDevices = devices.length,
   sliceSize = 5,
-  devicesPerRequest = 1) {
+  devicesPerRequest = 1,
+  counter = undefined) {
   let url = `/reports/allinone?from=${from.toISOString()}&to=${to.toISOString()}`
   if (getRoutes) url += '&type=route'
   if (getTrips) url += '&type=trips'
@@ -96,8 +97,13 @@ async function getAllInOne (
           withCredentials: true
         }).then(r => r.data).then(x => {
           console.log('LOADING_MESSAGE:' + _chunk[0].name)
-          currentDeviceCount += devicesPerRequest
-          console.log(`PROGRESS_PERC:${currentDeviceCount / totalDevices * 100}`)
+          if (counter) {
+            counter.count += devicesPerRequest
+            console.log(`PROGRESS_PERC:${counter.count / totalDevices * 100}`)
+          } else {
+            currentDeviceCount += devicesPerRequest
+            console.log(`PROGRESS_PERC:${currentDeviceCount / totalDevices * 100}`)
+          }
           return x
         }))
     }

package/src/zone-report.js

@@ -53,14 +53,14 @@ async function createZoneReport (from, to, userData, traccar) {
     xpert: devices.filter(d => d.attributes.xpert).length > 0
   }
 
-  const sliced = automaticReports.sliceArray(devices, 50)
+  const sliced = automaticReports.sliceArray(devices, 30)
 
-  let deviceCount = 0
+  const deviceCount = { count: 0 }
   const promises = []
   for (const slice of sliced) {
     promises.push(traccarHelper.getAllInOne(
       traccar, from, to, slice, true, false, false, false,
-      deviceCount, devices.length, 30, 5).then(async allInOne => {
+      deviceCount, devices.length, 20, 5, deviceCount).then(async allInOne => {
       const routeData = allInOne.route
 
       const data = getInAndOutEvents(slice, routeData, userData)
@@ -70,7 +70,6 @@ async function createZoneReport (from, to, userData, traccar) {
       if (data.length) {
         allData.devices.push(...await processDevices(from, to, devices, userData.drivers, userData.geofences, data, traccar))
       }
-      deviceCount = deviceCount + slice.length
     }))
   }
   await Promise.all(promises)