fleetmap-reports 1.0.379 → 1.0.382

package/package.json

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

package/src/activity-report.js

@@ -1,5 +1,5 @@
 const automaticReports = require("./automaticReports")
-const {convertMS, getDates, getTranslations} = require("./util/utils")
+const {convertMS, getDates, getTranslations, weekDaySelected} = require("./util/utils")
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
 const drivers = require("./util/driver")
@@ -169,20 +169,22 @@ function processDevices(from, to, devices, data, userData) {
                 const distance = tripsByDay.reduce((a, b) => a + b.distance, 0)
 
                 if(!userData.allWeek && userData.weekDays && userData.dayHours) {
-                    summary.push({
-                        date: date,
-                        deviceId: d.id,
-                        averageSpeed: distance > 0 ? ((tripsByDay.reduce((a, b) => a + (b.averageSpeed * b.distance), 0)) / distance) : 0,
-                        distance: distance,
-                        engineHours: tripsByDay.reduce((a, b) => a + b.duration, 0),
-                        maxSpeed: tripsByDay.reduce((a, b) => {
-                            return a > b.maxSpeed ? a : b.maxSpeed
-                        }, 0),
-                        endOdometer: 0,
-                        startOdometer: 0,
-                        startTime: tripsByDay.length && tripsByDay[0].startTime,
-                        endTime: tripsByDay.length && tripsByDay[tripsByDay.length-1].endTime
-                    })
+                    if(weekDaySelected(date, userData.weekDays)) {
+                        summary.push({
+                            date: date,
+                            deviceId: d.id,
+                            averageSpeed: distance > 0 ? ((tripsByDay.reduce((a, b) => a + (b.averageSpeed * b.distance), 0)) / distance) : 0,
+                            distance: distance,
+                            engineHours: tripsByDay.reduce((a, b) => a + b.duration, 0),
+                            maxSpeed: tripsByDay.reduce((a, b) => {
+                                return a > b.maxSpeed ? a : b.maxSpeed
+                            }, 0),
+                            endOdometer: 0,
+                            startOdometer: 0,
+                            startTime: tripsByDay.length && tripsByDay[0].startTime,
+                            endTime: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endTime
+                        })
+                    }
                 } else {
                     const summaryCurrentDay = data.summaries.find(s => {
                         return  s.deviceId === d.id && s.date.getTime() === date.getTime()})

package/src/index.test.js

@@ -200,9 +200,9 @@ describe('Test_Reports', function() {
         assert.equal(data.length, 1)
         const device = data[0].devices.find(d => d.device.id===22326)
         assert.equal(device.summary[0].startOdometer, 122502742.59)
-        assert.equal(device.summary[0].distance, 1386539.76000001)
+        assert.equal(device.summary[0].distance, 1423529.600000009)
         assert.equal(device.summary[0].startTime, '2022-01-01T13:35:47.000+0000')
-        assert.equal(device.summary[0].endTime, '2022-01-30T14:08:13.000+0000')
+        assert.equal(device.summary[0].endTime, '2022-01-31T17:36:27.000+0000')
     }, 40000)
     it('Activity 2 by device', async () => {
         const report = await getReports()
@@ -235,16 +235,16 @@ describe('Test_Reports', function() {
         const reports = await getReports()
         const userData = await reports.getUserData()
         const r = await require('./util/traccar').getAllInOne(reports.traccar,
-            new Date(2022, 1, 1),
-            new Date(2022, 1, 4),
+            new Date(2022, 1, 1, 0, 0, 0, 0),
+            new Date(2022, 1, 4, 23, 59, 59, 0),
             userData.devices,
             false,
             true,
             true,
             false)
 
-        assert.equal(r.trips.filter(t => t.deviceId === 22327).length, 10)
-        assert.equal(r.stops.filter(t => t.deviceId === 22327).length, 11)
+        assert.equal(r.trips.filter(t => t.deviceId === 22327).length, 20)
+        assert.equal(r.stops.filter(t => t.deviceId === 22327).length, 21)
     }, 20000)
     it('Total KMS', async () => {
         const report = await getReports()

package/src/trip-report.js

@@ -45,16 +45,28 @@ async function createTripReportByDevice(from, to, userData, traccar) {
     devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
     const devicesToSlice = devices.slice()
-    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devicesToSlice, true, true, true, false)
-    const tripsData = allInOne.trips
-    const stopsData = allInOne.stops
-    const routeData = allInOne.route
-
-    console.log('Trips:' + tripsData.length)
-
-    if (tripsData.length > 0) {
-        trips.checkTripsKms(traccar, from, to, devices, {trips: tripsData, route: routeData})
-        allData.devices = processDevices(from, to, devices, {trips: tripsData, stops: stopsData, route: routeData}, userData)
+    const sliced = automaticReports.sliceArray(devicesToSlice, 5)
+
+    console.log('LOADING_MESSAGE:' + devices.map(d => d.name).join(', '))
+    let deviceCount = 0
+    for(const slice of sliced) {
+        const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, true, true, false)
+        const tripsData = allInOne.trips
+        const stopsData = allInOne.stops
+        const routeData = allInOne.route
+
+        console.log('Trips:' + tripsData.length)
+
+        if (tripsData.length > 0) {
+            trips.checkTripsKms(traccar, from, to, slice, {trips: tripsData, route: routeData})
+            allData.devices.push(...processDevices(from, to, slice, {
+                trips: tripsData,
+                stops: stopsData,
+                route: routeData
+            }, userData))
+        }
+        deviceCount = deviceCount + slice.length
+        console.log(`PROGRESS_PERC:${deviceCount / devices.length * 100}`)
     }
 
     return allData
@@ -133,8 +145,6 @@ function processDevices(from, to, devices, data, userData) {
         const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
         const stops = data.stops.filter(s => s.deviceId === d.id)
 
-        console.log('LOADING_MESSAGE:' + d.name)
-
         addNearestPOIs(trips, userData)
 
         trips.forEach(trip => {

package/src/util/traccar.js

@@ -71,10 +71,8 @@ async function getAllInOne(traccar, from, to, devices, getRoutes, getTrips, getS
     if(getTrips)   url += `&type=trips`
     if(getStops)   url += `&type=stops`
     if(getSummary) url += `&type=summary`
-    console.log('LOADING_MESSAGE:' + devices.map(d => d.name).join(', '))
 
     const sliced = automaticReports.sliceArray(devices, 5)
-    let deviceCount = 0
     const result = []
     for(const chunk of sliced) {
         const requests = chunk.map(d =>
@@ -83,7 +81,6 @@ async function getAllInOne(traccar, from, to, devices, getRoutes, getTrips, getS
             withCredentials: true
         }).then(r => r.data).then(x => {
                 console.log('LOADING_MESSAGE:' + d.name)
-                console.log(`PROGRESS_PERC:${++deviceCount / devices.length * 100}`)
                 return x
             }))
         result.push(...(await Promise.all(requests)))

package/src/util/trips.js

@@ -1,4 +1,4 @@
-const {coordsDistance, convertFromUTC} = require("./utils");
+const {coordsDistance, convertFromUTC, weekDaySelected} = require("./utils");
 
 const minDistance = 0
 const minAvgSpeed = 0
@@ -57,13 +57,7 @@ function isPartialInsideTimetable(t, userData, route){
 
     let isPartialInside = false
 
-    if((tripStart.getDay() === 0 && userData.weekDays.sunday) ||
-        (tripStart.getDay() === 1 && userData.weekDays.monday) ||
-        (tripStart.getDay() === 2 && userData.weekDays.tuesday) ||
-        (tripStart.getDay() === 3 && userData.weekDays.wednesday)  ||
-        (tripStart.getDay() === 4 && userData.weekDays.thursday) ||
-        (tripStart.getDay() === 5 && userData.weekDays.friday) ||
-        (tripStart.getDay() === 6 && userData.weekDays.saturday)) {
+    if(weekDaySelected(tripStart, userData.weekDays)) {
 
         const startDate = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' '+userData.dayHours.startTime)
         const endDate = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' '+userData.dayHours.endTime)
@@ -122,14 +116,7 @@ function isInsideTimetable(t, userData){
     const tripStart = new Date(t.startTime)
     const tripEnd = new Date(t.endTime)
 
-    if((tripStart.getDay() === 0 && userData.weekDays.sunday) ||
-        (tripStart.getDay() === 1 && userData.weekDays.monday) ||
-        (tripStart.getDay() === 2 && userData.weekDays.tuesday) ||
-        (tripStart.getDay() === 3 && userData.weekDays.wednesday)  ||
-        (tripStart.getDay() === 4 && userData.weekDays.thursday) ||
-        (tripStart.getDay() === 5 && userData.weekDays.friday) ||
-        (tripStart.getDay() === 6 && userData.weekDays.saturday)) {
-
+    if(weekDaySelected(tripStart, userData.weekDays)) {
         const startDate = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' '+userData.dayHours.startTime)
         const endDate = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' '+userData.dayHours.endTime)
 

package/src/util/utils.js

@@ -130,6 +130,16 @@ function convertFromUTC(value, timezone) {
     return valueDate
 }
 
+function weekDaySelected(date, weekDays){
+    return (date.getDay() === 0 && weekDays.sunday) ||
+    (date.getDay() === 1 && weekDays.monday) ||
+    (date.getDay() === 2 && weekDays.tuesday) ||
+    (date.getDay() === 3 && weekDays.wednesday)  ||
+    (date.getDay() === 4 && weekDays.thursday) ||
+    (date.getDay() === 5 && weekDays.friday) ||
+    (date.getDay() === 6 && weekDays.saturday)
+}
+
 exports.getImgFromUrl = getImgFromUrl
 exports.convertMS = convertMS
 exports.coordsDistance = coordsDistance
@@ -140,6 +150,7 @@ exports.convertToLocaleTimeString = convertToLocaleTimeString
 exports.isClientSide = isClientSide
 exports.getTimezoneOffset = getTimezoneOffset
 exports.convertFromUTC = convertFromUTC
+exports.weekDaySelected = weekDaySelected
 exports.getLogo = (user) => {
     const host = window ? window.location.hostname : getUserPartner(user).host
     return getImage(getLogoUrl(host))