fleetmap-reports 1.0.904 → 1.0.907

package/lang/enGB.js

@@ -277,7 +277,8 @@ module.exports = {
     timeOut: 'Time Out',
     maxTemp: 'Max Temp',
     minTemp: 'Min Temp',
-    avgTemp: 'Avg Temp'
+    avgTemp: 'Avg Temp',
+    total: 'Total'
   },
   layout: {
     deviceOnline: 'Device Online',

package/lang/esCL.js

@@ -266,7 +266,8 @@ module.exports = {
     timeOut: 'Tempo Afuera',
     maxTemp: 'Temp.Max',
     minTemp: 'Temp.Min',
-    avgTemp: 'Temp.Média'
+    avgTemp: 'Temp.Média',
+    total: 'Total'
   },
   layout: {
     deviceOnline: 'Dispositivo en línea',

package/lang/frFR.json

@@ -275,7 +275,8 @@
     "zone": "Zone",
     "maxTemp": "Temp.Max",
     "minTemp": "Temp.Min",
-    "avgTemp": "Temp.Moyenne"
+    "avgTemp": "Temp.Moyenne",
+    "total": "Total"
   },
   "layout": {
     "deviceOnline": "Appareil en ligne",

package/lang/ptBR.js

@@ -271,7 +271,8 @@ module.exports = {
     timeOut: 'Tempo Fora',
     maxTemp: 'Temp.Máx',
     minTemp: 'Temp.Min',
-    avgTemp: 'Temp.Média'
+    avgTemp: 'Temp.Média',
+    total: 'Total'
   },
   layout: {
     deviceOnline: 'Dispositivo Online',

package/lang/ptPT.js

@@ -280,7 +280,8 @@ module.exports = {
     timeOut: 'Tempo Fora',
     maxTemp: 'Temp.Máx',
     minTemp: 'Temp.Min',
-    avgTemp: 'Temp.Média'
+    avgTemp: 'Temp.Média',
+    total: 'Total'
   },
   layout: {
     test: 'Test Notification',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.904",
+  "version": "1.0.907",
   "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
+  getLanguage, convertFromUTC, convertFromLocal
 } = require('./util/utils')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
@@ -12,7 +12,7 @@ const {
 const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const traccar = require('./util/traccar')
-const { isInsideTimetable, isPartialInsideTimetable, calculateTrip } = require('./util/trips')
+const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, calculatePartialTrip } = require('./util/trips')
 const { devicesToProcess } = require('./util/device')
 const { getDriverData } = require('./util/driver')
 const { calculateConsumption } = require('./util/fuel')
@@ -157,6 +157,14 @@ async function createActivityReportByDriver (from, to, userData, traccarInstance
   return allData
 }
 
+function checkTripsPartialInsideDate (date, userData, tripsByDay, deviceRoute) {
+  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)
+  tripsByDay.forEach(t => calculatePartialTrip(startDate, endDate, deviceRoute, t))
+}
+
 function processDevices (from, to, devices, data, userData) {
   const devicesResult = []
 
@@ -180,8 +188,10 @@ function processDevices (from, to, devices, data, userData) {
       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 tripsByDay = trips.filter(t => new Date(t.endTime) > fromByDay && new Date(t.startTime) < toByDay).map(t => { return { ...t } })
+
+        checkTripsPartialInsideDate(date, userData, tripsByDay, deviceRoute)
 
-        const tripsByDay = trips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.startTime) < toByDay))
         const routeByDay = deviceRoute.filter(p => (new Date(p.fixTime) > fromByDay && new Date(p.fixTime) < toByDay))
         const distance = tripsByDay.reduce((a, b) => a + b.distance, 0)
 
@@ -201,7 +211,9 @@ function processDevices (from, to, devices, data, userData) {
               startTime: tripsByDay.length && tripsByDay[0].startTime,
               startAddress: tripsByDay.length && tripsByDay[0].startAddress,
               endTime: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endTime,
-              endAddress: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endAddress
+              endAddress: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endAddress,
+              startTimeIsOut: tripsByDay.some(t => t.startTimeIsOut),
+              endTimeIsOut: tripsByDay.some(t => t.endTimeIsOut)
             })
           }
         } else {
@@ -217,6 +229,8 @@ function processDevices (from, to, devices, data, userData) {
           summaryCurrentDay.endAddress = tripsByDay.length && tripsByDay[tripsByDay.length - 1].endAddress
           summaryCurrentDay.startOdometer = tripsByDay.length ? tripsByDay[0].startOdometer : 0
           summaryCurrentDay.endOdometer = tripsByDay.length ? tripsByDay[tripsByDay.length - 1].endOdometer : 0
+          summaryCurrentDay.startTimeIsOut = tripsByDay.some(t => t.startTimeIsOut)
+          summaryCurrentDay.endTimeIsOut = tripsByDay.some(t => t.endTimeIsOut)
           summary.push(summaryCurrentDay)
         }
       }

package/src/kms-report.js

@@ -332,31 +332,26 @@ function exportKmsReportToExcel (userData, reportData) {
 
   const translations = getTranslations(userData)
 
-  const weekDays = [
-    translations.report.sunday,
-    translations.report.monday,
-    translations.report.tuesday,
-    translations.report.wednesday,
-    translations.report.thursday,
-    translations.report.friday,
-    translations.report.saturday
-  ]
-
   const settings = {
     sheetName: translations.report.titleKmsReport, // The name of the sheet
     fileName // The name of the spreadsheet
   }
 
   const headers = []
+  const info = userData.byDriver ? reportData.drivers : reportData.devices
 
   if (userData.groupByDay) {
     headers.push(
       { label: translations.report.vehicle, value: 'name' },
       { label: translations.settings.vehicle_licenseplate, value: 'licenseplate' },
-      { label: translations.report.group, value: 'group' },
-      { label: translations.report.date, value: 'date' },
-      { label: translations.report.weekDay, value: 'weekday' },
-      { label: translations.report.distance, value: 'distance' })
+      { label: translations.report.group, value: 'group' })
+
+    const days = info[0].days
+    days.forEach((day, index) => {
+      headers.push({ label: new Date(day.date).toLocaleDateString(), value: 'day' + index })
+    })
+
+    headers.push({ label: translations.report.total, value: 'total' })
   } else if (userData.byDriver) {
     headers.push(
       { label: translations.report.driver, value: 'name' },
@@ -371,7 +366,7 @@ function exportKmsReportToExcel (userData, reportData) {
   }
 
   let data = []
-  const info = userData.byDriver ? reportData.drivers : reportData.devices
+
   info.forEach(d => {
     const group = userData.byDriver
       ? userData.groups.find(g => g.drivers && g.drivers.includes(d.driver.id))
@@ -379,17 +374,19 @@ function exportKmsReportToExcel (userData, reportData) {
 
     if (userData.groupByDay) {
       if (d.days) {
-        data = data.concat([{}])
-        data = data.concat(d.days.map(a => {
-          return {
-            name: d.device.name,
-            group: group ? group.name : '',
-            licenseplate: d.device.attributes.license_plate,
-            date: a.date,
-            weekday: weekDays[a.date.getDay()],
-            distance: Number((a.kms / 1000).toFixed(0))
-          }
-        }))
+        const vehicle = {
+          name: d.device.name,
+          group: group ? group.name : '',
+          licenseplate: d.device.attributes.license_plate
+        }
+
+        d.days.forEach((day, index) => {
+          vehicle['day' + index] = Number((day.kms / 1000).toFixed(0))
+        })
+
+        vehicle.total = Number(d.days.reduce((a, b) => a + (b.kms / 1000), 0).toFixed(0))
+
+        data = data.concat([vehicle])
       }
     } else {
       data = data.concat([{
@@ -402,7 +399,7 @@ function exportKmsReportToExcel (userData, reportData) {
   })
 
   // add total
-  if (data.length) {
+  if (data.length && !userData.groupByDay) {
     data = data.concat({
       name: '',
       group: '',

package/src/util/trips.js

@@ -5,7 +5,6 @@ const minDistance = 0
 const minAvgSpeed = 0
 
 function checkTripsKms (traccarInstance, from, to, devices, data) {
-  console.log('checkTripsKms')
   const trips = data.trips.filter(t => t.distance === minDistance && t.averageSpeed > minAvgSpeed)
   if (trips.length > 0) {
     // Vehicles with imported positions. calculate trip distance with route positions
@@ -31,64 +30,67 @@ function checkTripsKms (traccarInstance, from, to, devices, data) {
   }
 }
 
-function isPartialInsideTimetable (t, userData, route) {
+function calculatePartialTrip (startDate, endDate, route, t) {
+  let isPartialInside = false
   const tripStart = new Date(t.startTime)
   const tripEnd = new Date(t.endTime)
 
-  let isPartialInside = false
+  if (startDate.getTime() > endDate.getTime()) {
+    if (tripStart.getTime() < endDate.getTime() &&
+        tripEnd.getTime() > endDate.getTime()) {
+      // Trip starts inside time period and ends outside time period
+      const routeInside = route.filter(p => new Date(p.fixTime).getTime() < new Date(endDate.toUTCString()).getTime() && new Date(p.fixTime).getTime() > new Date(t.startTime).getTime() && t.deviceId === p.deviceId)
+      updateTrip(t, routeInside)
+      t.endTime = endDate.toISOString().replace('Z', '+0000')
+      t.endTimeIsOut = true
+      isPartialInside = true
+    }
+
+    if (tripStart.getTime() < startDate.getTime() &&
+        new Date(t.endTime).getTime() > startDate.getTime()) {
+      // Trip starts outside time period and ends inside time period
+      const routeInside = route.filter(p => new Date(p.fixTime).getTime() > startDate.getTime() && new Date(p.fixTime).getTime() < new Date(t.endTime).getTime() && t.deviceId === p.deviceId)
+      updateTrip(t, routeInside)
+      t.startTime = startDate.toISOString().replace('Z', '+0000')
+      t.startTimeIsOut = true
+      isPartialInside = true
+    }
+  } else {
+    if (tripStart.getTime() < startDate.getTime() &&
+        tripEnd.getTime() > startDate.getTime()) {
+      // Trip starts outside time period and ends inside time period
+      const routeInside = route.filter(p => new Date(p.fixTime).getTime() > new Date(startDate.toUTCString()).getTime() && new Date(p.fixTime).getTime() < new Date(t.endTime).getTime() && t.deviceId === p.deviceId)
+      updateTrip(t, routeInside)
+      t.startTime = startDate.toISOString().replace('Z', '+0000')
+      t.startTimeIsOut = true
+      isPartialInside = true
+    }
+
+    if (tripStart.getTime() < endDate.getTime() &&
+        tripEnd.getTime() > endDate.getTime()) {
+      // Trip starts inside time period and ends outside time period
+      const routeInside = route.filter(p => new Date(p.fixTime).getTime() < endDate.getTime() && new Date(p.fixTime).getTime() > new Date(t.startTime).getTime() && t.deviceId === p.deviceId)
+      updateTrip(t, routeInside)
+      t.endTime = endDate.toISOString().replace('Z', '+0000')
+      t.endTimeIsOut = true
+      isPartialInside = true
+    }
+  }
+  return isPartialInside
+}
 
-  if (weekDaySelected(tripStart, userData.weekDays)) {
+function isPartialInsideTimetable (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 startDate = isClientSide() ? startDateLocal : convertFromLocal(startDateLocal, userData.user.attributes.timezone)
     const endDate = isClientSide() ? endDateLocal : convertFromLocal(endDateLocal, userData.user.attributes.timezone)
 
-    if (startDate.getTime() > endDate.getTime()) {
-      // Trip starts outside time period and ends inside time period
-      if (tripStart.getTime() < endDate.getTime() &&
-                tripEnd.getTime() > endDate.getTime()) {
-        // Trip starts inside time period and ends outside time period
-        const routeInside = route.filter(p => new Date(p.fixTime).getTime() < new Date(endDate.toUTCString()).getTime() && new Date(p.fixTime).getTime() > new Date(t.startTime).getTime() && t.deviceId === p.deviceId)
-        updateTrip(t, routeInside)
-        t.endTime = endDate.toISOString().replace('Z', '+0000')
-        t.endTimeIsOut = true
-        isPartialInside = true
-      }
-
-      if (tripStart.getTime() < startDate.getTime() &&
-                new Date(t.endTime).getTime() > startDate.getTime()) {
-        // Trip starts outside time period and ends inside time period
-        const routeInside = route.filter(p => new Date(p.fixTime).getTime() > startDate.getTime() && new Date(p.fixTime).getTime() < new Date(t.endTime).getTime() && t.deviceId === p.deviceId)
-        updateTrip(t, routeInside)
-        t.startTime = startDate.toISOString().replace('Z', '+0000')
-        t.startTimeIsOut = true
-        isPartialInside = true
-      }
-    } else {
-      if (tripStart.getTime() < startDate.getTime() &&
-                tripEnd.getTime() > startDate.getTime()) {
-        // Trip starts outside time period and ends inside time period
-        const routeInside = route.filter(p => new Date(p.fixTime).getTime() > new Date(startDate.toUTCString()).getTime() && new Date(p.fixTime).getTime() < new Date(t.endTime).getTime() && t.deviceId === p.deviceId)
-        updateTrip(t, routeInside)
-        t.startTime = startDate.toISOString().replace('Z', '+0000')
-        t.startTimeIsOut = true
-        isPartialInside = true
-      }
-
-      if (tripStart.getTime() < endDate.getTime() &&
-                tripEnd.getTime() > endDate.getTime()) {
-        // Trip starts inside time period and ends outside time period
-        const routeInside = route.filter(p => new Date(p.fixTime).getTime() < endDate.getTime() && new Date(p.fixTime).getTime() > new Date(t.startTime).getTime() && t.deviceId === p.deviceId)
-        updateTrip(t, routeInside)
-        t.endTime = endDate.toISOString().replace('Z', '+0000')
-        t.endTimeIsOut = true
-        isPartialInside = true
-      }
-    }
+    return calculatePartialTrip(startDate, endDate, route, t)
   }
 
-  return isPartialInside
+  return false
 }
 
 function isInsideTimetable (t, userData) {
@@ -97,7 +99,8 @@ function isInsideTimetable (t, userData) {
 
 function updateTrip (t, route) {
   if (!route[route.length - 1]) { return }
-  const distance = route[route.length - 1].attributes.totalDistance - route[0].attributes.totalDistance
+  route = route.filter(p => p.attributes.ignition)
+  const distance = calculateDistance(route, false) * 1000
   t.distance = distance
   t.duration = new Date(route[route.length - 1].fixTime).getTime() - new Date(route[0].fixTime).getTime()
   t.maxSpeed = route.reduce((a, b) => Math.max(a, b.speed), 0)
@@ -159,6 +162,7 @@ function calculateStopDuration (stop) {
 exports.checkTripsKms = checkTripsKms
 exports.isInsideTimetable = isInsideTimetable
 exports.isPartialInsideTimetable = isPartialInsideTimetable
+exports.calculatePartialTrip = calculatePartialTrip
 exports.calculateTrip = calculateTrip
 exports.getTripIdleTime = getTripIdleTime
 exports.calculateStopDuration = calculateStopDuration

package/src/util/utils.js

@@ -215,13 +215,13 @@ exports.convertFromLocal = (value, timezone) => {
 }
 
 function weekDaySelected (date, weekDays) {
-  return (date.getDay() === 0 && weekDays.sunday) ||
+  return !weekDays || ((date.getDay() === 0 && weekDays.sunday) ||
     (date.getDay() === 1 && weekDays.monday) ||
     (date.getDay() === 2 && weekDays.tuesday) ||
     (date.getDay() === 3 && weekDays.wednesday) ||
     (date.getDay() === 4 && weekDays.thursday) ||
     (date.getDay() === 5 && weekDays.friday) ||
-    (date.getDay() === 6 && weekDays.saturday)
+    (date.getDay() === 6 && weekDays.saturday))
 }
 
 exports.getImgFromUrl = getImgFromUrl