fleetmap-reports 1.0.659 → 1.0.660

package/package.json

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

package/src/activity-report.js

@@ -2,7 +2,10 @@ const automaticReports = require('./automaticReports')
 const { convertMS, getDates, getTranslations, weekDaySelected } = require('./util/utils')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
-const { headerFromUser, addTable } = require('./util/pdfDocument')
+const {
+  headerFromUser, addTable,
+  pdfPageByDay
+} = require('./util/pdfDocument')
 const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const traccar = require('./util/traccar')
@@ -428,31 +431,7 @@ function exportActivityReportToPDFVehicleGroupByDay (doc, translations, reportDa
   ]
 
   reportData.devices.forEach(function (d, index) {
-    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 ? 8 : 0
-    if (index) {
-      doc.addPage()
-    }
-
-    doc.setFontSize(13)
-    doc.text(name, 20, space + 20)
-    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)
-
-    if (!userData.allWeek && userData.weekDays) {
-      doc.text((userData.weekDays.monday ? ' ' + translations.report.monday + ',' : '') +
-                (userData.weekDays.tuesday ? ' ' + translations.report.tuesday + ',' : '') +
-                (userData.weekDays.wednesday ? ' ' + translations.report.wednesday + ',' : '') +
-                (userData.weekDays.thursday ? ' ' + translations.report.thursday + ',' : '') +
-                (userData.weekDays.friday ? ' ' + translations.report.friday + ',' : '') +
-                (userData.weekDays.saturday ? ' ' + translations.report.saturday + ',' : '') +
-                (userData.weekDays.sunday ? ' ' + translations.report.sunday + ',' : '') +
-                ' das ' +
-                userData.dayHours.startTime + ' - ' + userData.dayHours.endTime, 20, space + 30)
-    }
+    pdfPageByDay(userData, d, index, doc, translations, reportData)
 
     const data = []
     d.summary.forEach(s => {

package/src/kms-report.js

@@ -1,7 +1,10 @@
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
 const { getStyle } = require('./reportStyle')
-const { headerFromUser, addTable } = require('./util/pdfDocument')
+const {
+  headerFromUser, addTable,
+  pdfPageByDay
+} = require('./util/pdfDocument')
 const { getUserPartner } = require('fleetmap-partners')
 const traccar = require('./util/traccar')
 const { getDates, convertFromUTC, getTranslations } = require('./util/utils')
@@ -165,53 +168,52 @@ function processDevices (from, to, devices, data, userData) {
     const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
 
     if (trips.length > 0 && userData.groupByDay) {
-        trips.forEach(t => {
-          t.tripDay = convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' 12:00 PM'
-        })
-        const groupedTrips = trips.reduce(
-          (entryMap, e) => entryMap.set(e.tripDay, [...entryMap.get(e.tripDay) || [], e]),
-          new Map()
-        )
-
-        const allDates = getDates(from, to)
-
-        const days = []
-        let keys = Array.from(groupedTrips.keys())
-        allDates.forEach(d => {
-          const day = d.toISOString().split('T')[0] + ' 12:00 PM'
-          if (!keys.includes(day)) {
-            groupedTrips.set(day, [])
-          }
-        })
+      trips.forEach(t => {
+        t.tripDay = convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' 12:00 PM'
+      })
+      const groupedTrips = trips.reduce(
+        (entryMap, e) => entryMap.set(e.tripDay, [...entryMap.get(e.tripDay) || [], e]),
+        new Map()
+      )
+
+      const allDates = getDates(from, to)
+
+      const days = []
+      let keys = Array.from(groupedTrips.keys())
+      allDates.forEach(d => {
+        const day = d.toISOString().split('T')[0] + ' 12:00 PM'
+        if (!keys.includes(day)) {
+          groupedTrips.set(day, [])
+        }
+      })
 
-        keys = Array.from(groupedTrips.keys())
-        keys.sort((a, b) => new Date(a).getTime() - new Date(b).getTime())
-        keys.forEach(key => {
-          const currentDate = new Date(key)
-          const dayTrips = groupedTrips.get(key)
-          const day = {
-            date: currentDate,
-            kms: 0
-          }
+      keys = Array.from(groupedTrips.keys())
+      keys.sort((a, b) => new Date(a).getTime() - new Date(b).getTime())
+      keys.forEach(key => {
+        const currentDate = new Date(key)
+        const dayTrips = groupedTrips.get(key)
+        const day = {
+          date: currentDate,
+          kms: 0
+        }
 
-          day.kms = dayTrips.reduce((a, b) => a + b.distance, 0)
+        day.kms = dayTrips.reduce((a, b) => a + b.distance, 0)
 
-          days.push(day)
-        })
-        devicesResult.push({
-          device: d,
-          days
-        })
-      } else {
-        devicesResult.push({
-          device: d,
-          summary: {
-            distance: trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
-          }
-        })
-      }
+        days.push(day)
+      })
+      devicesResult.push({
+        device: d,
+        days
+      })
+    } else {
+      devicesResult.push({
+        device: d,
+        summary: {
+          distance: trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
+        }
+      })
     }
-
+  }
 
   return devicesResult
 }
@@ -246,55 +248,34 @@ async function exportKmsReportToPDF (userData, reportData) {
   }
   if (kmsData) {
     const orientation = userData.groupByDay ? 'p' : 'l'
+    // eslint-disable-next-line new-cap
     const doc = new jsPDF.jsPDF(orientation)
     await headerFromUser(doc, translations.report.titleKmsReport, userData.user, orientation)
 
     if (userData.groupByDay) {
       kmsData.forEach(function (d, index) {
-        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 ? 8 : 0
-        if (index) {
-          doc.addPage()
-        }
-
-        doc.setFontSize(13)
-        doc.text(name, 20, space + 20)
-        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)
-
-        if (!userData.allWeek && userData.weekDays) {
-          doc.text((userData.weekDays.monday ? ' ' + translations.report.monday + ',' : '') +
-                        (userData.weekDays.tuesday ? ' ' + translations.report.tuesday + ',' : '') +
-                        (userData.weekDays.wednesday ? ' ' + translations.report.wednesday + ',' : '') +
-                        (userData.weekDays.thursday ? ' ' + translations.report.thursday + ',' : '') +
-                        (userData.weekDays.friday ? ' ' + translations.report.friday + ',' : '') +
-                        (userData.weekDays.saturday ? ' ' + translations.report.saturday + ',' : '') +
-                        (userData.weekDays.sunday ? ' ' + translations.report.sunday + ',' : '') +
-                        ' das ' +
-                        userData.dayHours.startTime + ' - ' + userData.dayHours.endTime, 20, space + 30)
-        }
+        pdfPageByDay(userData, d, index, doc, translations, reportData)
 
         const data = []
-        d.days.forEach(day => {
-          const temp = [
-            new Date(day.date).toLocaleDateString() + ' - ' + weekDays[day.date.getDay()],
-            (day.kms / 1000).toFixed(0)
-          ]
+        if (d.days) {
+          d.days.forEach(day => {
+            const temp = [
+              new Date(day.date).toLocaleDateString() + ' - ' + weekDays[day.date.getDay()],
+              (day.kms / 1000).toFixed(0)
+            ]
+
+            data.push(temp)
+          })
 
-          data.push(temp)
-        })
+          const footValues = []
+          footValues.push(
+            '',
+            (d.days.reduce((a, b) => a + b.kms, 0) / 1000).toFixed(0)
+          )
 
-        const footValues = []
-        footValues.push(
-          '',
-          (d.days.reduce((a, b) => a + b.kms, 0) / 1000).toFixed(0)
-        )
-
-        const style = getStyle(getUserPartner(userData.user))
-        addTable(doc, headers, data, footValues, style, 40)
+          const style = getStyle(getUserPartner(userData.user))
+          addTable(doc, headers, data, footValues, style, 40)
+        }
       })
     } else {
       doc.setFontSize(11)

package/src/location-report.js

@@ -7,6 +7,7 @@ const { convertToLocaleString, getTranslations } = require('./util/utils')
 const traccarHelper = require('./util/traccar')
 const { devicesToProcess } = require('./util/device')
 const automaticReports = require('./automaticReports')
+const { getDriverName } = require('./util/driver')
 
 const fileName = 'LocationReport'
 
@@ -248,7 +249,7 @@ async function exportLocationReportToPDF (userData, reportData) {
           a.address,
           Math.round(a.speed * 1.85200),
           a.attributes.ignition ? translations.report.ignitionOn : translations.report.ignitionOff,
-          userData.byDriver ? a.vehicleName : getDriverName(a, userData.drivers)
+          userData.byDriver ? a.vehicleName : getDriverName(a.attributes.driverUniqueId, a.fixTime, userData)
         ]
 
         if (userData.includeTemperature) {
@@ -389,7 +390,7 @@ function exportLocationReportToExcel (userData, reportData) {
           address: a.address,
           speed: Math.round(a.speed * 1.85200),
           ignition: a.attributes.ignition ? translations.report.ignitionOn : translations.report.ignitionOff,
-          driver: userData.byDriver ? d.driver.name : getDriverName(a, userData.drivers),
+          driver: userData.byDriver ? d.driver.name : getDriverName(a.attributes.driverUniqueId, a.fixTime, userData),
           temperature: getTempValue(a),
           digitalport1: getDigitalPortValue(a, 1, translations, d.device.attributes),
           digitalport2: getDigitalPortValue(a, 2, translations, d.device.attributes),
@@ -426,15 +427,6 @@ function getLocationDate (location, user) {
   return convertToLocaleString(location.fixTime, user.attributes.lang, user.attributes.timezone)
 }
 
-function getDriverName (location, drivers) {
-  if (location.attributes.driverUniqueId) {
-    const driver = drivers.find(d => d.uniqueId === location.attributes.driverUniqueId)
-    return driver ? driver.name : location.attributes.driverUniqueId
-  }
-
-  return ''
-}
-
 function getMaxSpeed (data) {
   const values = data.map(item => {
     return item.speed

package/src/trip-report.js

@@ -10,7 +10,7 @@ const trips = require('./util/trips')
 const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getTripIdleTime } = require('./util/trips')
 const { devicesToProcess, deviceName } = require('./util/device')
 const { getIdleEvents } = require('./util/route')
-const { reportByDriver } = require('./util/driver')
+const { reportByDriver, getDriverName } = require('./util/driver')
 const { getNearestPOIs } = require('./util/geofence')
 
 const fileName = 'TripReport'
@@ -346,7 +346,7 @@ async function exportTripReportToPDF (userData, reportData) {
         if (userData.byDriver) {
           temp.push(a.deviceName)
         } else {
-          temp.push(getDriverName(userData.drivers, a.driverUniqueId))
+          temp.push(getDriverName(a.driverUniqueId, a.startTime, userData))
         }
 
         data.push(temp)
@@ -436,7 +436,7 @@ function exportTripReportToExcel (userData, reportData) {
       data = data.concat([{}])
       data = data.concat(d.trips.map(a => {
         return {
-          name: userData.byDriver ? getDriverName(userData.drivers, a.driverUniqueId) : a.deviceName,
+          name: userData.byDriver ? d.driver.name : a.deviceName,
           date: getTripDate(userData.user, a),
           start: getTripStart(userData.user, a),
           end: getTripEnd(userData.user, a),
@@ -449,7 +449,7 @@ function exportTripReportToExcel (userData, reportData) {
           maxSpeed: Math.round(a.maxSpeed * 1.85200),
           consumption: a.fuelConsumption && a.fuelConsumption.toFixed(1),
           avgConsumption: a.avgFuelConsumption && a.avgFuelConsumption.toFixed(1),
-          subname: userData.byDriver ? a.deviceName : getDriverName(userData.drivers, a.driverUniqueId)
+          subname: userData.byDriver ? a.deviceName : getDriverName(a.driverUniqueId, a.startTime, userData)
         }
       }))
       // Totals
@@ -487,17 +487,6 @@ function getTripEnd (user, trip) {
   return convertToLocaleTimeString(trip.endTime, user.attributes.lang, user.attributes.timezone)
 }
 
-function getDriverName (drivers, driverUniqueId) {
-  if (driverUniqueId) {
-    const driver = drivers.find(d => d.uniqueId === driverUniqueId)
-    return driver
-      ? driver.name + ' ' + ((driver.attributes && driver.attributes.notes) || '')
-      : driverUniqueId
-  }
-
-  return ''
-}
-
 function getSumTotalKms (user, data) {
   const values = data.map(item => {
     return item.totalKms ? parseFloat(item.totalKms) : 0

package/src/util/driver.js

@@ -37,5 +37,30 @@ async function reportByDriver (devices, traccar, from, to, userData, processor)
   return report
 }
 
+function getDriverUniqueIdTimeline (driverUniqueIdTimeline, driverUniqueId, date) {
+  return driverUniqueIdTimeline.find(d => d.uniqueId === driverUniqueId &&
+      new Date(d.startDate) <= new Date(date) &&
+      new Date(d.endDate) >= new Date(date))
+}
+
+function getDriverName (driverUniqueId, date, userData) {
+  if (driverUniqueId) {
+    const timeline = getDriverUniqueIdTimeline(userData.driverUniqueIdTimeline, driverUniqueId, date)
+
+    if (timeline) {
+      return timeline.driverName
+    }
+
+    const driver = userData.drivers.find(d => d.uniqueId === driverUniqueId)
+    return driver
+      ? driver.name + ' ' + ((driver.attributes && driver.attributes.notes) || '')
+      : driverUniqueId
+  }
+
+  return ''
+}
+
+exports.getDriverName = getDriverName
+exports.getDriverUniqueIdTimeline = getDriverUniqueIdTimeline
 exports.devicesByDriver = devicesByDriver
 exports.reportByDriver = reportByDriver