fleetmap-reports 1.0.946 → 1.0.947

package/package.json

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

package/src/util/trips.js

@@ -111,32 +111,25 @@ function isPartialInsideTimetable (t, userData, route) {
 }
 
 async function getDataByDay (device, date, data, userData, traccarInstance) {
-  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 convertedFromByDay = isClientSide() ? fromByDay : convertFromLocal(fromByDay, userData.user.attributes.timezone)
-  const convertedToByDay = isClientSide() ? toByDay : convertFromLocal(toByDay, userData.user.attributes.timezone)
-  console.log(fromByDay, toByDay)
-  const tripsByDay = data.trips.filter(t => new Date(t.endTime) > convertedFromByDay && new Date(t.startTime) < convertedToByDay).map(t => {
-    return { ...t }
-  })
-  console.log(date, tripsByDay.length)
   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 tripsByDay = data.trips.filter(t => new Date(t.endTime) > startDate && new Date(t.startTime) < endDate).map(t => {
+    return { ...t }
+  })
+
   for (const t of tripsByDay) {
     await calculatePartialTrip(device, startDate, endDate, data.route, t, traccarInstance)
   }
 
-  const routeByDay = data.route ? data.route.filter(p => (new Date(p.fixTime) > fromByDay && new Date(p.fixTime) < toByDay)) : []
+  const routeByDay = data.route ? data.route.filter(p => (new Date(p.fixTime) > startDate && new Date(p.fixTime) < endDate)) : []
   return { tripsByDay, routeByDay }
 }
 
 function getKms (trips) {
   const odometerKms = trips.length > 0 ? trips[trips.length - 1].endOdometer - trips[0].startOdometer : 0
-  if (trips.length > 0) {
-    console.log(trips[trips.length - 1].endOdometer, trips[0].startOdometer, odometerKms)
-  }
   return odometerKms > 0 ? odometerKms : trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
 }