fleetmap-reports 1.0.469 → 1.0.471

package/lang/index.js

@@ -19,6 +19,9 @@ module.exports = {
   'es-CL': {
     ...esCLLocale
   },
+  'es-ES': {
+    ...esCLLocale
+  },
   pt: {
     ...ptPTLocale
   }

package/package.json

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

package/src/fuelconsumption-report.js

@@ -3,7 +3,7 @@ const refuelingReport = require('./refueling-report')
 const traccarHelper = require('./util/traccar')
 const odoo = require('./util/odoo')
 const { devicesToProcess } = require('./util/device')
-const messages = require('../lang')
+const { getTranslations } = require('./util/utils')
 
 async function createFuelConsumptionReport (from, to, userData, traccar) {
   console.log('Create FuelConsumption Report')
@@ -108,8 +108,7 @@ function calculateConsumption (userData, d, day, avgConsumption, data) {
 }
 
 function exportFuelConsumptionReportToExcel (userData, reportData) {
-  const lang = userData.user.attributes.lang
-  const translations = messages[lang] ? messages[lang] : messages['en-GB']
+  const translations = getTranslations(userData)
 
   const settings = {
     sheetName: 'FuelConsumptionReport', // The name of the sheet

package/src/fueldrop-report.js

@@ -1,6 +1,6 @@
 const automaticReports = require('./automaticReports')
 const { devicesToProcess } = require('./util/device')
-const messages = require('../lang')
+const { getTranslations } = require('./util/utils')
 
 function calculateFuelDrop (position, positions) {
   const index = positions.indexOf(position)
@@ -91,8 +91,7 @@ async function createFuelDropReport (from, to, userData, traccar) {
 
 function exportFuelDropReportToExcel (userData, reportData) {
   console.log('Export to Excel')
-  const lang = userData.user.attributes.lang
-  const translations = messages[lang] ? messages[lang] : messages['en-GB']
+  const translations = getTranslations(userData)
 
   const settings = {
     sheetName: 'FuelDropReport', // The name of the sheet

package/src/kms-report.js

@@ -1,11 +1,10 @@
-const messages = require('../lang')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
 const { getStyle } = require('./reportStyle')
 const { headerFromUser, addTable } = require('./util/pdfDocument')
 const { getUserPartner } = require('fleetmap-partners')
 const traccar = require('./util/traccar')
-const { getDates, convertFromUTC } = require('./util/utils')
+const { getDates, convertFromUTC, getTranslations } = require('./util/utils')
 const trips = require('./util/trips')
 const drivers = require('./util/driver')
 const { isInsideTimetable, isPartialInsideTimetable, calculateTrip } = require('./util/trips')
@@ -218,8 +217,7 @@ function processDevices (from, to, devices, data, userData) {
 }
 
 async function exportKmsReportToPDF (userData, reportData) {
-  const lang = userData.user.attributes.lang || (navigator && navigator.language)
-  const translations = messages[lang] ? messages[lang] : messages['en-GB']
+  const translations = getTranslations(userData)
   const kmsData = userData.byDriver ? reportData.drivers : reportData.devices
 
   const weekDays = [
@@ -355,8 +353,7 @@ async function exportKmsReportToPDF (userData, reportData) {
 function exportKmsReportToExcel (userData, reportData) {
   console.log('Export to Excel')
 
-  const lang = userData.user.attributes.lang || (navigator && navigator.language)
-  const translations = messages[lang] ? messages[lang] : messages['en-GB']
+  const translations = getTranslations(userData)
 
   const weekDays = [
     translations.report.sunday,

package/src/machines-report.js

@@ -38,8 +38,6 @@ async function createMachinesReportByDevice (from, to, userData, traccar) {
     const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, false, false, false, deviceCount, devices.length)
     const routeData = allInOne.route
 
-    console.log('Route:' + routeData.length)
-
     if (routeData.length > 0) {
       allData.devices.push(...processDevices(from, to, slice, {
         route: routeData
@@ -63,41 +61,26 @@ function processDevices (from, to, devices, data, userData) {
       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 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())
-
-        let firstOn
-        let lastOff
-
-        routeByDay.forEach(p => {
-          if (p.attributes.ignition || (firstOn && !p.attributes.ignition && lastOff.attributes.ignition)) {
-            lastOff = p
-          }
-
-          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
+      if (userData.withDetails) {
+        const ignitions = calculateIgnitions(deviceRoute)
+        for (const ignition of ignitions) {
+          const dayData = getSummaryData(new Date(ignition.on.fixTime), d, ignition.route, ignition.on, ignition.off)
+          summary.push(dayData)
+        }
+      } else {
+        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 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())
+
+          const ignitions = calculateIgnitions(routeByDay)
+          const dayData = getSummaryData(date, d, routeByDay, ignitions.length ? ignitions[0].on : undefined, ignitions.length ? ignitions[ignitions.length - 1].off : undefined)
+          summary.push(dayData)
         }
-
-        summary.push(dayData)
       }
-
       if (summary.length) {
         const deviceData = {
           device: d,
@@ -111,6 +94,50 @@ function processDevices (from, to, devices, data, userData) {
   return devicesResult
 }
 
+function getSummaryData (date, device, route, start, end) {
+  return {
+    date,
+    deviceId: device.id,
+    engineHours: start ? route[route.length - 1].attributes.hours - route[0].attributes.hours : undefined,
+    totalHours: route.length ? route[route.length - 1].attributes.hours : undefined,
+    startTime: start ? start.fixTime : undefined,
+    endTime: end ? end.fixTime : undefined
+  }
+}
+
+function calculateIgnitions (routeOfDay) {
+  let indexStart
+  let last
+  const ignitions = []
+  routeOfDay.forEach((p, index) => {
+    // difference between last position and current position is bigger than 5 minutes
+    if ((last && last.attributes.ignition && (new Date(p.fixTime).getTime() - new Date(last.fixTime).getTime()) > 300000) &&
+        ignitions.length &&
+        !ignitions[ignitions.length - 1].off) {
+      ignitions[ignitions.length - 1].off = last
+      ignitions[ignitions.length - 1].route = routeOfDay.slice(indexStart, index)
+    }
+
+    if (p.attributes.ignition && (!ignitions.length || ignitions[ignitions.length - 1].off)) {
+      ignitions.push({ on: p })
+      indexStart = index
+    }
+
+    // ignition is off
+    // or is last route position
+    if ((!p.attributes.ignition || index + 1 === routeOfDay.length) &&
+        ignitions.length &&
+        !ignitions[ignitions.length - 1].off) {
+      ignitions[ignitions.length - 1].off = p
+      ignitions[ignitions.length - 1].route = (index + 1) === routeOfDay.length ? routeOfDay.slice(indexStart) : routeOfDay.slice(indexStart, index + 1)
+    }
+
+    last = p
+  })
+
+  return ignitions
+}
+
 async function exportMachinesReportToPDF (userData, reportData) {
   const doc = new jsPDF.jsPDF('l')
   const translations = getTranslations(userData)
@@ -163,7 +190,7 @@ async function exportMachinesReportToPDF (userData, reportData) {
 
     const footValues = ['',
       '', '',
-      convertMS(d.summary.reduce((a, b) => a + b.engineHours, 0))]
+      convertMS(d.summary.reduce((a, b) => a + (b.engineHours || 0), 0))]
 
     const style = getStyle(getUserPartner(userData.user))
     addTable(doc, headers, data, footValues, style, 40)

package/src/refueling-report.js

@@ -2,7 +2,7 @@ const helpers = require('@turf/helpers')
 const automaticReports = require('./automaticReports')
 const { devicesToProcess } = require('./util/device')
 const distance = require('@turf/distance')
-const messages = require('../lang')
+const { getTranslations } = require('./util/utils')
 
 const positionsToCheck = 15
 
@@ -178,8 +178,7 @@ async function calculateRefuelingPositions (userData, d, data) {
 
 function exportRefuelingReportToExcel (userData, reportData) {
   console.log('Export to Excel')
-  const lang = userData.user.attributes.lang
-  const translations = messages[lang] ? messages[lang] : messages['en-GB']
+  const translations = getTranslations(userData)
 
   const settings = {
     sheetName: 'RefuelingReport', // The name of the sheet

package/src/speeding-report.js

@@ -1,6 +1,5 @@
-const messages = require('../lang')
 const jsPDF = require('jspdf')
-const { convertMS, convertToLocaleString, convertToFeature, convertPositionToFeature } = require('./util/utils')
+const { convertMS, convertToLocaleString, convertToFeature, convertPositionToFeature, getTranslations } = require('./util/utils')
 const { headerFromUser, AmiriRegular } = require('./util/pdfDocument')
 require('jspdf-autotable')
 const { getStyle } = require('./reportStyle')
@@ -353,10 +352,10 @@ function calculateEventData (positions, pIndex, alert, device, geofence, userDat
 
 async function exportSpeedingReportToPDF (userData, reportData) {
   console.log('Export to PDF')
+  const lang = userData.user.attributes.lang || (navigator && navigator.language)
 
-  const lang = userData.user.attributes.lang
   const timezone = userData.user.attributes.timezone
-  const translations = messages[lang] ? messages[lang] : messages['en-GB']
+  const translations = getTranslations(userData)
 
   const overspeedData = userData.byDriver ? reportData.drivers : reportData.devices
 
@@ -479,9 +478,8 @@ async function exportSpeedingReportToPDF (userData, reportData) {
 function exportSpeedingReportToExcel (userData, reportData) {
   console.log('Export to Excel')
 
-  const lang = userData.user.attributes.lang
-  const translations = messages[lang] ? messages[lang] : messages['en-GB']
-
+  const lang = userData.user.attributes.lang || (navigator && navigator.language)
+  const translations = getTranslations(userData)
   const overspeedData = userData.byDriver ? reportData.drivers : reportData.devices
 
   const settings = {

package/src/util/utils.js

@@ -6,6 +6,9 @@ const distance = require('@turf/distance')
 
 exports.getTranslations = (userData) => {
   const lang = userData.user.attributes.lang || (navigator && navigator.language)
+  if (!messages[lang]) {
+    console.warn('no lang found for', userData.user, userData.user.attributes.lang, navigator && navigator.language)
+  }
   return messages[lang] ? messages[lang] : messages['en-GB']
 }