fleetmap-reports 1.0.275 → 1.0.276

package/.idea/workspace.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="fix convert date to localeString">
-      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/activity-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/activity-report.js" afterDir="false" />
+    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="Add idle report">
       <change beforePath="$PROJECT_DIR$/src/index.test.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.test.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/kms-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/kms-report.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/speeding-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/speeding-report.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -233,7 +231,9 @@
       <workItem from="1641921254910" duration="614000" />
       <workItem from="1641991863387" duration="626000" />
       <workItem from="1641992769870" duration="96000" />
-      <workItem from="1641992912450" duration="1045000" />
+      <workItem from="1641992912450" duration="1734000" />
+      <workItem from="1642001918030" duration="2950000" />
+      <workItem from="1642028703547" duration="8996000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>
@@ -424,7 +424,21 @@
       <option name="project" value="LOCAL" />
       <updated>1641912050985</updated>
     </task>
-    <option name="localTasksCounter" value="28" />
+    <task id="LOCAL-00028" summary="Fix activity and kms report by driver inside a time period">
+      <created>1641994017219</created>
+      <option name="number" value="00028" />
+      <option name="presentableId" value="LOCAL-00028" />
+      <option name="project" value="LOCAL" />
+      <updated>1641994017220</updated>
+    </task>
+    <task id="LOCAL-00029" summary="Add idle report">
+      <created>1642039915131</created>
+      <option name="number" value="00029" />
+      <option name="presentableId" value="LOCAL-00029" />
+      <option name="project" value="LOCAL" />
+      <updated>1642039915132</updated>
+    </task>
+    <option name="localTasksCounter" value="30" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -454,8 +468,6 @@
     <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Fix getStyle in all reports" />
-    <MESSAGE value="try catch on pdf addImage" />
     <MESSAGE value="Kms report grouped by day" />
     <MESSAGE value="Fix pdf logo" />
     <MESSAGE value="kms report with parallel requests" />
@@ -479,6 +491,8 @@
     <MESSAGE value="fix trip report" />
     <MESSAGE value="fix kms report by group" />
     <MESSAGE value="fix convert date to localeString" />
-    <option name="LAST_COMMIT_MESSAGE" value="fix convert date to localeString" />
+    <MESSAGE value="Fix activity and kms report by driver inside a time period" />
+    <MESSAGE value="Add idle report" />
+    <option name="LAST_COMMIT_MESSAGE" value="Add idle report" />
   </component>
 </project>

package/lang/enGB.js

@@ -182,6 +182,7 @@ module.exports = {
     titleEventsReport: 'Events Report',
     titleActivityReport: 'Activity Report',
     titleKmsReport: 'Kms Report',
+    titleIdleReport: 'Idle Report',
     from: 'From',
     to: 'to',
     headerStartAddress: 'Start address',

package/lang/esCL.js

@@ -176,6 +176,7 @@ module.exports = {
     titleEventsReport: 'Informe de Eventos',
     titleActivityReport: 'Activity Report',
     titleKmsReport: 'Informe de Kms',
+    titleIdleReport: 'Relatórios de Ralenti',
     from: 'De',
     to: 'a',
     headerStartAddress: 'Lugar de início',

package/lang/ptBR.js

@@ -172,6 +172,7 @@ module.exports = {
     titleEventsReport: 'Relatório de Eventos',
     titleActivityReport: 'Relatório de Actividade',
     titleKmsReport: 'Relatórios de Kms',
+    titleIdleReport: 'Relatórios de Ralenti',
     from: 'De',
     to: 'a',
     headerStartAddress: 'Local de início',

package/lang/ptPT.js

@@ -178,6 +178,7 @@ module.exports = {
     titleEventsReport: 'Relatório de Eventos',
     titleActivityReport: 'Relatório de Actividade',
     titleKmsReport: 'Relatórios de Kms',
+    titleIdleReport: 'Relatórios de Ralenti',
     from: 'De',
     to: 'a',
     headerStartAddress: 'Local de início',

package/package.json

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

package/src/idle-report.js

@@ -0,0 +1,285 @@
+const traccar = require("./util/traccar");
+const messages = require("../lang");
+const jsPDF = require("jspdf");
+const {headerFromUser, AmiriRegular} = require("./util/pdfDocument");
+const {convertToLocaleString, convertMS} = require("./util/utils");
+const {getStyle} = require("./reportStyle");
+const {getUserPartner} = require("fleetmap-partners");
+
+
+let traccarInstance
+let userData
+
+const fileName = 'IdleReport'
+
+async function createIdleReport(from, to, reportUserData, traccar) {
+    console.log('Create IdleReport')
+    userData = reportUserData
+    traccarInstance = traccar
+    const reportData = []
+
+    if (userData.byGroup) {
+        console.log("ByGroup")
+        const allData = await createTripReportByGroup(from, to)
+        reportData.push(...allData)
+    } else {
+        console.log("ByDevice")
+        const report = await createTripReportByDevice(from, to)
+        reportData.push(report)
+    }
+
+    return reportData
+}
+
+async function createTripReportByGroup(from, to) {
+    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)
+
+                reportData.push(groupData)
+            }
+        }
+    }
+
+    const groupIds = userData.groups.map(g => g.id)
+    const withoutGroupDevices = userData.devices.filter(d => !groupIds.includes(d.groupId))
+
+    const allData = await createTripReportByDevice(from, to, withoutGroupDevices)
+    reportData.push(allData)
+
+    return reportData
+}
+
+async function createTripReportByDevice(from, to) {
+    const devices = userData.devices
+    const allData = {
+        devices: [],
+        from: from,
+        to: to
+    }
+
+    devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
+
+    const devicesToSlice = devices.slice()
+    const route = await traccar.getRoute(traccarInstance, from, to, devicesToSlice)
+
+    console.log('Route:' + route.length)
+
+    if (route.length > 0) {
+        allData.devices = processDevices(from, to, devices, route)
+    }
+
+    return allData
+}
+
+function processDevices(from, to, devices, routes) {
+    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
+            }
+        })
+
+        if(idleEvents.length) {
+            const deviceData = {
+                device: d,
+                idleEvents: idleEvents
+            }
+            devicesResult.push(deviceData)
+        }
+    })
+
+    return devicesResult
+}
+
+async function exportIdleReportToPDF(userData, reportData) {
+    console.log('Export to PDF')
+
+    const lang = userData.user.attributes.lang
+    const timezone = userData.user.attributes.timezone
+    const translations = messages[lang] ? messages[lang] : messages['en-GB']
+
+    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
+        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, '')
+                }
+
+                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 doc
+    }
+}
+
+function exportIdleReportToExcel(userData, reportData) {
+    console.log('Export to Excel')
+
+    const lang = userData.user.attributes.lang
+    const translations = messages[lang] ? messages[lang] : messages['en-GB']
+
+    const idleData = userData.byDriver ? reportData.drivers : reportData.devices
+
+    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 : '')
+                }
+            }))
+        })
+        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 getIdleEventDate(row, user) {
+    return convertToLocaleString(row.position.fixTime, user.attributes.lang, user.attributes.timezone)
+}
+
+exports.createIdleReport = createIdleReport;
+exports.exportIdleReportToPDF = exportIdleReportToPDF;
+exports.exportIdleReportToExcel = exportIdleReportToExcel;

package/src/index.js

@@ -124,6 +124,16 @@ function Reports(config, axios) {
     this.vistaWasteActivityReportToExcel = (userData, reportData) => {
         return require('./custom/vistawasteActivity-report').exportVistaWasteActivityReportToExcel(userData, reportData)
     }
+
+    this.idleReport = (from, to, userData) => {
+        return require('./idle-report').createIdleReport(from, to, userData, this.traccar)
+    }
+    this.idleReportToPDF = (userData, reportData) => {
+        return require('./idle-report').exportIdleReportToPDF(userData, reportData)
+    }
+    this.idleReportToExcel = (userData, reportData) => {
+        return require('./idle-report').exportIdleReportToExcel(userData, reportData)
+    }
 }
 module.exports = Reports
 

package/src/speeding-report.js

@@ -1,7 +1,7 @@
 const messages = require('../lang')
 const jsPDF = require('jspdf')
 const {convertMS, convertToLocaleString} = require("./util/utils")
-const {headerFromUser} = require("./util/pdfDocument")
+const {headerFromUser, AmiriRegular} = require("./util/pdfDocument")
 require('jspdf-autotable')
 const { parse } = require('wkt')
 const turf = require('turf')
@@ -394,6 +394,9 @@ async function exportSpeedingReportToPDF(userData, reportData) {
           footValues.splice(2, 0, '')
         }
 
+        doc.addFileToVFS("Amiri-Regular.ttf", AmiriRegular());
+        doc.addFont("Amiri-Regular.ttf", "Amiri", "normal");
+
         const style = getStyle(getUserPartner(userData.user))
         doc.autoTable({
           head: [headers],
@@ -408,7 +411,8 @@ async function exportSpeedingReportToPDF(userData, reportData) {
           bodyStyles: {
             fillColor: style.pdfBodyColor,
             textColor: style.pdfBodyTextColor,
-            fontSize: 8
+            fontSize: 8,
+            font: timezone === 'Asia/Qatar' ? "Amiri" : ''
           },
           footStyles: {
             fillColor: style.pdfFooterColor,