fleetmap-reports 1.0.465 → 1.0.467

package/lang/enGB.js

@@ -226,6 +226,7 @@ module.exports = {
     endOdometer: 'End (Km)',
     spentFuel: 'Spent Fuel',
     engineHours: 'Use (H:m)',
+    totalEngineHours: 'Total Use (H:m)',
     driverHours: 'Driving Time (H:m)',
     refueling: 'Refueling',
     fueldrop: 'Fuel Drop (L)',

package/lang/esCL.js

@@ -215,6 +215,7 @@ module.exports = {
     endOdometer: 'End (Km)',
     spentFuel: 'Consumo',
     engineHours: 'Utilización (HH:mm)',
+    totalEngineHours: 'Utilización Total (H:m)',
     driverHours: 'Tiempo de Conducción (H:m)',
     refueling: 'Cargas',
     fueldrop: 'Combustível Perdido (L)',

package/lang/ptBR.js

@@ -218,6 +218,7 @@ module.exports = {
     endOdometer: 'Fim (Km)',
     spentFuel: 'Consumo (L)',
     engineHours: 'Utilização (H:m)',
+    totalEngineHours: 'Total Use (H:m)',
     driverHours: 'Tempo de Condução (H:m)',
     refueling: 'Abastecimentos',
     fueldrop: 'Combustível Perdido (L)',

package/lang/ptPT.js

@@ -224,6 +224,7 @@ module.exports = {
     endOdometer: 'Fim (Km)',
     spentFuel: 'Consumo (L)',
     engineHours: 'Utilização (H:m)',
+    totalEngineHours: 'Total Use (H:m)',
     driverHours: 'Tempo de Condução (H:m)',
     refueling: 'Abastecimentos',
     fueldrop: 'Combustível Perdido (L)',

package/package.json

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

package/src/machines-report.js

@@ -1,8 +1,7 @@
 const { devicesToProcess } = require('./util/device')
 const automaticReports = require('./automaticReports')
 const traccarHelper = require('./util/traccar')
-const { calculateTrip, isInsideTimetable, isPartialInsideTimetable } = require('./util/trips')
-const { getDates, weekDaySelected, convertMS, getTranslations } = require('./util/utils')
+const { getDates, convertMS, getTranslations, convertFromUTC } = require('./util/utils')
 const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const { addTable, headerFromUser } = require('./util/pdfDocument')
@@ -36,15 +35,13 @@ async function createMachinesReportByDevice (from, to, userData, traccar) {
 
   let deviceCount = 0
   for (const slice of sliced) {
-    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, true, false, false, deviceCount, devices.length)
-    const tripsData = allInOne.trips
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, false, false, false, deviceCount, devices.length)
     const routeData = allInOne.route
 
-    console.log('Trips:' + tripsData.length)
+    console.log('Route:' + routeData.length)
 
-    if (tripsData.length > 0) {
+    if (routeData.length > 0) {
       allData.devices.push(...processDevices(from, to, slice, {
-        trips: tripsData,
         route: routeData
       }, userData))
     }
@@ -54,58 +51,60 @@ async function createMachinesReportByDevice (from, to, userData, traccar) {
   return allData
 }
 
-function createSummary (date, d, tripsByDay) {
-  return {
-    date,
-    deviceId: d.id,
-    engineHours: tripsByDay.reduce((a, b) => a + b.duration, 0),
-    startTime: tripsByDay.length && tripsByDay[0].startTime,
-    endTime: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endTime
-  }
-}
-
 function processDevices (from, to, devices, data, userData) {
   const devicesResult = []
 
   devices.forEach(d => {
-    const deviceTrips = data.trips.filter(t => t.deviceId === d.id)
     const deviceRoute = data.route.filter(t => t.deviceId === d.id)
 
-    if (deviceRoute.length > 0) {
-      let uncompletedTripRoute = []
-      if (deviceRoute.length && deviceTrips.length && deviceRoute[deviceRoute.length - 1].attributes.ignition) {
-        uncompletedTripRoute = deviceRoute.filter(p => p.attributes.ignition && new Date(p.fixTime).getTime() > new Date(deviceTrips[deviceTrips.length - 1].endTime).getTime())
-        if (uncompletedTripRoute.length) {
-          deviceTrips.push(calculateTrip(d, uncompletedTripRoute))
-        }
-      }
-
+    if (deviceRoute.filter(p => p.attributes.ignition && p.valid).length > 0) {
       const summary = []
-      const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
 
-      const dates = getDates(from, to)
+      const convertFrom = new Date(convertFromUTC(from, userData.user.attributes.timezone))
+      const convertTo = new Date(convertFromUTC(to, userData.user.attributes.timezone))
+
+      const dates = getDates(convertFrom, convertTo)
+
       for (const date of dates) {
         const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
         const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
 
-        const tripsByDay = trips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay))
+        const routeByDay = deviceRoute.filter(p => (new Date(p.fixTime) > fromByDay && new Date(p.fixTime) < toByDay) && p.valid && p.attributes.hours !== undefined)
+
+        routeByDay.sort((a, b) => new Date(a.fixTime).getTime() - new Date(b.fixTime).getTime())
 
-        if (!userData.allWeek && userData.weekDays && userData.dayHours) {
-          if (weekDaySelected(date, userData.weekDays)) {
-            const trips = tripsByDay.filter(t => isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
-            summary.push(createSummary(date, d, trips))
+        let firstOn
+        let lastOff
+
+        routeByDay.forEach(p => {
+          if (p.attributes.ignition || (firstOn && !p.attributes.ignition && lastOff.attributes.ignition)) {
+            lastOff = p
           }
-        } else {
-          summary.push(createSummary(date, d, tripsByDay))
+
+          if (p.attributes.ignition && !firstOn) {
+            firstOn = p
+          }
+        })
+
+        const dayData = {
+          date,
+          deviceId: d.id,
+          engineHours: firstOn ? routeByDay[routeByDay.length - 1].attributes.hours - routeByDay[0].attributes.hours : 0,
+          totalHours: routeByDay.length ? routeByDay[routeByDay.length - 1].attributes.hours : undefined,
+          startTime: firstOn ? firstOn.fixTime : undefined,
+          endTime: lastOff ? lastOff.fixTime : undefined
         }
+
+        summary.push(dayData)
       }
 
-      const deviceData = {
-        device: d,
-        summary,
-        totalEngineHours: deviceRoute[deviceRoute.length - 1].attributes.hours
+      if (summary.length) {
+        const deviceData = {
+          device: d,
+          summary
+        }
+        devicesResult.push(deviceData)
       }
-      devicesResult.push(deviceData)
     }
   })
 
@@ -121,7 +120,8 @@ async function exportMachinesReportToPDF (userData, reportData) {
   const headers = [translations.report.date,
     translations.report.start,
     translations.report.end,
-    translations.report.engineHours]
+    translations.report.engineHours,
+    translations.report.totalEngineHours]
 
   const weekDays = [
     translations.report.sunday,
@@ -137,7 +137,7 @@ async function exportMachinesReportToPDF (userData, reportData) {
     const name = userData.byDriver ? d.driver.name : d.device.name
     const group = userData.byDriver ? userData.groups.find(g => g.drivers.includes(d.id)) : userData.groups.find(g => d.device.groupId === g.id)
 
-    const space = index === 0 ? 13 : 0
+    const space = index === 0 ? 8 : 0
     if (index) {
       doc.addPage()
     }
@@ -147,7 +147,6 @@ async function exportMachinesReportToPDF (userData, reportData) {
     doc.setFontSize(11)
     doc.text(group ? translations.report.group + ': ' + group.name : '', 150, space + 20)
     doc.text(new Date(reportData.from).toLocaleString() + ' - ' + new Date(reportData.to).toLocaleString(), 20, space + 25)
-    doc.text('Total de horas de uso: ' + convertMS(d.totalEngineHours), 20, space + 30)
 
     const data = []
     d.summary.forEach(s => {
@@ -155,7 +154,8 @@ async function exportMachinesReportToPDF (userData, reportData) {
         new Date(s.date).toLocaleDateString() + ' - ' + weekDays[s.date.getDay()],
         s.startTime ? new Date(s.startTime).toLocaleTimeString() : '',
         s.endTime ? new Date(s.endTime).toLocaleTimeString() : '',
-        convertMS(s.engineHours)
+        convertMS(s.engineHours),
+        s.totalHours ? convertMS(s.totalHours) : ''
       ]
 
       data.push(temp)
@@ -196,7 +196,8 @@ async function exportMachinesReportToExcel (userData, reportData) {
     { label: translations.report.date, value: 'date' },
     { label: translations.report.start, value: 'start' },
     { label: translations.report.end, value: 'end' },
-    { label: translations.report.engineHours, value: 'engineHours' }]
+    { label: translations.report.engineHours, value: 'engineHours' },
+    { label: translations.report.totalEngineHours, value: 'totalEngineHours' }]
 
   let data = []
   reportData.devices.forEach(d => {
@@ -211,7 +212,8 @@ async function exportMachinesReportToExcel (userData, reportData) {
         weekday: weekDays[s.date.getDay()],
         start: s.startTime ? new Date(s.startTime).toLocaleTimeString() : '',
         end: s.endTime ? new Date(s.endTime).toLocaleTimeString() : '',
-        engineHours: convertMS(s.engineHours)
+        engineHours: convertMS(s.engineHours),
+        totalEngineHours: s.totalHours ? convertMS(s.totalHours) : ''
       }
     }))
   })