fleetmap-reports 1.0.673 → 1.0.675

package/package.json

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

package/src/util/traccar.js

@@ -95,7 +95,8 @@ async function getAllInOne (
       requests.push(
         traccar.axios.get(u, {
           jar: traccar.cookieJar,
-          withCredentials: true
+          withCredentials: true,
+          timeout: 900000
         }).then(r => r.data).then(x => {
           console.log('LOADING_MESSAGE:' + _chunk[0].name)
           if (counter) {
@@ -105,6 +106,7 @@ async function getAllInOne (
             currentDeviceCount += devicesPerRequest
             console.log(`PROGRESS_PERC:${currentDeviceCount / totalDevices * 100}`)
           }
+          console.log(_chunk.map(d => `deviceId=${d.id}`), x.route && x.route.length)
           return x
         }))
     }

package/src/zone-report.js

@@ -19,7 +19,7 @@ const axios = require('axios')
 const { processServerSide } = require('./util')
 const { filterPositions } = require('./util/route')
 const sliceSize = 10
-const deviceChunk = 2
+const deviceChunk = 1
 const fileName = 'ZoneReport'
 
 async function createZoneReport (from, to, userData, traccar) {
@@ -447,10 +447,10 @@ async function exportZoneReportToPDF (userData, reportData) {
             convertToLocaleDateString(a.date, userData.user.attributes.lang, userData.user.attributes.timezone),
             a.firstIn ? convertToLocaleTimeString(a.firstIn, userData.user.attributes.lang, userData.user.attributes.timezone) : '-',
             a.lastOut ? convertToLocaleTimeString(a.lastOut, userData.user.attributes.lang, userData.user.attributes.timezone) : '-',
-            a.distanceIn.toFixed(0),
-            a.timeIn ? convertMS(a.timeIn, false) : '',
-            a.distanceOut.toFixed(0),
-            a.timeOut ? convertMS(a.timeOut, false) : ''
+            a.distanceIn && a.distanceIn.toLocaleString(this.user.attributes.lang, { maximumFractionDigits: 2 }),
+            convertMS(a.timeIn, false),
+            a.distanceOut && a.distanceOut.toLocaleString(this.user.attributes.lang, { maximumFractionDigits: 2 }),
+            convertMS(a.timeOut, false)
           ]
           data.push(temp)
         })
@@ -460,8 +460,8 @@ async function exportZoneReportToPDF (userData, reportData) {
             geofenceExit(userData.user, a),
             a.stopped ? translations.report.yes : translations.report.no,
             a.totalTime ? convertMS(a.totalTime * 1000, true) : '',
-            a.distanceIn && a.distanceIn.toLocaleString(userData.user.attributes.lang, { maximumFractionDigits: 1 }),
-            a.distanceOut && a.distanceOut.toLocaleString(userData.user.attributes.lang, { maximumFractionDigits: 1 }),
+            a.distanceIn && a.distanceIn.toLocaleString(userData.user.attributes.lang, { maximumFractionDigits: 2 }),
+            a.distanceOut && a.distanceOut.toLocaleString(userData.user.attributes.lang, { maximumFractionDigits: 2 }),
             a.geofenceName,
             a.driverName
           ]
@@ -472,9 +472,9 @@ async function exportZoneReportToPDF (userData, reportData) {
         ? [
             'Total:' + d.days.length,
             '', '',
-            d.days.reduce((a, b) => a + b.distanceIn, 0).toFixed(0),
+            d.days.reduce((a, b) => a + b.distanceIn, 0).toLocaleString(userData.user.attributes.lang, { maximumFractionDigits: 2 }),
             '',
-            d.days.reduce((a, b) => a + b.distanceOut, 0).toFixed(0)
+            d.days.reduce((a, b) => a + b.distanceOut, 0).toLocaleString(userData.user.attributes.lang, { maximumFractionDigits: 2 })
           ]
         : [
             'Total:' + d.geofences.length
@@ -550,8 +550,8 @@ function exportZoneReportToExcel (userData, reportData) {
             date: convertToLocaleDateString(a.date, userData.user.attributes.lang, userData.user.attributes.timezone),
             firstIn: a.firstIn ? convertToLocaleTimeString(a.firstIn, userData.user.attributes.lang, userData.user.attributes.timezone) : '-',
             lastOut: a.lastOut ? convertToLocaleTimeString(a.lastOut, userData.user.attributes.lang, userData.user.attributes.timezone) : '-',
-            distanceIn: a.distanceIn.toFixed(0),
-            distanceOut: a.distanceOut.toFixed(0),
+            distanceIn: a.distanceIn && a.distanceIn.toLocaleString(this.user.attributes.lang, { maximumFractionDigits: 2 }),
+            distanceOut: a.distanceOut && a.distanceOut.toLocaleString(this.user.attributes.lang, { maximumFractionDigits: 2 }),
             timeIn: convertMS(a.timeIn),
             timeOut: convertMS(a.timeOut)
           }
@@ -564,6 +564,8 @@ function exportZoneReportToExcel (userData, reportData) {
             exit: geofenceExit(userData.user, a),
             stopped: a.stopped ? translations.report.yes : translations.report.no,
             duration: a.totalTime ? convertMS(a.totalTime * 1000, true) : '',
+            distanceIn: a.distanceIn && a.distanceIn.toLocaleString(this.user.attributes.lang, { maximumFractionDigits: 2 }),
+            distanceOut: a.distanceOut && a.distanceOut.toLocaleString(this.user.attributes.lang, { maximumFractionDigits: 2 }),
             zone: a.geofenceName,
             driver: a.driverName
           }