fleetmap-reports 1.0.209 → 1.0.213

package/.idea/workspace.xml

@@ -1,19 +1,12 @@
 <?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 getStyle">
+    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="try catch on pdf addImage">
       <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" />
-      <change beforePath="$PROJECT_DIR$/src/events-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/events-report.js" afterDir="false" />
       <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/location-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/location-report.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/reportStyle.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/reportStyle.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/speeding-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/speeding-report.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/trip-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/trip-report.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/util/pdfDocument.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/pdfDocument.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/util/utils.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/utils.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/zone-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/zone-report.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -145,7 +138,12 @@
       <workItem from="1636647112207" duration="1748000" />
       <workItem from="1636981640447" duration="4315000" />
       <workItem from="1637009407292" duration="1470000" />
-      <workItem from="1637012863006" duration="4019000" />
+      <workItem from="1637012863006" duration="5376000" />
+      <workItem from="1637087797229" duration="5701000" />
+      <workItem from="1637227826845" duration="1275000" />
+      <workItem from="1637441942952" duration="4543000" />
+      <workItem from="1637670815688" duration="2973000" />
+      <workItem from="1637674107929" duration="9187000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>
@@ -154,7 +152,21 @@
       <option name="project" value="LOCAL" />
       <updated>1636983717385</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="Fix getStyle in all reports">
+      <created>1637020728356</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1637020728356</updated>
+    </task>
+    <task id="LOCAL-00003" summary="try catch on pdf addImage">
+      <created>1637247013210</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1637247013211</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -174,6 +186,8 @@
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Fix getStyle" />
-    <option name="LAST_COMMIT_MESSAGE" value="Fix getStyle" />
+    <MESSAGE value="Fix getStyle in all reports" />
+    <MESSAGE value="try catch on pdf addImage" />
+    <option name="LAST_COMMIT_MESSAGE" value="try catch on pdf addImage" />
   </component>
 </project>

package/package.json

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

package/src/activity-report.js

@@ -71,18 +71,18 @@ async function createActivityReportByGroup(from, to, userData){
 
 async function createActivityReportByDevice(from, to, userData){
     const groupIds = userData.groups.map(g => g.id)
-    const withoutGroupDevices = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
+    const devicesToProcess = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
 
     const allData = {
         devices: [],
-        xpert: withoutGroupDevices.filter(d => d.attributes.xpert).length > 0,
+        xpert: devicesToProcess.filter(d => d.attributes.xpert).length > 0,
         from: from,
         to: to
     }
 
-    withoutGroupDevices.sort((a, b) => (a.name > b.name) ? 1 : -1)
-    const devicesToSlice = withoutGroupDevices.slice()
-
+    //Get report data from traccar
+    devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
+    const devicesToSlice = devicesToProcess.slice()
     const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
     let data = []
     let trips = []
@@ -96,12 +96,11 @@ async function createActivityReportByDevice(from, to, userData){
 
     console.log('Summary:' + data.length)
 
-    if (data.length === 0) {
-        return allData
+    //Process report data
+    if (data.length > 0) {
+        allData.devices = processDevices(devicesToProcess, data, trips)
     }
 
-    allData.devices = processDevices(withoutGroupDevices, data, trips)
-
     return allData
 }
 

package/src/index.test.js

@@ -23,14 +23,21 @@ describe('test reports', function() {
         await new SessionApi(traccarConfig, null, axios).sessionPost('jppenas@gmail.com', 'penas46881')
         const report = new Index(traccarConfig, axios)
         const userData = await report.getUserData()
-
-        const reportData = await report.tripReport(new Date(2021, 2, 30, 0, 0, 0, 0),
-            new Date(2021, 2, 30, 23, 59, 59, 0),
+        userData.groupByDay = true
+        const reportData = await report.kmsReport(new Date(2021, 10, 19, 0, 0, 0, 0),
+            new Date(2021, 10, 21, 23, 59, 59, 0),
             userData)
 
-        console.log(reportData)
+        const reportResult = reportData[0]
+        reportResult.devices.forEach(d => {
+            console.log(d.device.name)
+            d.days.forEach(day => {
+                console.log(day.date + ' - ' + day.kms)
+            })
+        })
+
 
-        const pdf = report.tripReportToPDF(userData, reportData)
+        const pdf = report.kmsReportToExcel(userData, reportResult)
 
         console.log(pdf)
     })

package/src/kms-report.js

@@ -3,26 +3,123 @@ const messages = require('../lang')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
 const {getStyle} = require("./reportStyle");
-const {headerFromUser} = require("./util/pdfDocument");
+const {headerFromUser,addTable} = require("./util/pdfDocument");
 const {getUserPartner} = require("fleetmap-partners");
+const automaticReports = require("./automaticReports");
+const {convertMS} = require("./util/utils");
 
 
 let traccarInstance
 
 const fileName = 'KmsReport'
 
+async function createKmsReportByDevice(from, to, userData) {
+    const groupIds = userData.groups.map(g => g.id)
+    const devicesToProcess = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
+
+    const allData = {
+        devices: []
+    }
+
+    devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
+    const devicesToSlice = devicesToProcess.slice()
+
+    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
+    let data = []
+    for (const a of arrayOfArrays) {
+        const response = await traccarInstance.reports.reportsRouteGet(from, to, a.map(d => d.id))
+        data = data.concat(response.data)
+    }
+
+    console.log('locations:' + data.length)
+
+    if (data.length > 0) {
+        allData.devices = processDevices(from, to, devicesToProcess, data)
+    }
+
+    return allData
+}
+
+async function createKmsReportByDriver(from, to, userData) {
+
+}
+
+async function createKmsReportByGroup(from, to, userData) {
+
+}
+
+function processDevices(from, to, devices, data) {
+    const devicesResult = []
+
+    for (const d of devices) {
+        const locations = data.filter(t => t.deviceId === d.id)
+
+        if (locations.length > 0) {
+            locations.forEach(l => l.locationDate = l.fixTime.substring(0, 10))
+            const groupedLocations = locations.reduce(
+                (entryMap, e) => entryMap.set(e.locationDate, [...entryMap.get(e.locationDate)||[], e]),
+                new Map()
+            )
+
+            const days = []
+            const keys = Array.from(groupedLocations.keys())
+
+            keys.forEach(key => {
+                const dayLocations = groupedLocations.get(key)
+                const day = {
+                    date: key,
+                    kms: dayLocations.reduce((a, b) => a + b.attributes.distance, 0)
+                }
+                days.push(day)
+            })
+
+            devicesResult.push({
+                device: d,
+                days: days
+            })
+        }
+    }
+
+    return devicesResult
+}
+
 async function createKmsReport(from, to, userData, traccar) {
     console.log('Create KmsReport')
     traccarInstance = traccar
-    return await createActivityReport(from, to, userData, traccar)
+    if(userData.groupByDay){
+        const reportData = []
+
+        if(userData.byDriver){
+            const allData = await createKmsReportByDriver(from, to, userData)
+            reportData.push(allData)
+        }
+        else if(userData.byGroup){
+            const allGroupsData = await createKmsReportByGroup(from, to, userData)
+            allGroupsData.forEach(data => reportData.push(data))
+            const withoutGroupDevices = await createKmsReportByDevice(from, to, userData)
+            reportData.push(withoutGroupDevices)
+        } else {
+            const allData = await createKmsReportByDevice(from, to, userData)
+            reportData.push(allData)
+        }
+
+        return reportData
+    } else {
+        return await createActivityReport(from, to, userData, traccar)
+    }
 }
 
 async function exportKmsReportToPDF(userData, reportData) {
     const lang = userData.user.attributes.lang
     const translations = messages[lang] ? messages[lang] : messages['en-GB']
+    const kmsData = userData.byDriver ? reportData.drivers : reportData.devices
 
     const headers = []
-    if(userData.byDriver) {
+    if(userData.groupByDay) {
+        headers.push(translations.report.date,
+            translations.report.distance)
+    }
+    else if(userData.byDriver) {
         headers.push(translations.report.driver,
             translations.report.group,
             translations.report.distance)
@@ -32,78 +129,82 @@ async function exportKmsReportToPDF(userData, reportData) {
             translations.report.group,
             translations.report.distance)
     }
-    if (reportData.devices || reportData.drivers) {
-        const doc = new jsPDF.jsPDF('l');
+    if (kmsData) {
+        const doc = userData.groupByDay ? new jsPDF.jsPDF() : new jsPDF.jsPDF('l')
         await headerFromUser(doc, translations.report.titleSpeedingReport, userData.user)
 
-        let data = []
-        doc.setFontSize(10)
-        doc.text(new Date(reportData.from).toLocaleString() + ' - ' + new Date(reportData.to).toLocaleString(), 20, 30 )
-        if(userData.byDriver) {
-            reportData.drivers.forEach(d => {
-                const group = userData.groups.find(g => g.drivers.includes(d.driver.id))
+        if (userData.groupByDay) {
+            for (const d of kmsData) {
+                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 = 8
+                }
+                doc.setFontSize(13)
+                doc.text(name, 20, space + 20)
+                doc.setFontSize(11)
+                doc.text(group ? translations.report.group + ': ' + group.name : '', 200, space + 20)
+                doc.text(new Date(d.from).toLocaleString() + ' - ' + new Date(d.to).toLocaleString(), 20, space + 25)
 
+                const data = []
                 const temp = [
                     d.driver.name,
                     group ? group.name : '',
                     Number((d.summary.distance / 1000).toFixed(0)),
                 ]
                 data.push(temp)
-            })
+            }
         } else {
-            reportData.devices.forEach(d => {
-                const group = userData.groups.find(g => d.device.groupId === g.id)
+            if (userData.byDriver) {
+                reportData.drivers.forEach(d => {
+                    const group = userData.groups.find(g => g.drivers.includes(d.driver.id))
 
-                const temp = [
-                    d.summary.deviceName,
-                    d.device.model,
-                    group ? group.name : '',
-                    Number((d.summary.distance / 1000).toFixed(0))
-                ]
-                data.push(temp)
-            })
-        }
+                    const temp = [
+                        d.driver.name,
+                        group ? group.name : '',
+                        Number((d.summary.distance / 1000).toFixed(0)),
+                    ]
+                    data.push(temp)
+                })
+            } else {
+                reportData.devices.forEach(d => {
+                    const group = userData.groups.find(g => d.device.groupId === g.id)
 
-        const footValues = []
-        if(userData.byDriver) {
-            footValues.push(
-                'Total:' + reportData.drivers.length,
-                '',
-                (reportData.drivers.reduce((a, b) => a + b.summary.distance, 0)/1000).toFixed(0)
-            )
-        } else {
-            footValues.push(
-                'Total:' + reportData.devices.length,
-                '',
-                '',
-                (reportData.devices.reduce((a, b) => a + b.summary.distance, 0)/1000).toFixed(0),
-            )
-        }
+                    const temp = [
+                        d.summary.deviceName,
+                        d.device.model,
+                        group ? group.name : '',
+                        Number((d.summary.distance / 1000).toFixed(0))
+                    ]
+                    data.push(temp)
+                })
+            }
 
-        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
-            },
-            footStyles: {
-                fillColor: style.pdfFooterColor,
-                textColor: style.pdfFooterTextColor,
-                fontSize: 9
-            },
-            startY: 35 });
-
-        return doc
+            const footValues = []
+            if(userData.byDriver) {
+                footValues.push(
+                    'Total:' + reportData.drivers.length,
+                    '',
+                    (reportData.drivers.reduce((a, b) => a + b.summary.distance, 0)/1000).toFixed(0)
+                )
+            } else {
+                footValues.push(
+                    'Total:' + reportData.devices.length,
+                    '',
+                    '',
+                    (reportData.devices.reduce((a, b) => a + b.summary.distance, 0)/1000).toFixed(0),
+                )
+            }
+
+            const style = getStyle(getUserPartner(userData.user))
+
+            return addTable(doc, headers, data, footValues, style, 35)
+        }
     }
 }
 
@@ -120,55 +221,48 @@ function exportKmsReportToExcel(userData, reportData) {
 
     const headers = []
 
-    if(userData.byDriver) {
+    if(userData.groupByDay){
         headers.push(
-            {label: translations.report.driver, value: 'driver'},
+            {label: translations.report.vehicle, value: 'name'},
             {label: translations.report.group, value: 'group'},
+            {label: translations.report.date, value: 'date'},
             {label: translations.report.distance, value: 'distance'})
-    } else {
+    } else if(userData.byDriver) {
         headers.push(
-            {label: translations.report.vehicle, value: 'name'},
+            {label: translations.report.driver, value: 'name'},
             {label: translations.report.group, value: 'group'},
             {label: translations.report.distance, value: 'distance'})
     }
 
     let data = []
-    if(userData.byDriver){
-        if (reportData.drivers) {
-            reportData.drivers.forEach(d => {
-                const group = userData.groups.find(g => g.drivers.includes(d.driver.id))
+    const info = userData.byDriver ? reportData.drivers : reportData.devices
+    info.forEach(d => {
+        const group = userData.byDriver ? userData.groups.find(g => g.drivers.includes(d.driver.id)) :
+            userData.groups.find(g => d.device.groupId === g.id)
 
+            if(userData.groupByDay) {
+                data = data.concat([{}])
+                data = data.concat(d.days.map(a => {
+                    return {
+                        name: userData.byDriver ? d.driver.name : d.device.name,
+                        group: group ? group.name : '',
+                        date: a.date,
+                        distance: Number((a.kms / 1000).toFixed(0))
+                    }
+                }))
+            } else {
                 data = data.concat([{
-                    driver: d.driver.name,
+                    name: userData.byDriver ? d.driver.name : d.summary.deviceName,
                     group: group ? group.name : '',
                     distance: Number((d.summary.distance / 1000).toFixed(0))
                 }])
-            })
-            console.log(data)
-            return {
-                headers,
-                data,
-                settings
             }
-        }
-    } else {
-        if (reportData.devices) {
-            reportData.devices.forEach(d => {
-                const group = userData.groups.find(g => d.device.groupId === g.id)
+    })
 
-                data = data.concat([{
-                    name: d.summary.deviceName,
-                    group: group ? group.name : '',
-                    distance: Number((d.summary.distance / 1000).toFixed(0))
-                }])
-            })
-            console.log(data)
-            return {
-                headers,
-                data,
-                settings
-            }
-        }
+    return {
+        headers,
+        data,
+        settings
     }
 }
 

package/src/util/pdfDocument.js

@@ -1,3 +1,4 @@
+require('jspdf-autotable')
 const {getStyle} = require("../reportStyle");
 const {getUserPartner} = require("fleetmap-partners");
 const {getImgFromUrl} = require("./utils")
@@ -8,9 +9,12 @@ async function header(doc, title, hostname, style) {
     doc.text(title, 15, 15 )
 
     if(style.imgWidth && style.imgHeight) {
-        const image = await getImgFromUrl(hostname)
-        if(image){
-            doc.addImage(image, 'PNG', 220 + (style.imgWidth < 50 ? 25 : 0), 5, style.imgWidth, style.imgHeight)
+        try{
+            const image = await getImgFromUrl(hostname)
+            if(image){
+                doc.addImage(image, 'PNG', 220 + (style.imgWidth < 50 ? 25 : 0), 5, style.imgWidth, style.imgHeight)
+            }
+        } catch (e) {
         }
     }
     doc.setFont('helvetica', 'normal')
@@ -21,5 +25,30 @@ async function headerFromUser(doc, title, user) {
     return header(doc, title, partner.host, getStyle(partner))
 }
 
+function addTable(doc, headers, data, footValues, style, startY){
+    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
+        },
+        footStyles: {
+            fillColor: style.pdfFooterColor,
+            textColor: style.pdfFooterTextColor,
+            fontSize: 9
+        },
+        startY: startY });
+}
+
 exports.header = header
 exports.headerFromUser = headerFromUser
+exports.addTable = addTable

package/src/util/utils.js

@@ -35,12 +35,8 @@ async function getImgFromUrl(hostname) {
         img.src = '/img/logos/' + hostname + '.png'
         return img
     } catch (e) {
-        try{
-            const response = await axios.get('https://' + hostname + '/img/logos/' + hostname + '.png', { responseType: 'arraybuffer' })
-            return Buffer.from(response.data, 'binary').toString('base64')
-        } catch (e) {
-            return null
-        }
+        const response = await axios.get('https://' + hostname + '/img/logos/' + hostname + '.png', { responseType: 'arraybuffer' })
+        return Buffer.from(response.data, 'binary').toString('base64')
     }
 }