fleetmap-reports 1.0.951 → 1.0.953

package/package.json

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

package/src/activity-report.js

@@ -17,6 +17,7 @@ const { devicesToProcess } = require('./util/device')
 const { getDriverData } = require('./util/driver')
 const { calculateConsumption } = require('./util/fuel')
 const axios = require('axios')
+const { getSummaryByDay } = require('./util/traccar')
 
 const fileName = 'ActivityReport'
 
@@ -101,6 +102,12 @@ async function createActivityReportByDevice (from, to, userData, traccarInstance
     const sliced = automaticReports.sliceArray(allDevices, 10)
     await executeServerSide(allData, sliced, from, to, userData, allDevices.length)
   } else {
+    let summaryByDay = []
+    if (userData.allWeek && userData.groupByDay) {
+      const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
+      summaryByDay = await getSummaryByDay(dates, userData, traccarInstance, allDevices, true)
+    }
+
     let deviceCount = 0
     const sliced = automaticReports.sliceArray(allDevices, 20)
     for (const devices of sliced) {
@@ -113,7 +120,7 @@ async function createActivityReportByDevice (from, to, userData, traccarInstance
 
       // Process report data
       if (summary.length || trips.length) {
-        allData.devices = allData.devices.concat(await processDevices(from, to, devices, { summary, trips, route }, userData, traccarInstance))
+        allData.devices = allData.devices.concat(await processDevices(from, to, devices, { summaryByDay, summary, trips, route }, userData, traccarInstance))
       }
       deviceCount += devices.length
     }
@@ -201,9 +208,12 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
             })
           }
         } else {
+          const summaryByDay = data.summaryByDay.find(a => a.date.getTime() === date.getTime())
+          const summaryByDevice = summaryByDay.summary.find(a => a.deviceId === d.id)
+
           const summaryCurrentDay = { date, deviceId: d.id }
           summaryCurrentDay.engineHours = tripsByDay.reduce((a, b) => a + b.duration, 0)
-          summaryCurrentDay.distance = distance
+          summaryCurrentDay.distance = summaryByDevice.distance
           summaryCurrentDay.averageSpeed = distance > 0 ? ((tripsByDay.reduce((a, b) => a + (b.averageSpeed * b.distance), 0)) / distance) : 0
           summaryCurrentDay.maxSpeed = tripsByDay.reduce((a, b) => { return a > b.maxSpeed ? a : b.maxSpeed }, 0)
           summaryCurrentDay.convertedSpentFuel = calculateConsumption(d, { route: routeByDay })
@@ -211,8 +221,8 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
           summaryCurrentDay.startAddress = tripsByDay.length && tripsByDay[0].startAddress
           summaryCurrentDay.endTime = tripsByDay.length && tripsByDay[tripsByDay.length - 1].endTime
           summaryCurrentDay.endAddress = tripsByDay.length && tripsByDay[tripsByDay.length - 1].endAddress
-          summaryCurrentDay.startOdometer = tripsByDay.length ? tripsByDay[0].startOdometer : 0
-          summaryCurrentDay.endOdometer = tripsByDay.length ? tripsByDay[tripsByDay.length - 1].endOdometer : 0
+          summaryCurrentDay.startOdometer = summaryByDevice.startOdometer
+          summaryCurrentDay.endOdometer = summaryByDevice.endOdometer
           summaryCurrentDay.startTimeIsOut = tripsByDay.some(t => t.startTimeIsOut)
           summaryCurrentDay.endTimeIsOut = tripsByDay.some(t => t.endTimeIsOut)
           summary.push(summaryCurrentDay)

package/src/partnerReports/performance-report.js

@@ -2,11 +2,7 @@ const automaticReports = require('../automaticReports')
 const traccarHelper = require('../util/traccar')
 const { getUncompletedTrip } = require('../util/trips')
 const { getEndTripMessages, getCanDriverStyleMessages, parseEndTripMessage, parseCanDriverStyleMessage } = require('../util/xpert')
-const { calculateDistance, getTranslations, getLanguage } = require('../util/utils')
-const { addTable } = require('../util/pdfDocument')
-const jsPDF = require('jspdf')
-const { getStyle } = require('../reportStyle')
-const { getUserPartner } = require('fleetmap-partners')
+const { calculateDistance } = require('../util/utils')
 
 async function createPerformanceReport (from, to, userData, traccar) {
   const reportData = []
@@ -218,48 +214,4 @@ function calculateRPMSections (route, min, max) {
   return sections
 }
 
-function exportPerformanceReportToPDF (userData, reportData) {
-  const timezone = userData.user.attributes.timezone
-  const translations = getTranslations(userData)
-  const lang = getLanguage(userData)
-
-  const headers = [
-    translations.report.vehicle,
-    'Totale Utilisation',
-    'Conduite',
-    'Ralenti',
-    'Totale (L)',
-    'Conduite (L)',
-    'Ralenti (L)',
-    'Conduite (Km)',
-    'Économique',
-    'Économique (L)',
-    'Économique (Km)',
-    'Cruise Control',
-    'Cruise Control (L)',
-    'Cruise Control (Km)',
-    'Tour moteur élevé',
-    'Accéleration brusque (Sum)',
-    'Freinage brusque (Sum)',
-    'Virages brusque'
-  ]
-
-  const data = []
-  reportData.devices.forEach(d => {
-
-  })
-
-  const doc = new jsPDF.jsPDF('l')
-  const style = getStyle(getUserPartner(userData.user))
-
-  addTable(doc, headers, data, footValues, style)
-  return doc
-}
-
-function exportPerformanceReportToExcel (userData, reportData) {
-
-}
-
 exports.createPerformanceReport = createPerformanceReport
-exports.exportPerformanceReportToPDF = exportPerformanceReportToPDF
-exports.exportPerformanceReportToExcel = exportPerformanceReportToExcel

package/src/tests/zones.test.js

@@ -45,19 +45,19 @@ describe('zones', function () {
 
   // eslint-disable-next-line no-undef
   it('works with casais zones in columns', async () => {
-    const report = await getReports('fleetmap.joao.penas2@gmail.com', 'penas46881')
+    const report = await getReports()
     const userData = await report.getUserData()
     userData.zonesByColumn = true
-    userData.devices = userData.devices.filter(d => d.id === 81202)
+    userData.devices = userData.devices.filter(d => d.id === 81201)
     userData.geofences = userData.geofences.filter(g => g.name === 'baliza 1 - raio verde ' ||
     g.name === 'baliza 2 - raio amarelo')
     userData.onlyWithKmsOut = false
     const result = await report.zoneReport(
-      new Date(Date.UTC(2023, 6, 13, 0, 0, 0, 0)),
-      new Date(Date.UTC(2023, 6, 13, 23, 59, 59, 0)),
+      new Date(Date.UTC(2023, 7, 17, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 7, 20, 23, 59, 59, 0)),
       userData)
     const first = result[0].devices[0]
     console.log(first)
-    assert.equal(first.days[0].distanceOut, 28)
+    assert.equal(first.days[0].distanceOut, 0)
   }, 4000000)
 })

package/src/util/traccar.js

@@ -129,7 +129,7 @@ async function getAllInOne (
   }
 }
 
-async function getSummaryByDay (dates, userData, traccarInstance, allDevices) {
+async function getSummaryByDay (dates, userData, traccarInstance, allDevices, ignorePercentage = false) {
   const days = []
   let counter = 0
   for (const date of dates) {
@@ -143,7 +143,9 @@ async function getSummaryByDay (dates, userData, traccarInstance, allDevices) {
     } = await getAllInOne(traccarInstance, startDate, endDate, allDevices, false, false, false, true, 0, allDevices.length, allDevices.length, allDevices.length, undefined, true)
 
     counter = counter + 1
-    console.log(`PROGRESS_PERC:${counter / dates.length * 100}`)
+    if (!ignorePercentage) {
+      console.log(`PROGRESS_PERC:${counter / dates.length * 100}`)
+    }
     days.push({
       date,
       summary

package/src/zone-report.js

@@ -441,7 +441,7 @@ async function getInAndOutEvents (devices, route, userData) {
         geofencesFeatures.forEach((g, id) => {
           if (checkGeofenceIn(p, g)) {
             p.inside[id] = true
-            events.push(createEvent('geofenceIn', d.id, p, g))
+            events.push(createEvent('geofenceEnter', d.id, p, g))
           }
         })
         return

package/src/tests/gpsjump.test.js

@@ -1,23 +0,0 @@
-const { getReports } = require('./index')
-const assert = require('assert')
-const { convertMS } = require('../util/utils')
-const { createGPSJumpReport } = require('../partnerReports/gpsjump-report')
-
-// eslint-disable-next-line no-undef
-describe('gpsjump', function () {
-  // eslint-disable-next-line no-undef
-  it('gpsjump report', async () => {
-    const report = await getReports()
-    const userData = await report.getUserData()
-    userData.devices = userData.devices.filter(d => d.id === 22326)
-    const data = await createGPSJumpReport(
-      new Date(Date.UTC(2023, 6, 1, 0, 0, 0, 0)),
-      new Date(Date.UTC(2023, 6, 17, 23, 59, 59, 0)),
-      userData,
-      report.traccar)
-    console.log(data)
-    assert.equal(data[0].consumption, 19.799999999999997)
-    assert.equal(data[0].distance, 326.7657)
-    assert.equal(convertMS(data[1].time * 1000, false), '08:19')
-  }, 8000000)
-})