fleetmap-reports 1.0.961 → 1.0.963

package/package.json

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

package/src/util/trips.js

@@ -131,7 +131,12 @@ async function getDataByDay (device, date, data, userData, traccarInstance) {
 
   const refuelingPositionsByDay = data.refuelingPositions ? data.refuelingPositions.filter(p => (new Date(p.date) > startDate && new Date(p.date) < endDate)) : []
 
-  return { tripsByDay, routeByDay, refuelingPositionsByDay }
+  const zoneInOutDayData = data.zoneInOutData
+    ? data.zoneInOutData.filter(z => (!z.inTime || (new Date(z.inTime.fixTime) < endDate)) &&
+      (!z.outTime || (new Date(z.outTime.fixTime) > startDate)))
+    : []
+
+  return { tripsByDay, routeByDay, refuelingPositionsByDay, zoneInOutDayData }
 }
 
 function getKms (trips) {

package/src/zone-report.js

@@ -4,7 +4,7 @@ const {
   calculateDistance,
   sortPositions, getDates, convertToLocaleDateString, convertToLocaleTimeString,
   isClientSide,
-  getLanguage
+  getLanguage, convertFromUTC, convertFromLocal
 } = require('./util/utils')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
@@ -105,20 +105,21 @@ async function processDevices (from, to, devices, userData, data) {
 
         const dataByDay = []
         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 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 startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
+          const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
 
-          const { routeByDay } = await getDataByDay(d, date, { route: deviceRoute }, userData)
+          console.log(startDate, endDate)
 
-          const zoneInOutDayData = filteredByGeofence.filter(z => (!z.inTime || (new Date(z.inTime.fixTime) < toByDay)) &&
-                (!z.outTime || (new Date(z.outTime.fixTime) > fromByDay)))
+          const { routeByDay, zoneInOutDayData } = await getDataByDay(d, date, { route: deviceRoute, zoneInOutData: filteredByGeofence }, userData)
 
-          const firstIn = zoneInOutDayData.find(z => z.inTime && new Date(z.inTime.fixTime) > fromByDay)
-          const lastOut = zoneInOutDayData.slice().reverse().find(z => z.outTime && new Date(z.outTime.fixTime) < toByDay)
+          const firstIn = zoneInOutDayData.find(z => z.inTime && new Date(z.inTime.fixTime) > startDate)
+          const lastOut = zoneInOutDayData.slice().reverse().find(z => z.outTime && new Date(z.outTime.fixTime) < endDate)
 
-          const timeIn = calculateTimeIn(zoneInOutDayData, fromByDay, from, toByDay, to)
-          const distanceIn = calculateDistanceIn(zoneInOutDayData, deviceRoute, routeByDay, fromByDay, toByDay, to, d)
-          const distanceOut = calculateDistanceOut(zoneInOutDayData, routeByDay, fromByDay, toByDay, 'distanceOut', d)
+          const timeIn = calculateTimeIn(zoneInOutDayData, startDate, from, endDate, to)
+          const distanceIn = calculateDistanceIn(zoneInOutDayData, deviceRoute, routeByDay, startDate, endDate, to, d)
+          const distanceOut = calculateDistanceOut(zoneInOutDayData, routeByDay, startDate, endDate, 'distanceOut', d)
 
           dataByDay.push({
             date,
@@ -141,15 +142,16 @@ async function processDevices (from, to, devices, userData, data) {
       if (userData.zonesByColumn) {
         const groupByDay = []
         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 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 startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
+          const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
 
-          const { routeByDay } = await getDataByDay(d, date, { route: deviceRoute }, userData)
+          console.log(startDate, endDate)
 
-          const zoneInOutDayData = zoneInOutData.filter(z => (!z.inTime || (new Date(z.inTime.fixTime) < toByDay)) &&
-              (!z.outTime || (new Date(z.outTime.fixTime) > fromByDay)))
+          const { routeByDay, zoneInOutDayData } = await getDataByDay(d, date, { route: deviceRoute, zoneInOutData }, userData)
 
-          const distanceOut = calculateDistanceOut(zoneInOutDayData, routeByDay, fromByDay, toByDay, 'distanceOutAny', d)
+          const distanceOut = calculateDistanceOut(zoneInOutDayData, routeByDay, startDate, endDate, 'distanceOutAny', d)
 
           const geofences = geofencesData.map(g => {
             const day = g.days.find(day => day.date === date)
@@ -309,33 +311,33 @@ function calculateDistanceIn (zoneInOutDayData, deviceRoute, dayRoute, fromByDay
   return distanceIn
 }
 
-function calculateDistanceOut (zoneInOutDayData, dayRoute, fromByDay, toByDay, field, device) {
+function calculateDistanceOut (zoneInOutDayData, dayRoute, from, to, field, device) {
   if (zoneInOutDayData.length) {
-    const dataInsideDay = zoneInOutDayData.filter(z => z.outTime && new Date(z.outTime.fixTime) < toByDay)
+    const dataInsideDay = zoneInOutDayData.filter(z => z.outTime && new Date(z.outTime.fixTime) < to)
     let distanceOut = dataInsideDay.reduce((a, b) => a + (b[field] || 0), 0)
 
-    if (zoneInOutDayData[0].inTime && new Date(zoneInOutDayData[0].inTime.fixTime) > fromByDay && (field !== 'distanceOutAny' || zoneInOutDayData[0].anyLastExit)) {
+    if (zoneInOutDayData[0].inTime && new Date(zoneInOutDayData[0].inTime.fixTime) > from && (field !== 'distanceOutAny' || zoneInOutDayData[0].anyLastExit)) {
       // Add distanceOut before the first entry
       const routeOut = dayRoute.filter(p =>
         new Date(p.fixTime).getTime() < new Date(zoneInOutDayData[0].inTime.fixTime).getTime() &&
-          new Date(p.fixTime).getTime() >= fromByDay.getTime()
+          new Date(p.fixTime).getTime() >= from.getTime()
       )
       distanceOut = distanceOut + calculateDistance(routeOut, device.attributes['report.ignoreOdometer'])
     }
 
-    if (zoneInOutDayData[zoneInOutDayData.length - 1].outTime && new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime) < toByDay && (field !== 'distanceOutAny' || zoneInOutDayData[zoneInOutDayData.length - 1].anyNextIn)) {
+    if (zoneInOutDayData[zoneInOutDayData.length - 1].outTime && new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime) < to && (field !== 'distanceOutAny' || zoneInOutDayData[zoneInOutDayData.length - 1].anyNextIn)) {
       // Add distanceOut after last exit
       distanceOut = distanceOut - zoneInOutDayData[zoneInOutDayData.length - 1][field]
       const routeOut = dayRoute.filter(p =>
         new Date(p.fixTime) >= new Date(zoneInOutDayData[zoneInOutDayData.length - 1].outTime.fixTime).getTime() &&
-          new Date(p.fixTime) < toByDay.getTime())
+          new Date(p.fixTime) < to.getTime())
       distanceOut = distanceOut + calculateDistance(routeOut, device.attributes['report.ignoreOdometer'])
     }
 
     return distanceOut
   }
 
-  return calculateDistance(dayRoute.filter(p => new Date(p.fixTime) >= fromByDay && new Date(p.fixTime) < toByDay), device.attributes['report.ignoreOdometer'])
+  return calculateDistance(dayRoute.filter(p => new Date(p.fixTime) >= from && new Date(p.fixTime) < to), device.attributes['report.ignoreOdometer'])
 }
 
 function analyseAlerts (alerts, deviceRoute, userData, from, to, device) {