fleetmap-reports 1.0.274 → 1.0.278

package/.idea/codeStyles/Project.xml

@@ -0,0 +1,7 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <ScalaCodeStyleSettings>
+      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
+    </ScalaCodeStyleSettings>
+  </code_scheme>
+</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>

package/.idea/jsLibraryMappings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptLibraryMappings">
+    <file url="file://$PROJECT_DIR$" libraries="{Node.js Core}" />
+  </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.274",
+  "version": "1.0.278",
   "description": "",
   "main": "src/index.js",
   "scripts": {

package/src/activity-report.js

@@ -9,6 +9,7 @@ const {getStyle} = require("./reportStyle")
 const {getUserPartner} = require("fleetmap-partners")
 const traccar = require("./util/traccar")
 const {createKmsReport} = require("./kms-report");
+const {isInsideTimetable} = require("./util/trips");
 
 let traccarInstance
 let userData
@@ -214,50 +215,19 @@ function processDrivers(from, to, drivers, data) {
             if(userData.groupByDay) {
                 const dates = getDates(from, to)
                 for(const date of dates){
-                    if(userData.allWeek || !userData.weekDays){
-                        const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
-                        const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
-
-                        const tripsByDay = trips.filter(t => new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay)
-
-                        driverData.summary.push({
-                            date: date,
-                            distance: tripsByDay.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0),
-                            engineHours: tripsByDay.reduce((a, b) => a + b.duration, 0),
-                            maxSpeed: tripsByDay.reduce((a, b) => Math.max(a, b.maxSpeed), 0),
-                            averageSpeed: tripsByDay.length > 0 ? Math.round(tripsByDay.reduce((a, b) => a + b.averageSpeed, 0) / tripsByDay.length) : 0,
-                        })
-                    } else {
-                        if((date.getDay() === 0 && userData.weekDays.sunday) ||
-                            (date.getDay() === 1 && userData.weekDays.monday) ||
-                            (date.getDay() === 2 && userData.weekDays.tuesday) ||
-                            (date.getDay() === 3 && userData.weekDays.wednesday)  ||
-                            (date.getDay() === 4 && userData.weekDays.thursday) ||
-                            (date.getDay() === 5 && userData.weekDays.friday) ||
-                            (date.getDay() === 6 && userData.weekDays.saturday)) {
-
-                            const fromByDay = new Date(new Date(date).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
-                            const toByDay = new Date(new Date(date).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
-
-                            const tripsByDay = trips.filter(t => new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay)
-
-                            driverData.summary.push({
-                                date: date,
-                                distance: tripsByDay.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0),
-                                engineHours: tripsByDay.reduce((a, b) => a + b.duration, 0),
-                                maxSpeed: tripsByDay.reduce((a, b) => Math.max(a, b.maxSpeed), 0),
-                                averageSpeed: tripsByDay.length > 0 ? Math.round(tripsByDay.reduce((a, b) => a + b.averageSpeed, 0) / tripsByDay.length) : 0,
-                            })
-                        }else {
-                            driverData.summary.push({
-                                date: date,
-                                distance: 0,
-                                engineHours: 0,
-                                maxSpeed: 0,
-                                averageSpeed: 0,
-                            })
-                        }
-                    }
+                    const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
+                    const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
+
+                    const tripsByDay = trips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay)
+                    && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData)))
+
+                    driverData.summary.push({
+                        date: date,
+                        distance: tripsByDay.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0),
+                        engineHours: tripsByDay.reduce((a, b) => a + b.duration, 0),
+                        maxSpeed: tripsByDay.reduce((a, b) => Math.max(a, b.maxSpeed), 0),
+                        averageSpeed: tripsByDay.length > 0 ? Math.round(tripsByDay.reduce((a, b) => a + b.averageSpeed, 0) / tripsByDay.length) : 0,
+                    })
                 }
             } else {
                 driverData.summary.push({

package/src/here.js

@@ -100,7 +100,6 @@ exports.routeMatch = async (rows) => {
   const csv = generateCSV(rows)
   const response = await axios.post(calcRoute, csv, { headers: { 'Content-Type': 'application/binary' }})
   const hereData = response.data
-  console.dir(hereData, {depth: null})
   const route = hereData.response.route[0]
   const results = []
   const wayPoints = route.waypoint

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/index.test.js

@@ -1,60 +1,20 @@
 const {getReports} = require("./tests");
 
-describe('Reports', function() {
+describe('speedingReport', function() {
     this.timeout(500000)
     it('test speeding', async () => {
         const report = await getReports()
         const userData = await report.getUserData()
 
-        const reportData = await report.speedingReport(new Date(2021, 2, 30, 0, 0, 0, 0),
+        await report.speedingReport(new Date(2021, 2, 30, 0, 0, 0, 0),
             new Date(2021, 2, 30, 23, 59, 59, 0),
             userData)
-
-        console.log(reportData)
-
-    })
-    it('test trip report', async () => {
-        const report = await getReports()
-        const userData = await report.getUserData()
-        userData.byGroup = true
-        const reportData = await report.tripReport(new Date(2021, 2, 30, 0, 0, 0, 0),
-            new Date(2021, 2, 30, 23, 59, 59, 0),
-            userData)
-
-        console.log(reportData)
-
-    })
-    it('test event report', async () => {
-        const report = await getReports()
-        const userData = await report.getUserData()
-        userData.eventTypes = []
-        const reportData = await report.eventsReport(new Date(2021, 10, 20, 0, 0, 0, 0),
-            new Date(2021, 10, 30, 23, 59, 59, 0),
-            userData)
-
-        console.log(reportData)
-
     })
     it('test kmsReport by day', async () => {
         const reports = await getReports()
         const userData = await reports.getUserData()
         userData.groupByDay = true
-        const reportData = await reports.kmsReport(new Date(2021, 10, 1), new Date(2021, 10, 3),
-            userData)
-
-        console.log(reportData)
-
-        await reports.kmsReportToPDF(userData, reportData[0])
-    })
-    it('test locationReport by day', async () => {
-        const reports = await getReports()
-        const userData = await reports.getUserData()
-        userData.groupByDay = true
-        const reportData = await reports.locations(new Date(2021, 10, 1), new Date(2021, 10, 3),
+        await reports.kmsReport(new Date(2021, 9), new Date(2021, 10),
             userData)
-
-        console.log(reportData)
-
-        await reports.kmsReportToPDF(userData, reportData[0])
     })
 })

package/src/kms-report.js

@@ -8,6 +8,7 @@ const traccar = require("./util/traccar");
 const {getDates} = require("./util/utils");
 const trips = require("./util/trips");
 const drivers = require("./util/driver");
+const {isInsideTimetable} = require("./util/trips");
 
 
 let traccarInstance
@@ -124,41 +125,16 @@ function processDrivers(from, to, drivers, data) {
                 driverData.days = []
                 const dates = getDates(from, to)
                 for(const date of dates){
-                    if(userData.allWeek || !userData.weekDays){
-                        const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
-                        const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
+                    const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
+                    const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
 
-                        const tripsByDay = trips.filter(t => new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay)
+                    const tripsByDay = trips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay)
+                        && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData)))
 
-                        driverData.days.push({
-                            date: date,
-                            kms: tripsByDay.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
-                        })
-                    } else {
-                        if((date.getDay() === 0 && userData.weekDays.sunday) ||
-                            (date.getDay() === 1 && userData.weekDays.monday) ||
-                            (date.getDay() === 2 && userData.weekDays.tuesday) ||
-                            (date.getDay() === 3 && userData.weekDays.wednesday)  ||
-                            (date.getDay() === 4 && userData.weekDays.thursday) ||
-                            (date.getDay() === 5 && userData.weekDays.friday) ||
-                            (date.getDay() === 6 && userData.weekDays.saturday)) {
-
-                            const fromByDay = new Date(new Date(date).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
-                            const toByDay = new Date(new Date(date).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
-
-                            const tripsByDay = trips.filter(t => new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay)
-
-                            driverData.days.push({
-                                date: date,
-                                kms: tripsByDay.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
-                            })
-                        }else {
-                            driverData.days.push({
-                                date: date,
-                                kms: 0
-                            })
-                        }
-                    }
+                    driverData.days.push({
+                        date: date,
+                        kms: tripsByDay.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
+                    })
                 }
             } else {
                 driverData.summary = {

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')
@@ -205,7 +205,7 @@ async function findEventsPosition(from, to, devices, events, routes){
 }
 
 async function getCustomSpeedLimitEvents(devices, routes){
-  console.log('calculate custom speed limit events')
+  console.log('custom speed limit events')
   const events = []
   const maxSpeed = userData.customSpeed / 1.85200
 
@@ -235,7 +235,7 @@ async function getCustomSpeedLimitEvents(devices, routes){
 }
 
 async function getHereEvents(devices, routes, threshold){
-  console.log('calculate custom speed limit events')
+  console.log('here speed limit events')
   const events = []
   for (const d of devices) {
     const positions = routes.filter(p => p.deviceId === d.id)
@@ -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,