fleetmap-reports 1.0.284 → 1.0.288

package/src/automaticReports.js

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

package/src/events-report.js

@@ -1,11 +1,8 @@
 const automaticReports = require("./automaticReports")
 const messages = require('../lang')
 const jsPDF = require('jspdf')
-require('jspdf-autotable')
-const {getStyle} = require("./reportStyle");
-const {headerFromUser} = require("./util/pdfDocument");
-const {getUserPartner} = require("fleetmap-partners");
-const {convertToLocaleString} = require("./util/utils");
+const autotable =  require('jspdf-autotable')
+const reportStyle = require("./reportStyle")
 
 const fileName = 'EventReport'
 
@@ -117,11 +114,10 @@ async function processDevices(from, to, devices, geofences, drivers, data) {
     return devicesResult
 }
 
-async function exportSpeedingReportToPDF(userData, reportData) {
+function exportSpeedingReportToPDF(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 headers = [
@@ -133,7 +129,8 @@ async function exportSpeedingReportToPDF(userData, reportData) {
     if (reportData.devices) {
         let first = true
         const doc = new jsPDF.jsPDF('l');
-        await headerFromUser(doc, translations.report.titleEventsReport, userData.user)
+        doc.setFontSize(14)
+        doc.text(translations.report.titleEventsReport, 15, 15 )
 
         reportData.devices.forEach(d => {
             let data = []
@@ -147,11 +144,12 @@ async function exportSpeedingReportToPDF(userData, reportData) {
                 first = false
                 space = 10
             }
-            doc.setFontSize(13)
+            doc.setFontSize(12)
+
             doc.text(name, 20, space+20 )
-            doc.setFontSize(11)
+            doc.setFontSize(10)
             doc.text(group, 200, space+20 )
-            doc.text(convertToLocaleString(d.from, lang, timezone) + ' - ' + convertToLocaleString(d.to, lang, timezone), 20, space+25 )
+            doc.text(new Date(d.from).toLocaleString() + ' - ' + new Date(d.to).toLocaleString(), 20, space+25 )
 
             doc.autoTable(['','','','',''], [
                 [translations.report.event_ignitionOn,translations.report.event_ignitionOff, translations.report.event_geofenceEnter,
@@ -160,10 +158,9 @@ async function exportSpeedingReportToPDF(userData, reportData) {
                     d.alerts.filter(a => a.type === 'geofenceEnter').length,d.alerts.filter(a => a.type === 'geofenceExit').length,
                     d.alerts.filter(a => a.type === 'deviceOverspeed').length],
                 [translations.report.event_driverChanged,translations.report.event_powerOn, translations.report.event_sos,
-                    translations.report.event_deviceFuelDrop, translations.report.eve],
+                    translations.report.event_deviceFuelDrop],
                 [d.alerts.filter(a => a.type === 'driverChanged').length,d.alerts.filter(a => a.type === 'powerOn').length,
-                    d.alerts.filter(a => a.type === 'sos').length,d.alerts.filter(a => a.type === 'deviceFuelDrop').length,
-                    d.alerts.filter(a => a.type === 'powerCut').length]
+                    d.alerts.filter(a => a.type === 'sos').length,d.alerts.filter(a => a.type === 'deviceFuelDrop').length]
             ], { startY: space+30 , showHead: false, bodyStyles: { fillColor: [256, 256, 256], textColor: [30, 30, 30], halign: 'center', valign: 'middle' } , alternateRowStyles: {fillColor:  [256, 256, 256], valign: 'bottom'}});
 
             d.alerts.map(a => {
@@ -181,26 +178,22 @@ async function exportSpeedingReportToPDF(userData, reportData) {
                 '','',''
             ]
 
-            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
+                    fillColor: reportStyle.pdfHeaderColor,
+                    textColor: reportStyle.pdfHeaderTextColor
                 },
                 bodyStyles: {
-                    fillColor: style.pdfBodyColor,
-                    textColor: style.pdfBodyTextColor,
-                    fontSize: 8
+                    fillColor: reportStyle.pdfBodyColor,
+                    textColor: reportStyle.pdfBodyTextColor
                 },
                 footStyles: {
-                    fillColor: style.pdfFooterColor,
-                    textColor: style.pdfFooterTextColor,
-                    fontSize: 9
+                    fillColor: reportStyle.pdfFooterColor,
+                    textColor: reportStyle.pdfFooterTextColor
                 },
                 startY: space + 65
             })
@@ -272,7 +265,10 @@ function getAlertInfo(drivers, alert) {
 
 function getAlertDate(user, alert) {
     if(alert.position) {
-        return convertToLocaleString(alert.position.fixTime, user.attributes.lang, user.attributes.timezone)
+        return new Date(alert.position.fixTime).toLocaleString(user.attributes.lang, {
+            timeZone: user.attributes.timezone,
+            hour12: false
+        })
     }
 }
 

package/src/here.js

@@ -97,10 +97,10 @@ function fillGeocoding(rows) {
 }*/
 
 exports.routeMatch = async (rows) => {
-  console.log('here sending', rows.length)
   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/index.js

@@ -19,8 +19,8 @@ function Reports(config, axios) {
             byGroup: false
         }
     }
-    this.speedingReport = (from, to, userData) => {
-        return require('./speeding-report').createSpeedingReport(from, to, userData, this.traccar)
+    this.speedingReport = (from, to, userData, roadSpeedLimits) => {
+        return require('./speeding-report').createSpeedingReport(from, to, userData, this.traccar, roadSpeedLimits)
     }
 
     this.speedingReportToPDF = (userData, reportData) => {
@@ -124,16 +124,6 @@ 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,20 +1,27 @@
-const {getReports} = require("./tests");
+const Index = require('./index')
+const {SessionApi} = require("traccar-api");
+const axios = require('axios')
+const axiosCookieJarSupport = require('axios-cookiejar-support').default;
+const tough = require('tough-cookie');
+const cookieJar = new tough.CookieJar();
 
-describe('speedingReport', function() {
-    this.timeout(500000)
-    it('test speeding', async () => {
-        const report = await getReports()
-        const userData = await report.getUserData()
+axiosCookieJarSupport(axios)
 
-        await report.speedingReport(new Date(2021, 2, 30, 0, 0, 0, 0),
-            new Date(2021, 2, 30, 23, 59, 59, 0),
-            userData)
-    })
-    it('test kmsReport by day', async () => {
-        const reports = await getReports()
-        const userData = await reports.getUserData()
-        userData.groupByDay = true
-        await reports.kmsReport(new Date(2021, 9), new Date(2021, 10),
-            userData)
-    })
-})
+test('speedingReport', async () => {
+    const traccarConfig = {
+        basePath: 'https://api.pinme.io/api',
+        baseOptions: {
+            withCredentials: true,
+            jar: cookieJar
+        }
+    }
+
+    await new SessionApi(traccarConfig, null, axios).sessionPost('-','-')
+    const report = new Index(traccarConfig,  axios)
+    const userData = await report.getUserData()
+
+    await report.speedingReport(new Date(2021, 2, 30, 0, 0, 0, 0),
+        new Date(2021, 2, 30, 23, 59, 59, 0),
+        userData)
+
+}, 10000)