fleetmap-reports 1.0.977 → 1.0.979

package/package.json

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

package/src/partnerReports/dailyuse-report.js

@@ -1,6 +1,6 @@
 const traccarHelper = require('../util/traccar')
 const { isInsideTimetable } = require('../util/trips')
-const { convertFromUTCDate, getTranslations, convertMS } = require('../util/utils')
+const { convertFromUTCDate, getTranslations, convertMS, convertToLocaleTimeString, isClientSide } = require('../util/utils')
 const automaticReports = require('../automaticReports')
 const jsPDF = require('jspdf')
 const { getStyle } = require('../reportStyle')
@@ -83,49 +83,43 @@ function processDeviceData (allInOne, d, userData) {
 
 async function exportDailyUseReportToPDF (userData, reportData) {
   const translations = getTranslations(userData)
+  const timezone = userData.user.attributes.timezone
+  const lang = userData.user.attributes.lang || (isClientSide() && navigator.language)
 
   const headers = [
     translations.report.vehicle,
-    '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'
+    'Immatriculation',
+    'Groupe',
+    'Matin départ',
+    'Matin arrêt',
+    'Matin temps',
+    'Déjeuner',
+    'Après-midi départ',
+    'Après-midi arrêt',
+    'Après-midi temps',
+    'Total temps',
+    'Total conduit',
+    'Total arrêts',
+    'Total kms'
   ]
 
   const data = []
   reportData.forEach(d => {
     const row = [
       d.device,
-      convertMS((d.drivingTime + d.idleTime) * 1000),
-      convertMS(d.drivingTime * 1000),
-      convertMS(d.idleTime * 1000),
-      d.drivingConsumption + d.idleConsumption,
-      d.drivingConsumption,
-      d.idleConsumption,
-      d.drivingDistance.toFixed(2),
-      convertMS(d.economicTime * 1000),
-      d.economicConsumption.toFixed(1),
-      d.economicDistance.toFixed(2),
-      convertMS(d.cruiseControlTime * 1000),
-      d.cruiseControlConsumption.toFixed(1),
-      d.cruiseControlDistance.toFixed(2),
-      convertMS(d.highEngineRPM * 1000),
-      d.hardAcceleration,
-      d.hardBraking,
-      d.hardCornering
+      d.licensePlate,
+      d.group,
+      convertToLocaleTimeString(d.morningStart, lang, timezone, userData.user),
+      convertToLocaleTimeString(d.morningEnd, lang, timezone, userData.user),
+      convertMS(d.morningTime),
+      convertMS(d.lunch),
+      convertToLocaleTimeString(d.afternoonStart, lang, timezone, userData.user),
+      convertToLocaleTimeString(d.afternoonEnd, lang, timezone, userData.user),
+      convertMS(d.afternoonTime),
+      convertMS(d.totalTime),
+      convertMS(d.totalDrivingTime),
+      d.totalStops,
+      (d.totalDistance / 100).toFixed(1)
     ]
     data.push(row)
   })
@@ -142,7 +136,7 @@ async function exportDailyUseReportToPDF (userData, reportData) {
   style.headerFontSize = 8
   style.bodyFontSize = 7
   const columnStyles = {}
-  for (let i = 1; i < 18; i++) {
+  for (let i = 3; i < 14; i++) {
     columnStyles[i] = { halign: 'right' }
   }
   addTable(doc, headers, data, footValues, style, 40, columnStyles)

package/src/partnerReports/delayedstart-report.js

@@ -0,0 +1,69 @@
+const automaticReports = require('../automaticReports')
+const traccarHelper = require('../util/traccar')
+const { getDates, getTranslations } = require('../util/utils')
+const { getUserPartner } = require('fleetmap-partners')
+const { getDataByDay } = require('../util/trips')
+
+async function createDelayedStartReport (from, to, userData, traccar) {
+  const reportData = []
+
+  const devices = userData.devices
+
+  const sliced = automaticReports.sliceArray(devices, 5)
+  let deviceCount = 0
+  for (const slice of sliced) {
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, false, true, true, false, deviceCount, devices.length)
+
+    for (const d of slice) {
+      const deviceData = await processDeviceData(from, to, allInOne, d, userData, traccar)
+      reportData.push(deviceData)
+    }
+
+    deviceCount = deviceCount + slice.length
+  }
+
+  return reportData
+}
+
+async function processDeviceData (from, to, allInOne, d, userData, traccar) {
+  const group = userData.groups.find(g => g.id === d.groupId)
+  const trips = allInOne.trips.filter(t => t.deviceId === d.id)
+  const translations = getTranslations(userData)
+
+  const weekDays = [
+    translations.report.sunday,
+    translations.report.monday,
+    translations.report.tuesday,
+    translations.report.wednesday,
+    translations.report.thursday,
+    translations.report.friday,
+    translations.report.saturday
+  ]
+
+  const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
+
+  const deviceData = {
+
+  }
+
+  for (const date of dates) {
+    const { tripsByDay } = await getDataByDay(d, date, { trips }, userData, traccar)
+
+    if (tripsByDay.length > 0) {
+      const startTime = tripsByDay[0].startTime
+      const stopTime = tripsByDay[tripsByDay.length].endTime
+
+      const deviceDayData = {
+        device: d.name,
+        licensePlate: d.attributes.license_plate,
+        group: group ? group.name : '',
+        driver: '',
+        weekDay: weekDays[new Date(date).getDay()],
+        startDate: '',
+        startTime: '',
+        delayDescription: '',
+        stopTime: ''
+      }
+    }
+  }
+}

package/src/speeding-report.js

@@ -366,13 +366,13 @@ async function invokeValhalla (route, i, chunk, country, threshold, results, ret
       console.log(e.message, 'retry:', retry)
       return invokeValhalla(route, i, chunk, country, threshold, results, retry)
     } else {
-      console.error(e.message, e.response && e.response.data, slice[0])
+      console.error(e.message, e.response && e.response.data, 'deviceId', slice[0] && slice[0].deviceId, slice[0] && slice[0].address)
     }
   }
 }
 
 async function getOSMSpeedingEvents (devices, routes, threshold, minimumMinutes = 0, country) {
-  const chunk = 1000
+  const chunk = 500
   const events = []
   for (const d of devices) {
     const route = routes.filter(r => r.deviceId === d.id)

package/src/stop-report.js

@@ -57,33 +57,45 @@ function processDevices (from, to, devices, data, userData) {
     const route = data.route.filter(t => t.deviceId === d.id)
 
     deviceStops.forEach(stop => {
+      stop.stopDuration = calculateStopDuration(stop)
+    })
+
+    if (deviceStops.length && route.length && !route[0].attributes.ignition) {
+      deviceStops[0].startTime = undefined
+    }
+
+    const filteredStops = deviceStops.filter(s => s.stopDuration > (userData.minimumStopMinutes ? userData.minimumStopMinutes * 60 * 1000 : 0))
+
+    filteredStops.forEach(stop => {
+      const routeInsideGeofence = route.filter(p =>
+        new Date(p.fixTime).getTime() >= new Date(stop.startTime).getTime() &&
+          new Date(p.fixTime).getTime() <= new Date(stop.endTime).getTime())
+
       const nearestPOIs = getNearestPOIs(stop.longitude, stop.latitude, userData.geofences)
       if (nearestPOIs.length > 0) {
         stop.endPOIName = nearestPOIs[0].p.name
       }
 
-      const geofence = userData.geofences.filter(g => g && g.area.startsWith('POLYGON')).find(g =>
-        insideGeofence({ latitude: stop.latitude, longitude: stop.longitude }, g)
-      )
-      if (geofence) {
-        const group = userData.groups.find(g => g.geofenceIds && g.geofenceIds.includes(geofence.id))
-        stop.geofenceName = geofence.name
-        stop.geofenceGroup = (group && group.name) || ''
-      }
-
-      stop.stopDuration = calculateStopDuration(stop)
+      routeInsideGeofence.every(p => {
+        const geofence = userData.geofences.filter(g => g && g.area.startsWith('POLYGON')).find(g =>
+          insideGeofence({ latitude: p.latitude, longitude: p.longitude }, g)
+        )
+        if (geofence) {
+          const group = userData.groups.find(g => g.geofenceIds && g.geofenceIds.includes(geofence.id))
+          stop.geofenceName = geofence.name
+          stop.geofenceGroup = (group && group.name) || ''
+          return false
+        }
+        return true
+      })
     })
 
-    if (deviceStops.length > 0) {
-      if (route.length && !route[0].attributes.ignition) {
-        deviceStops[0].startTime = undefined
-      }
-
+    if (filteredStops.length > 0) {
       const deviceData = {
         device: d,
         from,
         to,
-        stops: deviceStops.filter(s => s.stopDuration > (userData.minimumStopMinutes ? userData.minimumStopMinutes * 60 * 1000 : 0))
+        stops: filteredStops
       }
 
       devicesResult.push(deviceData)

package/src/tests/activity.test.js

@@ -35,8 +35,8 @@ describe('activity report', function () {
     const report = await getReports()
     const userData = await report.getUserData()
     userData.groupByDay = true
-    const data = await report.activityReport(new Date(2023, 9, 1, 0, 0, 0, 0),
-      new Date(2023, 9, 20, 23, 59, 59, 0),
+    const data = await report.activityReport(new Date(2022, 0, 1, 0, 0, 0, 0),
+      new Date(2022, 0, 20, 23, 59, 59, 0),
       userData)
     assert.equal(data.length, 1)
     const device = data[0].devices.find(d => d.device.id === 22326)

package/src/tests/performance.test.js

@@ -1,12 +1,7 @@
 const { getReports } = require('./index')
-const { createPerformanceReport, exportPerformanceReportToExcel } = require('../partnerReports/performance-report')
+const { createPerformanceReport } = require('../partnerReports/performance-report')
 const assert = require('assert')
 const { convertMS } = require('../util/utils')
-const xlsx = require('@jcardus/json-as-xlsx')
-const { createActivityReport } = require('../activity-report')
-const { createFuelConsumptionReport } = require('../fuelconsumption-report')
-const { createPassengerReport } = require('../partnerReports/passenger-report')
-
 // eslint-disable-next-line no-undef
 describe('performance', function () {
   // eslint-disable-next-line no-undef
@@ -20,59 +15,22 @@ describe('performance', function () {
       userData,
       report.traccar)
     console.log(data)
-
     assert.equal(data[0].consumption, 19.799999999999997)
-    assert.equal(data[0].distance, 326.8844199999999)
-    assert.equal(convertMS(data[1].time * 1000, false), '08:31')
+    assert.equal(data[0].distance, 326.7657)
+    assert.equal(convertMS(data[1].time * 1000, false), '08:19')
   }, 8000000)
 
   // eslint-disable-next-line no-undef
   it('performance report inofleet', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
-    userData.devices = userData.devices.filter(d => d.id === 126442)
+    userData.devices = userData.devices.filter(d => d.id === 69114)
     const data = await createPerformanceReport(
-      new Date(Date.UTC(2023, 11, 9, 14, 58, 0, 0)),
-      new Date(Date.UTC(2023, 11, 18, 9, 28, 0, 0)),
+      new Date(Date.UTC(2023, 5, 11, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 6, 11, 23, 59, 59, 0)),
       userData,
       report.traccar)
     console.log(data)
-
-    const data2 = await createFuelConsumptionReport(
-      new Date(Date.UTC(2023, 11, 9, 14, 58, 0, 0)),
-      new Date(Date.UTC(2023, 11, 18, 9, 28, 0, 0)),
-      userData,
-      report.traccar)
-    console.log(data2)
-
     assert.equal(data[0].consumption, 168.51989999999998)
   }, 8000000)
-
-  it('performance report export excel', async () => {
-    const report = await getReports()
-    const userData = await report.getUserData()
-    const data = await createPerformanceReport(
-      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)
-    const excel = exportPerformanceReportToExcel(userData, data)
-    xlsx([{
-      sheet: 'Sheet1',
-      columns: excel.headers,
-      content: excel.data
-    }], excel.settings)
-  }, 8000000)
-
-  it('passenger report export excel', async () => {
-    const report = await getReports()
-    const userData = await report.getUserData()
-    const data = await createPassengerReport(
-      new Date(Date.UTC(2023, 11, 1, 0, 0, 0, 0)),
-      new Date(Date.UTC(2023, 11, 20, 23, 59, 59, 0)),
-      userData,
-      report.traccar)
-    console.log(data)
-  }, 8000000)
 })

package/src/tests/zones.test.js

@@ -27,6 +27,17 @@ describe('zones', function () {
     console.log('result', result)
   }, 4000000)
 
+  it('trips between geofences', async () => {
+    const report = await getReports(process.env.USER_MOVIFLOTTE, process.env.PASS_MOVIFLOTTE)
+    const userData = await report.getUserData()
+    userData.tripsBetweenZones = true
+    const result = await report.zoneReport(
+        new Date(Date.UTC(2024, 0, 8, 0, 0, 0, 0)),
+        new Date(Date.UTC(2024, 0, 8, 23, 59, 59, 0)),
+        userData)
+    console.log('result', result)
+  }, 4000000)
+
   // eslint-disable-next-line no-undef
   it('works with casais', async () => {
     const report = await getReports(process.env.USER_CASAIS, process.env.PASS_CASAIS)

package/src/zone-report.js

@@ -307,33 +307,33 @@ function calculateDistanceIn (zoneInOutDayData, deviceRoute, dayRoute, fromByDay
   return distanceIn
 }
 
-function calculateDistanceOut (zoneInOutDayData, dayRoute, from, to, field, device) {
+function calculateDistanceOut (zoneInOutDayData, dayRoute, fromByDay, toByDay, field, device) {
   if (zoneInOutDayData.length) {
-    const dataInsideDay = zoneInOutDayData.filter(z => z.outTime && new Date(z.outTime.fixTime) < to)
+    const dataInsideDay = zoneInOutDayData.filter(z => z.outTime && new Date(z.outTime.fixTime) < toByDay)
     let distanceOut = dataInsideDay.reduce((a, b) => a + (b[field] || 0), 0)
 
-    if (zoneInOutDayData[0].inTime && new Date(zoneInOutDayData[0].inTime.fixTime) > from && (field !== 'distanceOutAny' || zoneInOutDayData[0].anyLastExit)) {
+    if (zoneInOutDayData[0].inTime && new Date(zoneInOutDayData[0].inTime.fixTime) > fromByDay && (field !== 'distanceOutAny' || zoneInOutDayData[0].anyLastExit)) {
       // Add distanceOut before the first entry
       const routeOut = dayRoute.filter(p =>
         new Date(p.fixTime).getTime() < new Date(zoneInOutDayData[0].inTime.fixTime).getTime() &&
-          new Date(p.fixTime).getTime() >= from.getTime()
+          new Date(p.fixTime).getTime() >= fromByDay.getTime()
       )
       distanceOut = distanceOut + calculateDistance(routeOut, device.attributes['report.ignoreOdometer'])
     }
 
-    if (zoneInOutDayData[zoneInOutDayData.length - 1].outTime && new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime) < to && (field !== 'distanceOutAny' || zoneInOutDayData[zoneInOutDayData.length - 1].anyNextIn)) {
+    if (zoneInOutDayData[zoneInOutDayData.length - 1].outTime && new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime) < toByDay && (field !== 'distanceOutAny' || zoneInOutDayData[zoneInOutDayData.length - 1].anyNextIn)) {
       // Add distanceOut after last exit
       distanceOut = distanceOut - zoneInOutDayData[zoneInOutDayData.length - 1][field]
       const routeOut = dayRoute.filter(p =>
         new Date(p.fixTime) >= new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime).getTime() &&
-          new Date(p.fixTime) < to.getTime())
+          new Date(p.fixTime) < toByDay.getTime())
       distanceOut = distanceOut + calculateDistance(routeOut, device.attributes['report.ignoreOdometer'])
     }
 
     return distanceOut
   }
 
-  return calculateDistance(dayRoute.filter(p => new Date(p.fixTime) >= from && new Date(p.fixTime) < to), device.attributes['report.ignoreOdometer'])
+  return calculateDistance(dayRoute.filter(p => new Date(p.fixTime) >= fromByDay && new Date(p.fixTime) < toByDay), device.attributes['report.ignoreOdometer'])
 }
 
 function analyseAlerts (alerts, deviceRoute, userData, from, to, device) {