fleetmap-reports 2.0.387 → 2.0.389

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "2.0.387",
+  "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/kms-report.js

@@ -11,16 +11,18 @@ const { getDates, getTranslations, isClientSide, executeServerSide } = require('
 const driversUtil = require('./util/driver')
 const {
   isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, getKms,
-  getTripTotalKms, calculateMultiDayTrips
+  getTripTotalKms, calculateMultiDayTrips, getUncompletedTrip
 } = require('./util/trips')
 const { devicesToProcess } = require('./util/device')
 const { getDriverData, reportByDriver } = require('./util/driver')
 const automaticReports = require('./automaticReports')
-const { getSummaryByDay } = require('./util/traccar')
 const { getStop } = require('./trip-report')
 
 const fileName = 'KmsReport'
 
+// dates from getDates are at noon: 12h back/forward to the day boundary plus a 24h buffer
+const CHUNK_BOUNDARY_BUFFER_MS = 36 * 60 * 60 * 1000
+
 async function createKmsReport (from, to, userData, traccarInstance) {
   console.log('Create KmsReport', from, to, userData.byDriver ? 'by driver' : (userData.byGroup ? 'by group' : 'by device'))
   const reportData = []
@@ -47,52 +49,31 @@ async function createKmsReportByDevice (from, to, userData, traccarInstance) {
     to
   }
 
-  if (isClientSide() && (allDevices.length > 50 || ((new Date(to).getTime() - new Date(from).getTime()) > (1000 * 60 * 60 * 24 * 15))) && userData.groupByDay) {
+  if (isClientSide() && allDevices.length > 20) {
     const sliced = automaticReports.sliceArray(allDevices, 1)
     await executeServerSide('kms-report', sliced, from, to, userData, allDevices.length, traccarInstance).then(devices => {
       allData.devices = devices
     })
   } else {
-    if (userData.allWeek && userData.groupByDay) {
-      const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
-      const summary = await getSummaryByDay(dates, userData, traccarInstance, allDevices, false, from, to)
-      for (const device of allDevices) {
-        const days = []
-        dates.forEach(date => {
-          const summaryByDay = summary.find(a => a.date === date).summary
-          const summaryByDevice = summaryByDay.find(a => a.deviceId === device.id)
-          if (summaryByDevice) {
-            days.push({
-              date,
-              kms: summaryByDevice.distance,
-              startOdometer: summaryByDevice.startOdometer,
-              endOdometer: summaryByDevice.endOdometer
-            })
-          }
-        })
-        const daysWithOdometer = days.filter(a => a.startOdometer > 0)
-        allData.devices.push({
-          device,
-          startOdometer: daysWithOdometer.length > 0 ? daysWithOdometer[0].startOdometer : 0,
-          endOdometer: daysWithOdometer.length > 0 ? daysWithOdometer[daysWithOdometer.length - 1].endOdometer : 0,
-          days
-        })
-      }
+    if (userData.groupByDay) {
+      allData.devices = await createKmsReportByDeviceByDay(from, to, allDevices, userData, traccarInstance)
     } else {
       let deviceCount = 0
       const sliced = automaticReports.sliceArray(allDevices,
         20)
       for (const devices of sliced) {
-        const needRoute = userData.groupByDay || !userData.allWeek
+        // without groupByDay the distance is the sum of getTripTotalKms, which needs route and stops
         const {
           trips,
           route,
+          stops,
           summary
-        } = await traccar.getAllInOne(traccarInstance, from, to, devices, needRoute, true, false, !userData.groupByDay, deviceCount, allDevices.length, 10, 1)
+        } = await traccar.getAllInOne(traccarInstance, from, to, devices, true, true, !userData.groupByDay, !userData.groupByDay, deviceCount, allDevices.length, 10, 1)
 
         allData.devices = allData.devices.concat(await processDevices(from, to, devices, {
           trips,
           route,
+          stops,
           summary
         }, userData, traccarInstance))
 
@@ -104,6 +85,63 @@ async function createKmsReportByDevice (from, to, userData, traccarInstance) {
   return allData
 }
 
+// Same distance as the trip report (sum of getTripTotalKms), split by day.
+// The period is fetched in blocks of 7 days and 20 devices so long periods and large fleets
+// aren't loaded all at once (same approach as the fuel consumption report).
+async function createKmsReportByDeviceByDay (from, to, allDevices, userData, traccarInstance) {
+  const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
+  const dateGroups = automaticReports.sliceArray(dates, 7)
+  const slicedDevices = automaticReports.sliceArray(allDevices, 20)
+  const totalDevices = allDevices.length * dateGroups.length
+  const results = new Map(allDevices.map(d => [d.id, { device: d, startOdometer: 0, endOdometer: 0, days: [], hasTrips: false }]))
+
+  let deviceCount = 0
+  for (const [index, chunkDates] of dateGroups.entries()) {
+    // internal boundaries are widened so a trip crossing them is fetched whole and then clipped by getDataByDay
+    const chunkFrom = index === 0 ? from : new Date(chunkDates[0].getTime() - CHUNK_BOUNDARY_BUFFER_MS)
+    const chunkTo = index === dateGroups.length - 1 ? to : new Date(chunkDates[chunkDates.length - 1].getTime() + CHUNK_BOUNDARY_BUFFER_MS)
+
+    for (const devices of slicedDevices) {
+      const data = await traccar.getAllInOne(traccarInstance, chunkFrom, chunkTo, devices, true, true, true, false, deviceCount, totalDevices, 10, 1)
+
+      for (const d of devices) {
+        const result = results.get(d.id)
+        const route = data.route.filter(p => p.deviceId === d.id)
+        const stops = data.stops.filter(s => s.deviceId === d.id)
+        const deviceTrips = data.trips.filter(t => t.deviceId === d.id)
+        const uncompletedTrip = getUncompletedTrip(d, route, deviceTrips)
+        if (uncompletedTrip) {
+          deviceTrips.push(uncompletedTrip)
+        }
+        const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(d, t, userData, route))
+
+        for (const date of chunkDates) {
+          const { tripsByDay, stopsByDay } = await getDataByDay(d, date, { trips, stops, route }, userData, traccarInstance)
+          if (tripsByDay.length) {
+            if (!result.hasTrips) {
+              result.startOdometer = tripsByDay[0].startOdometer
+            }
+            result.endOdometer = tripsByDay[tripsByDay.length - 1].endOdometer
+            result.hasTrips = true
+          }
+          result.days.push({
+            date,
+            kms: tripsByDay.reduce((a, b) =>
+              a + getTripTotalKms(b, getStop(new Date(b.endTime), stopsByDay), route), 0
+            ) * 1000
+          })
+        }
+      }
+      deviceCount += devices.length
+    }
+  }
+
+  // with a timetable, devices without trips were already left out of the report
+  return [...results.values()]
+    .filter(r => userData.allWeek || r.hasTrips)
+    .map(({ hasTrips, ...r }) => r)
+}
+
 async function createKmsReportByDriver (from, to, userData, traccarInstance) {
   const report = { drivers: [] }
 
@@ -257,7 +295,17 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
         })
       }
     } else {
-      const summary = data.summary.find(s => s.deviceId === d.id)
+      let summary = data.summary.find(s => s.deviceId === d.id)
+      if (trips.length > 0) {
+        // same calculation as the trip report and the kms report by driver, so all of them give the same distance
+        const deviceStops = (data.stops || []).filter(s => s.deviceId === d.id)
+        summary = {
+          ...summary,
+          distance: trips.reduce((a, b) =>
+            a + getTripTotalKms(b, getStop(new Date(b.endTime), deviceStops), deviceRoute), 0
+          ) * 1000
+        }
+      }
       devicesResult.push({
         device: d,
         summary

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)