fleetmap-reports 1.0.459 → 1.0.463

package/package.json

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

package/src/activity-report.js

@@ -196,6 +196,7 @@ function processDevices (from, to, devices, data, userData) {
           })
 
           if (summaryCurrentDay) {
+            summaryCurrentDay.engineHours = tripsByDay.reduce((a, b) => a + b.duration, 0)
             summaryCurrentDay.distance = distance
             summaryCurrentDay.convertedSpentFuel = automaticReports.calculateSpentFuel(summaryCurrentDay.spentFuel, d)
             summaryCurrentDay.startTime = tripsByDay.length && tripsByDay[0].startTime
@@ -227,6 +228,7 @@ function processDevices (from, to, devices, data, userData) {
 
         if (summary.length) {
           summary.forEach(s => {
+            s.engineHours = deviceTrips.reduce((a, b) => a + b.duration, 0)
             s.distance = deviceTrips.reduce((a, b) => a + b.distance, 0)
             s.convertedSpentFuel = automaticReports.calculateSpentFuel(s.spentFuel, d)
             s.startTime = deviceTrips.length && deviceTrips[0].startTime

package/src/events-report.js

@@ -6,6 +6,7 @@ const { headerFromUser } = require('./util/pdfDocument')
 const { getUserPartner } = require('fleetmap-partners')
 const { convertToLocaleString, getTranslations } = require('./util/utils')
 const { devicesToProcess } = require('./util/device')
+const { isInside } = require('./util/timetable')
 
 const fileName = 'EventReport'
 
@@ -43,7 +44,7 @@ async function createEventsReport (from, to, userData, traccar) {
 
   if (data.length > 0) {
     reportData.push({
-      devices: await processDevices(from, to, devices, userData.geofences, userData.drivers, data, traccar),
+      devices: await processDevices(from, to, devices, data, traccar, userData),
       xpert: devices.filter(d => d.attributes.xpert).length > 0
     })
   }
@@ -68,21 +69,21 @@ async function getReportData (from, to, devices, types, traccar) {
   return data
 }
 
-async function processDevices (from, to, devices, geofences, drivers, data, traccar) {
+async function processDevices (from, to, devices, data, traccar, userData) {
   const devicesResult = []
   let i = 0
   await Promise.all(devices.map(async d => {
-    const alerts = data.filter(t => t.deviceId === d.id)
+    const deviceAlerts = data.filter(t => t.deviceId === d.id)
 
-    if (alerts.length > 0) {
+    if (deviceAlerts.length > 0) {
       const response = await traccar.reports.reportsRouteGet(from, to, [d.id])
       const positions = response.data
 
-      for (const a of alerts) {
+      for (const a of deviceAlerts) {
         a.position = positions.find(p => p.id === a.positionId)
 
         if (a.geofenceId) {
-          const geofence = geofences.find(g => g.id === a.geofenceId)
+          const geofence = userData.geofences.find(g => g.id === a.geofenceId)
           if (geofence) {
             if (a.type === 'deviceOverspeed') {
               a.geofenceName = geofence.name + ' (' + Math.round(a.attributes.speedLimit * 1.85200) + ' Km/h)'
@@ -93,11 +94,13 @@ async function processDevices (from, to, devices, geofences, drivers, data, trac
         }
 
         if (a.position && a.position.attributes.driverUniqueId) {
-          const driver = drivers.find(d => d.uniqueId === a.position.attributes.driverUniqueId)
+          const driver = userData.drivers.find(d => d.uniqueId === a.position.attributes.driverUniqueId)
           a.driver = driver && driver.name
         }
       }
 
+      const alerts = deviceAlerts.filter(a => userData.allWeek || !userData.weekDays || (!a.position || isInside(a.position.fixTime, a.position.fixTime, userData)))
+
       console.log('LOADING_MESSAGE:' + d.name)
       console.log(`PROGRESS_PERC:${++i / devices.length * 100}`)
 

package/src/index.test.js

@@ -15,6 +15,7 @@ async function getSpeedingReport (report, userData) {
 
 // eslint-disable-next-line no-undef
 describe('Test_Reports', function () {
+  this.timeout(500000)
   // eslint-disable-next-line no-undef
   it('Speeding by device', async () => {
     const report = await getReports()

package/src/location-report.js

@@ -188,6 +188,8 @@ async function exportLocationReportToPDF (userData, reportData) {
       headers.push(getDigitalPort1Label(userData.byDriver ? positionsData[0].driver : positionsData[0].device, translations))
       headers.push(getDigitalPort2Label(userData.byDriver ? positionsData[0].driver : positionsData[0].device, translations))
     }
+    headers.push('Latitude')
+    headers.push('Longitude')
 
     let first = true
     // eslint-disable-next-line new-cap
@@ -228,7 +230,8 @@ async function exportLocationReportToPDF (userData, reportData) {
           temp.push(getDigitalPortValue(a, 1, translations))
           temp.push(getDigitalPortValue(a, 2, translations))
         }
-
+        temp.push(a.latitude)
+        temp.push(a.longitude)
         data.push(temp)
       })
 
@@ -323,7 +326,9 @@ function exportLocationReportToExcel (userData, reportData) {
         { label: translations.report.address, value: 'address' },
         { label: translations.report.speed, value: 'speed' },
         { label: translations.report.ignition, value: 'ignition' },
-        { label: translations.report.driver, value: 'driver' }
+        { label: translations.report.driver, value: 'driver' },
+        { label: 'Latitude', value: 'latitude' },
+        { label: 'Longitude', value: 'longitude' }
       ]
 
   if (userData.includeTemperature) {

package/src/util/odoo.js

@@ -1,14 +1,16 @@
 
-async function getOdooFuelServices(traccar, from, to) {
-    const url = `/odoo/reports/refuelingServices?startDate=${from.toDateString()}&endDate=${to.toDateString()}`
+async function getOdooFuelServices (traccar, from, to) {
+  const url = `/odoo/reports/refuelingServices?startDate=${from.toDateString()}&endDate=${to.toDateString()}`
 
-    const {data} = await traccar.axios.get(url,{
-        jar: traccar.cookieJar,
-        withCredentials: true })
+  console.log('LOADING_MESSAGE:' + url)
+  const { data } = await traccar.axios.get(url, {
+    jar: traccar.cookieJar,
+    withCredentials: true
+  })
 
-    console.log(data)
+  console.log(data)
 
-    return data
+  return data
 }
 
 exports.getOdooFuelServices = getOdooFuelServices

package/src/util/timetable.js

@@ -0,0 +1,26 @@
+const { weekDaySelected, convertFromUTC, isClientSide, convertFromLocal } = require('./utils')
+
+function isInside (start, end, userData) {
+  const tripStart = new Date(start)
+  const tripEnd = new Date(end)
+
+  if (weekDaySelected(tripStart, userData.weekDays)) {
+    const startDateLocal = new Date(convertFromUTC(start, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
+    const endDateLocal = new Date(convertFromUTC(end, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
+
+    const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
+    const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
+
+    // Trips inside time period
+    if (startDate.getTime() < endDate.getTime()) {
+      return tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDate.getTime()
+    } else {
+      return (tripStart.getTime() < endDate.getTime() && tripEnd.getTime() < endDate.getTime()) ||
+                (tripStart.getTime() > startDate.getTime())
+    }
+  }
+
+  return false
+}
+
+exports.isInside = isInside

package/src/util/trips.js

@@ -1,4 +1,5 @@
 const { coordsDistance, convertFromUTC, weekDaySelected, convertFromLocal, isClientSide } = require('./utils')
+const { isInside } = require('./timetable')
 
 const minDistance = 0
 const minAvgSpeed = 0
@@ -112,26 +113,7 @@ function isPartialInsideTimetable (t, userData, route) {
 }
 
 function isInsideTimetable (t, userData) {
-  const tripStart = new Date(t.startTime)
-  const tripEnd = new Date(t.endTime)
-
-  if (weekDaySelected(tripStart, userData.weekDays)) {
-    const startDateLocal = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
-    const endDateLocal = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
-
-    const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
-    const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
-
-    // Trips inside time period
-    if (startDate.getTime() < endDate.getTime()) {
-      return tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDate.getTime()
-    } else {
-      return (tripStart.getTime() < endDate.getTime() && tripEnd.getTime() < endDate.getTime()) ||
-                (tripStart.getTime() > startDate.getTime())
-    }
-  }
-
-  return false
+  return isInside(t.startTime, t.endTime, userData)
 }
 
 function updateTrip (t, route) {