fleetmap-reports 1.0.325 → 1.0.329

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.325",
+  "version": "1.0.329",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -13,6 +13,7 @@
     "axios": "^0.21.1",
     "axios-cookiejar-support": "^1.0.1",
     "docx": "^7.3.0",
+    "eslint": "^8.8.0",
     "file-saver": "^2.0.5",
     "fleetmap-partners": "^1.0.42",
     "json-as-xlsx": "^1.2.1",

package/src/activity-report.js

@@ -65,7 +65,7 @@ async function createActivityReportByGroup(from, to, userData, traccarInstance){
         }
     }
 
-    const withoutGroupDevices = await createActivityReportByDevice(from, to)
+    const withoutGroupDevices = await createActivityReportByDevice(from, to, userData, traccarInstance)
     reportData.push(withoutGroupDevices)
 
     return reportData

package/src/kms-report.js

@@ -5,11 +5,10 @@ const {getStyle} = require("./reportStyle")
 const {headerFromUser,addTable} = require("./util/pdfDocument")
 const {getUserPartner} = require("fleetmap-partners")
 const traccar = require("./util/traccar")
-const {getDates} = require("./util/utils")
+const {getDates, convertFromUTC} = require("./util/utils")
 const trips = require("./util/trips")
 const drivers = require("./util/driver")
 const { isInsideTimetable, isPartialInsideTimetable} = require("./util/trips")
-const word = require("./word");
 
 const fileName = 'KmsReport'
 
@@ -47,7 +46,7 @@ async function createKmsReportByDevice(from, to, userData, traccarInstance) {
     }
 
     devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
-    const route = userData.allWeek ? [] : await traccar.getRoute(traccarInstance, from, to, devicesToProcess)
+    const route = await traccar.getRoute(traccarInstance, from, to, devicesToProcess)
     const tripsData = await traccar.getTrips(traccarInstance, from, to, devicesToProcess)
 
     console.log('trips:' + tripsData.length)
@@ -70,7 +69,7 @@ async function createKmsReportByDriver(from, to, userData, traccarInstance) {
     }
 
     const tripsData = await traccar.getTrips(traccarInstance, from, to, devices)
-    const routeData = await traccar.getTrips(traccarInstance, from, to, devices)
+    const routeData = await traccar.getRoute(traccarInstance, from, to, devices)
 
     return { drivers: processDrivers(from, to, userData, {trips: tripsData, route: routeData}) }
 }
@@ -157,7 +156,7 @@ function processDevices(from, to, devices, data, userData) {
 
         if (deviceTrips.length > 0) {
             if(userData.groupByDay) {
-                deviceTrips.forEach(t => t.tripDay = new Date(t.startTime).toISOString().split('T')[0] + ' 12:00 PM')
+                deviceTrips.forEach(t => t.tripDay = convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' 12:00 PM')
                 const groupedTrips = deviceTrips.reduce(
                     (entryMap, e) => entryMap.set(e.tripDay, [...entryMap.get(e.tripDay)||[], e]),
                     new Map()
@@ -411,11 +410,16 @@ function exportKmsReportToExcel(userData, reportData) {
         }
     })
 
-    data = data.concat({
-        licenseplate: 'Total',
-        distance: data.reduce((prev, curr) => curr.distance ? {distance: (prev.distance || 0) + curr.distance} : prev).distance
-    })
-    console.log('last row', data.pop())
+    // add total
+    if (data.length) {
+        data = data.concat({
+            name: '',
+            group: '',
+            licenseplate: 'Total',
+            distance: data.reduce((prev, curr) => curr.distance ? {distance: (prev.distance || 0) + curr.distance} : prev).distance
+        })
+    }
+
     return {
         headers,
         data,
@@ -426,4 +430,3 @@ function exportKmsReportToExcel(userData, reportData) {
 exports.createKmsReport = createKmsReport
 exports.exportKmsReportToPDF = exportKmsReportToPDF
 exports.exportKmsReportToExcel = exportKmsReportToExcel
-exports.exportKmsReportToWord = word.exportKmsReportToWord

package/src/speeding-report.js

@@ -29,7 +29,7 @@ async function createSpeedingReport(from, to, userData, traccarInstance) {
     reportData.push(...allData)
   } else {
     console.log("createSpeedingReportByDevice")
-    const allData = await createSpeedingReportByDevice(from, to, userData.devices, userData, traccarInstance)
+    const allData = await createSpeedingReportByDevice(from, to, userData, traccarInstance)
     reportData.push(allData)
   }
 
@@ -60,16 +60,16 @@ async function createSpeedingReportByGroup(from, to, userData, traccarInstance){
     }
   }
 
-  const groupIds = userData.groups.map(g => g.id)
-  const withoutGroupDevices = userData.devices.filter(d => !groupIds.includes(d.groupId))
-
-  const withoutGroupData = await createSpeedingReportByDevice(from, to, withoutGroupDevices, userData, traccarInstance)
+  const withoutGroupData = await createSpeedingReportByDevice(from, to, userData, traccarInstance)
   reportData.push(withoutGroupData)
 
   return reportData
 }
 
-async function createSpeedingReportByDevice(from, to, devices, userData, traccarInstance) {
+async function createSpeedingReportByDevice(from, to, userData, traccarInstance) {
+  const groupIds = userData.groups.map(g => g.id)
+  const devices = userData.devices.filter(d => !groupIds.includes(d.groupId))
+
   devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
   const routes = await traccarHelper.getRoute(traccarInstance, from, to, devices)

package/src/trip-report.js

@@ -36,7 +36,9 @@ async function createTripReport(from, to, userData, traccar) {
 }
 
 async function createTripReportByDevice(from, to, userData, traccar) {
-    const devices = userData.devices
+    const groupIds = userData.groups.map(g => g.id)
+    const devices = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
+
     const allData = {
         devices: [],
         xpert: devices.filter(d => d.attributes.xpert).length > 0
@@ -91,10 +93,7 @@ async function createTripReportByGroup(from, to, userData, traccar) {
         }
     }
 
-    const groupIds = userData.groups.map(g => g.id)
-    const withoutGroupDevices = userData.devices.filter(d => !groupIds.includes(d.groupId))
-
-    const allData = await createTripReportByDevice(from, to, withoutGroupDevices, userData)
+    const allData = await createTripReportByDevice(from, to, userData, traccar)
     reportData.push(allData)
 
     return reportData
@@ -124,6 +123,8 @@ function processDevices(from, to, devices, data, userData) {
             && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
         const stops = data.stops.filter(s => s.deviceId === d.id)
 
+        console.log(trips)
+
         addNearestPOIs(trips, userData)
 
         trips.forEach(trip => {

package/src/util/trips.js

@@ -1,4 +1,4 @@
-const {coordsDistance} = require("./utils");
+const {coordsDistance, convertFromUTC} = require("./utils");
 
 const minDistance = 0
 const minAvgSpeed = 0
@@ -41,7 +41,9 @@ function checkTripsKms(traccarInstance, from, to, devices, data) {
 }
 
 function isPartialInsideTimetable(t, userData, route){
-    const tripStart  = new Date(t.startTime)
+    const tripStart = new Date(t.startTime)
+    const tripEnd = new Date(t.endTime)
+
     let isPartialInside = false
 
     if((tripStart.getDay() === 0 && userData.weekDays.sunday) ||
@@ -52,22 +54,22 @@ function isPartialInsideTimetable(t, userData, route){
         (tripStart.getDay() === 5 && userData.weekDays.friday) ||
         (tripStart.getDay() === 6 && userData.weekDays.saturday)) {
 
-        const startDate = new Date(new Date(tripStart).toISOString().split('T')[0] + ' '+userData.dayHours.startTime)
-        const endDate = new Date(new Date(tripStart).toISOString().split('T')[0] + ' '+userData.dayHours.endTime)
+        const startDate = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' '+userData.dayHours.startTime)
+        const endDate = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' '+userData.dayHours.endTime)
 
         if(startDate.getTime() > endDate.getTime()){
             //Trip starts outside time period and ends inside time period
-            if (new Date(t.startTime).getTime() < endDate.getTime()
-                && new Date(t.endTime).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() < endDate.getTime() && new Date(p.fixTime).getTime() > new Date(t.startTime).getTime() && t.deviceId === p.deviceId)
+                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()
                 t.endTimeIsOut = true
                 isPartialInside = true
             }
 
-            if (new Date(t.startTime).getTime() < startDate.getTime()
+            if (tripStart.getTime() < startDate.getTime()
                 && new Date(t.endTime).getTime() > startDate.getTime()) {
 
                 //Trip starts outside time period and ends inside time period
@@ -79,18 +81,18 @@ function isPartialInsideTimetable(t, userData, route){
             }
 
         } else {
-            if (new Date(t.startTime).getTime() < startDate.getTime()
-                && new Date(t.endTime).getTime() > startDate.getTime()) {
+            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() > startDate.getTime() && new Date(p.fixTime).getTime() < new Date(t.endTime).getTime() && t.deviceId === p.deviceId)
+                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()
                 t.startTimeIsOut = true
                 isPartialInside = true
             }
 
-            if (new Date(t.startTime).getTime() < endDate.getTime()
-                && new Date(t.endTime).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() < endDate.getTime() && new Date(p.fixTime).getTime() > new Date(t.startTime).getTime() && t.deviceId === p.deviceId)
                 updateTrip(t, routeInside)
@@ -104,9 +106,10 @@ function isPartialInsideTimetable(t, userData, route){
     return isPartialInside
 }
 
+
 function isInsideTimetable(t, userData){
-    const tripStart  = new Date(t.startTime)
-    const tripEnd  = new Date(t.endTime)
+    const tripStart = new Date(t.startTime)
+    const tripEnd = new Date(t.endTime)
 
     if((tripStart.getDay() === 0 && userData.weekDays.sunday) ||
         (tripStart.getDay() === 1 && userData.weekDays.monday) ||
@@ -116,13 +119,12 @@ function isInsideTimetable(t, userData){
         (tripStart.getDay() === 5 && userData.weekDays.friday) ||
         (tripStart.getDay() === 6 && userData.weekDays.saturday)) {
 
-        const startDate = new Date(new Date(tripStart).toISOString().split('T')[0] + ' '+userData.dayHours.startTime)
-        const endDate = new Date(new Date(tripStart).toISOString().split('T')[0] + ' '+userData.dayHours.endTime)
-
-        console.log(tripStart, startDate, endDate)
+        const startDate = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' '+userData.dayHours.startTime)
+        const endDate = new Date(convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' '+userData.dayHours.endTime)
 
         //Trips inside time period
         if(startDate.getTime() < endDate.getTime()) {
+            console.log((tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDate.getTime()))
             return tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDate.getTime()
         } else {
             return (tripStart.getTime() < endDate.getTime() && tripEnd.getTime() < endDate.getTime()) ||
@@ -134,6 +136,7 @@ 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
     t.distance = distance
     t.duration = new Date(route[route.length-1].fixTime).getTime() - new Date(route[0].fixTime).getTime()

package/src/util/utils.js

@@ -112,6 +112,24 @@ function convertToLocaleTimeString(value, lang, timezone){
     }
 }
 
+function getTimezoneOffset(timezone){
+    if(isClientSide){
+        return new Date().getTimezoneOffset()
+    } else {
+        const utcDate = new Date(new Date().toLocaleString('en-US', { timeZone: 'UTC' }))
+        const tzDate = new Date(new Date().toLocaleString('en-US', { timeZone: timezone }))
+        return (utcDate.getTime() - tzDate.getTime()) / 6e4
+    }
+}
+
+function convertFromUTC(value, timezone) {
+    const offset = getTimezoneOffset(timezone)
+
+    const valueDate = new Date(value)
+    valueDate.setTime(valueDate.getTime() - (offset * 60 * 1000))
+    return valueDate
+}
+
 exports.getImgFromUrl = getImgFromUrl
 exports.convertMS = convertMS
 exports.coordsDistance = coordsDistance
@@ -120,6 +138,8 @@ exports.convertToLocaleString = convertToLocaleString
 exports.convertToLocaleDateString = convertToLocaleDateString
 exports.convertToLocaleTimeString = convertToLocaleTimeString
 exports.isClientSide = isClientSide
+exports.getTimezoneOffset = getTimezoneOffset
+exports.convertFromUTC = convertFromUTC
 exports.getLogo = (user) => {
     const host = window ? window.location.hostname : getUserPartner(user).host
     return getImage(getLogoUrl(host))