fleetmap-reports 2.0.388 → 2.0.389

package/package.json

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

package/src/activity-report.js

@@ -1,7 +1,7 @@
 const automaticReports = require('./automaticReports')
 const {
   convertMS, getDates, getTranslations, weekDaySelected, convertToLocaleString, isClientSide,
-  getLanguage, executeServerSide
+  getLanguage, executeServerSide, getTimetableText
 } = require('./util/utils')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
@@ -673,15 +673,7 @@ function exportActivityReportToPDFDriverGroupByDay (doc, translations, reportDat
     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)
+      doc.text(getTimetableText(userData, translations), 20, space + 30)
     }
 
     const data = []

package/src/fuel-consumption-report.js

@@ -3,7 +3,7 @@ const traccarHelper = require('./util/traccar')
 const odoo = require('./util/odoo')
 const automaticReports = require('./automaticReports')
 const { devicesToProcess } = require('./util/device')
-const { getTranslations, convertToLocaleString, getLanguage, convertMS, formatNumber, isClientSide, executeServerSide } = require('./util/utils')
+const { getTranslations, convertToLocaleString, getLanguage, convertMS, formatNumber, isClientSide, executeServerSide, getDayHoursByWeekDay } = require('./util/utils')
 const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const { addTable, headerFromUser } = require('./util/pdfDocument')
@@ -80,15 +80,16 @@ async function getReportSummaryByDay (dates, userData, traccar, devices, tz, rep
   const days = []
   for (const date of dates) {
     const { year, month, day } = zonedParts(date, tz)
+    const dayHours = getDayHoursByWeekDay(new Date(Date.UTC(year, month, day)).getUTCDay(), userData)
 
-    let startDate = zonedToUTC(year, month, day, ...parseHMS(userData.dayHours.startTime), tz)
+    let startDate = zonedToUTC(year, month, day, ...parseHMS(dayHours.startTime), tz)
     if (date.getTime() === firstDate.getTime()) {
       const p = zonedParts(reportFrom, tz)
       const clamp = zonedToUTC(year, month, day, p.hour, p.minute, p.second, tz)
       if (clamp.getTime() > startDate.getTime()) startDate = clamp
     }
 
-    let endDate = zonedToUTC(year, month, day, ...parseHMS(userData.dayHours.endTime), tz)
+    let endDate = zonedToUTC(year, month, day, ...parseHMS(dayHours.endTime), tz)
     if (date.getTime() === lastDate.getTime()) {
       const p = zonedParts(reportTo, tz)
       const clamp = zonedToUTC(year, month, day, p.hour, p.minute, p.second, tz)

package/src/partnerReports/dailyuse-report.js

@@ -39,6 +39,8 @@ function processDeviceData (allInOne, d, userData) {
     friday: true,
     saturday: true
   }
+  // this report splits each day into fixed morning/afternoon windows, so per-day hours don't apply
+  userData.dayHoursByDay = undefined
   userData.dayHours = {
     startTime: '00:00',
     endTime: '12:00'

package/src/trip-report.js

@@ -2,7 +2,7 @@ const automaticReports = require('./automaticReports')
 const jsPDF = require('jspdf')
 const {
   convertMS, convertToLocaleString, convertToLocaleDateString, convertToLocaleTimeString, getTranslations,
-  isClientSide, formatNumber
+  isClientSide, formatNumber, getTimetableText
 } = require('./util/utils')
 require('jspdf-autotable')
 const { getUserPartner } = require('fleetmap-partners')
@@ -373,15 +373,7 @@ async function exportTripReportToPDF (userData, reportData) {
       doc.text(group ? translations.report.group + ': ' + group.name : '', 200, space + 20)
       doc.text(convertToLocaleString(d.from, lang, timezone, userData.user) + ' - ' + convertToLocaleString(d.to, lang, timezone, userData.user), 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)
+        doc.text(getTimetableText(userData, translations), 20, space + 30)
         doc.text(translations.report.headerStartAddress + ': ' + d.trips[0].startAddress, 20, space + 40)
       } else {
         doc.text(translations.report.headerStartAddress + ': ' + d.trips[0].startAddress, 20, space + 35)

package/src/util/pdfDocument.js

@@ -1,7 +1,7 @@
 require('jspdf-autotable')
 const { getStyle } = require('../reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
-const { getImgFromUrl } = require('./utils')
+const { getImgFromUrl, getTimetableText } = require('./utils')
 const { version } = require('../../package.json')
 
 function addVersionFooter (doc) {
@@ -128,14 +128,6 @@ exports.pdfPageByDay = (userData, page, index, doc, translations, reportData) =>
   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)
+    doc.text(getTimetableText(userData, translations), 20, space + 30)
   }
 }

package/src/util/timetable.js

@@ -1,12 +1,13 @@
-const { weekDaySelected, convertFromUTC, isClientSide, convertFromLocal } = require('./utils')
+const { weekDaySelected, convertFromUTC, isClientSide, convertFromLocal, getDayHours } = require('./utils')
 
 function isInside (_tripStart, _tripEnd, userData) {
   const tripStart = new Date(_tripStart)
   const tripEnd = new Date(_tripEnd)
 
   if (weekDaySelected(tripStart, userData.weekDays)) {
-    const timeWindowStartLocal = new Date(convertFromUTC(_tripStart, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
-    const timeWindowEndLocal = new Date(convertFromUTC(_tripEnd, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
+    const dayHours = getDayHours(_tripStart, userData)
+    const timeWindowStartLocal = new Date(convertFromUTC(_tripStart, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + dayHours.startTime)
+    const timeWindowEndLocal = new Date(convertFromUTC(_tripEnd, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + dayHours.endTime)
 
     const timeWindowStartUTC = isClientSide() ? timeWindowStartLocal : convertFromLocal(timeWindowStartLocal, userData.user.attributes.timezone)
     const timeWindowEndUTC = isClientSide() ? timeWindowEndLocal : convertFromLocal(timeWindowEndLocal, userData.user.attributes.timezone)

package/src/util/traccar.js

@@ -1,5 +1,5 @@
 const automaticReports = require('../automaticReports')
-const { convertFromUTC, isClientSide, convertFromLocal } = require('./utils')
+const { convertFromUTC, isClientSide, convertFromLocal, getDayHours } = require('./utils')
 const path = require('path')
 const { cleanPositions, filterPosition } = require('./route')
 const Piscina = require('piscina')
@@ -174,13 +174,14 @@ async function getSummaryByDay (dates, userData, traccarInstance, allDevices, ig
   const days = []
   let counter = 0
   for (const [index, date] of dates.entries()) {
-    let startDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
+    const dayHours = getDayHours(date, userData)
+    let startDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + dayHours.startTime)
     if (index === 0) {
       const _startDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + (isClientSide() ? from.toTimeString().slice(0, 8) : convertFromUTC(from, userData.user.attributes.timezone).toTimeString().slice(0, 8)))
       startDateLocal = startDateLocal.getTime() > _startDateLocal.getTime() ? startDateLocal : _startDateLocal
     }
 
-    let endDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
+    let endDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + dayHours.endTime)
     if (index === dates.length - 1) {
       const _endDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + (isClientSide() ? to.toTimeString().slice(0, 8) : convertFromUTC(to, userData.user.attributes.timezone).toTimeString().slice(0, 8)))
       endDateLocal = endDateLocal.getTime() < _endDateLocal.getTime() ? endDateLocal : _endDateLocal

package/src/util/trips.js

@@ -1,4 +1,4 @@
-const { coordsDistance, convertFromUTC, weekDaySelected, convertFromLocal, isClientSide, calculateDistance } = require('./utils')
+const { coordsDistance, convertFromUTC, weekDaySelected, convertFromLocal, isClientSide, calculateDistance, getDayHours } = require('./utils')
 const { isInside } = require('./timetable')
 const traccarHelper = require('./traccar')
 
@@ -69,8 +69,9 @@ async function calculatePartialTrip (device, startDate, endDate, route, t, tracc
 
 function isPartialInsideTimetable (device, t, userData, route) {
   if (weekDaySelected(new Date(t.startTime), userData.weekDays)) {
-    const startDateLocal = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
-    const endDateLocal = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
+    const dayHours = getDayHours(t.startTime, userData)
+    const startDateLocal = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + dayHours.startTime)
+    const endDateLocal = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + dayHours.endTime)
 
     const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
     const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)

package/src/util/utils.js

@@ -270,6 +270,40 @@ function weekDaySelected (date, weekDays) {
     (date.getDay() === 6 && weekDays.saturday))
 }
 
+const weekDayNames = ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday']
+
+// Time window ({ startTime, endTime }) for a weekday (0 = sunday ... 6 = saturday).
+// When the report uses per-day hours (userData.dayHoursByDay, keyed by weekday name),
+// returns that day's window; otherwise the single userData.dayHours used for every day.
+function getDayHoursByWeekDay (weekDay, userData) {
+  return (userData.dayHoursByDay && userData.dayHoursByDay[weekDayNames[weekDay]]) || userData.dayHours
+}
+
+// Time window for the calendar day of `date`, taken in the same local day the callers
+// use to build the window (convertFromUTC(date, timezone).toISOString().split('T')[0]).
+function getDayHours (date, userData) {
+  if (!userData.dayHoursByDay) {
+    return userData.dayHours
+  }
+  const localDay = convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0]
+  return getDayHoursByWeekDay(new Date(localDay + 'T00:00:00Z').getUTCDay(), userData)
+}
+
+// Header text for the selected days and hours, e.g. " Monday, Tuesday, das 08:00 - 18:00"
+// or, with per-day hours, " Monday 08:00 - 18:00, Wednesday 08:00 - 13:00".
+function getTimetableText (userData, translations) {
+  const order = [1, 2, 3, 4, 5, 6, 0]
+  const selected = order.filter(i => userData.weekDays[weekDayNames[i]])
+  if (userData.dayHoursByDay) {
+    return selected.map(i => {
+      const hours = getDayHoursByWeekDay(i, userData)
+      return ' ' + translations.report[weekDayNames[i]] + ' ' + hours.startTime + ' - ' + hours.endTime
+    }).join(',')
+  }
+  return selected.map(i => ' ' + translations.report[weekDayNames[i]] + ',').join('') +
+    ' das ' + userData.dayHours.startTime + ' - ' + userData.dayHours.endTime
+}
+
 async function executeServerSide (type, sliced, from, to, userData, totalItems, traccar, maxRequests = 10, getExtraUserData) {
   let itemsCount = 0
   console.log('PROGRESS_PERC:1')
@@ -344,6 +378,9 @@ exports.isClientSide = isClientSide
 exports.getTimezoneOffset = getTimezoneOffset
 exports.convertFromUTC = convertFromUTC
 exports.weekDaySelected = weekDaySelected
+exports.getDayHours = getDayHours
+exports.getDayHoursByWeekDay = getDayHoursByWeekDay
+exports.getTimetableText = getTimetableText
 exports.getLogo = (user) => {
   const host = window ? window.location.hostname : getUserPartner(user).host
   return getImage(getLogoUrl(host))

package/src/zone-report.js

@@ -4,7 +4,7 @@ const {
   calculateDistance,
   sortPositions, getDates, convertToLocaleDateString, convertToLocaleTimeString,
   isClientSide,
-  getLanguage, convertFromUTC, convertFromLocal
+  getLanguage, convertFromUTC, convertFromLocal, getDayHours
 } = require('./util/utils')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
@@ -165,8 +165,9 @@ async function processDevices (from, to, devices, userData, data) {
 
         const dataByDay = []
         for (const date of dates) {
-          const startDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
-          const endDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
+          const dayHours = getDayHours(date, userData)
+          const startDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + dayHours.startTime)
+          const endDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + dayHours.endTime)
           const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
           const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
 
@@ -200,8 +201,9 @@ async function processDevices (from, to, devices, userData, data) {
       if (userData.zonesByColumn) {
         const groupByDay = []
         for (const date of dates) {
-          const startDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
-          const endDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
+          const dayHours = getDayHours(date, userData)
+          const startDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + dayHours.startTime)
+          const endDateLocal = new Date(convertFromUTC(date, userData.user.attributes.timezone).toISOString().split('T')[0] + ' ' + dayHours.endTime)
           const startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
           const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)