fleetmap-reports 1.0.942 → 1.0.944

package/package.json

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

package/src/kms-report.js

@@ -7,7 +7,7 @@ const {
 } = require('./util/pdfDocument')
 const { getUserPartner } = require('fleetmap-partners')
 const traccar = require('./util/traccar')
-const { getDates, getTranslations, isClientSide, executeServerSide } = require('./util/utils')
+const { getDates, getTranslations, isClientSide, executeServerSide, convertFromLocal } = require('./util/utils')
 const drivers = require('./util/driver')
 const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, checkTripsKms, getKms } = require('./util/trips')
 const traccarHelper = require('./util/traccar')
@@ -178,6 +178,7 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
         const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
         const days = await Promise.all(dates.map(async date => {
           const { tripsByDay } = await getDataByDay(d, date, { trips }, userData, traccarInstance)
+          console.log(date, tripsByDay.length)
           return {
             date,
             kms: getKms(tripsByDay)

package/src/util/trips.js

@@ -36,11 +36,10 @@ async function calculatePartialTrip (device, startDate, endDate, route, t, tracc
   const tripStart = new Date(t.startTime)
   const tripEnd = new Date(t.endTime)
 
-  console.log('calculatePartialTrip', tripStart, tripEnd, endDate, startDate)
   if (startDate.getTime() > endDate.getTime()) {
     if (tripStart.getTime() < endDate.getTime() &&
         tripEnd.getTime() > endDate.getTime()) {
-      console.log('Trip starts inside time period and ends outside time period', route, device)
+      // Trip starts inside time period and ends outside time period
       if (!route && device) {
         const allInOneData = await traccarHelper.getAllInOne(traccarInstance, startDate, endDate, [device], true, false, false, false, undefined, undefined, 5, 1, undefined, true)
         route = allInOneData.route
@@ -54,7 +53,7 @@ async function calculatePartialTrip (device, startDate, endDate, route, t, tracc
 
     if (tripStart.getTime() < startDate.getTime() &&
         new Date(t.endTime).getTime() > startDate.getTime()) {
-      console.log('Trip starts outside time period and ends inside time period', route, device)
+      // Trip starts outside time period and ends inside time period
       if (!route && device) {
         const allInOneData = await traccarHelper.getAllInOne(traccarInstance, startDate, endDate, [device], true, false, false, false, undefined, undefined, 5, 1, undefined, true)
         route = allInOneData.route
@@ -68,7 +67,7 @@ async function calculatePartialTrip (device, startDate, endDate, route, t, tracc
   } else {
     if (tripStart.getTime() < startDate.getTime() &&
         tripEnd.getTime() > startDate.getTime()) {
-      console.log('Trip starts outside time period and ends inside time period', route, device)
+      // Trip starts outside time period and ends inside time period
       if (!route && device) {
         const allInOneData = await traccarHelper.getAllInOne(traccarInstance, startDate, endDate, [device], true, false, false, false, undefined, undefined, 5, 1, undefined, true)
         route = allInOneData.route
@@ -82,7 +81,7 @@ async function calculatePartialTrip (device, startDate, endDate, route, t, tracc
 
     if (tripStart.getTime() < endDate.getTime() &&
         tripEnd.getTime() > endDate.getTime()) {
-      console.log('Trip starts inside time period and ends outside time period', route, device)
+      // Trip starts inside time period and ends outside time period
       if (!route && device) {
         const allInOneData = await traccarHelper.getAllInOne(traccarInstance, startDate, endDate, [device], true, false, false, false, undefined, undefined, 5, 1, undefined, true)
         route = allInOneData.route
@@ -132,6 +131,9 @@ async function getDataByDay (device, date, data, userData, traccarInstance) {
 
 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)
 }