fleetmap-reports 1.0.297 → 1.0.301

package/.idea/runConfigurations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

package/package.json

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

package/src/idle-report.js

@@ -193,8 +193,10 @@ async function exportIdleReportToPDF(userData, reportData) {
                     footValues.splice(2, 0, '')
                 }
 
-                doc.addFileToVFS("Amiri-Regular.ttf", AmiriRegular());
-                doc.addFont("Amiri-Regular.ttf", "Amiri", "normal");
+                if(timezone === 'Asia/Qatar') {
+                    doc.addFileToVFS("Amiri-Regular.ttf", AmiriRegular());
+                    doc.addFont("Amiri-Regular.ttf", "Amiri", "normal");
+                }
 
                 const style = getStyle(getUserPartner(userData.user))
                 doc.autoTable({

package/src/kms-report.js

@@ -8,7 +8,7 @@ const traccar = require("./util/traccar");
 const {getDates} = require("./util/utils");
 const trips = require("./util/trips");
 const drivers = require("./util/driver");
-const {isInsideTimetable} = require("./util/trips");
+const { isInsideTimetable, isPartialInsideTimetable} = require("./util/trips");
 
 
 let traccarInstance
@@ -58,8 +58,8 @@ async function createKmsReportByDevice(from, to) {
     console.log('trips:' + tripsData.length)
 
     if (tripsData.length > 0) {
-        await trips.checkTripsKms(traccarInstance, from, to, route, tripsData, devicesToProcess)
-        allData.devices = processDevices(from, to, devicesToProcess, route, tripsData)
+        trips.checkTripsKms(traccarInstance, from, to, devicesToProcess, {trips: tripsData, route: route})
+        allData.devices = processDevices(from, to, devicesToProcess, {trips: tripsData, route: route})
     }
 
     return allData
@@ -75,7 +75,9 @@ async function createKmsReportByDriver(from, to) {
     }
 
     const tripsData = await traccar.getTrips(traccarInstance, from, to, devices)
-    return { drivers: processDrivers(from, to, userData.drivers, tripsData) }
+    const routeData = await traccar.getTrips(traccarInstance, from, to, devices)
+
+    return { drivers: processDrivers(from, to, userData.drivers, {trips: tripsData, route: routeData}) }
 }
 
 async function createKmsReportByGroup(from, to) {
@@ -98,8 +100,8 @@ async function createKmsReportByGroup(from, to) {
             console.log('trips:' + tripsData.length)
 
             if (tripsData.length > 0) {
-                await trips.checkTripsKms(traccarInstance, from, to, route, tripsData, devices)
-                groupData.devices = processDevices(from, to, devices, route, tripsData)
+                trips.checkTripsKms(traccarInstance, from, to, devices, {trips: tripsData, route: route})
+                groupData.devices = processDevices(from, to, devices, {trips: tripsData, route: route})
             }
 
             reportData.push(groupData)
@@ -116,7 +118,10 @@ function processDrivers(from, to, drivers, data) {
     console.log(data)
     const driversResult = []
     drivers.forEach(d => {
-        const trips = data.filter(t => t.driverUniqueId === d.uniqueId)
+        const route = data.route.filter(p => p.attributes.driverUniqueId === d.uniqueId)
+        const trips = data.trips.filter(t => t.driverUniqueId === d.uniqueId
+            && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
+
         if (trips.length > 0) {
             const driverData = {
                 driver: d
@@ -149,13 +154,15 @@ function processDrivers(from, to, drivers, data) {
 }
 
 
-function processDevices(from, to, devices, route, trips) {
+function processDevices(from, to, devices, data) {
     const devicesResult = []
 
     for (const d of devices) {
-        const deviceTrips = trips.filter(t => t.deviceId === d.id)
+        const route = data.route.filter(t => t.deviceId === d.id)
+        const deviceTrips = data.trips.filter(t => t.deviceId === d.id
+            && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
 
-         if (deviceTrips.length > 0) {
+        if (deviceTrips.length > 0) {
             if(userData.groupByDay) {
                 deviceTrips.forEach(t => t.tripDay = new Date(t.startTime).toISOString().split('T')[0] + ' 12:00 PM')
                 const groupedTrips = deviceTrips.reduce(
@@ -167,82 +174,30 @@ function processDevices(from, to, devices, route, trips) {
 
                 const days = []
                 let keys = Array.from(groupedTrips.keys())
-                 allDates.forEach(d => {
-                     const day = d.toISOString().split('T')[0] + ' 12:00 PM'
-                     if(!keys.includes(day)){
-                         groupedTrips.set(day, [])
-                     }
-                 })
-
-                 keys = Array.from(groupedTrips.keys())
-                 keys.sort((a,b)=>new Date(a).getTime()-new Date(b).getTime());
-                 keys.forEach(key => {
+                allDates.forEach(d => {
+                    const day = d.toISOString().split('T')[0] + ' 12:00 PM'
+                    if(!keys.includes(day)){
+                        groupedTrips.set(day, [])
+                    }
+                })
+
+                keys = Array.from(groupedTrips.keys())
+                keys.sort((a,b)=>new Date(a).getTime()-new Date(b).getTime());
+                keys.forEach(key => {
                     const currentDate = new Date(key)
-                    let dayTrips = groupedTrips.get(key)
+                    const dayTrips = groupedTrips.get(key)
                     const day = {
                         date: currentDate,
                         kms: 0
                     }
 
-                    if(userData.allWeek || !userData.weekDays){
-                        day.kms = dayTrips.reduce((a, b) => a + b.distance, 0) || 0
-                    } else {
-                        if((currentDate.getDay() === 0 && userData.weekDays.sunday) ||
-                            (currentDate.getDay() === 1 && userData.weekDays.monday) ||
-                            (currentDate.getDay() === 2 && userData.weekDays.tuesday) ||
-                            (currentDate.getDay() === 3 && userData.weekDays.wednesday)  ||
-                            (currentDate.getDay() === 4 && userData.weekDays.thursday) ||
-                            (currentDate.getDay() === 5 && userData.weekDays.friday) ||
-                            (currentDate.getDay() === 6 && userData.weekDays.saturday)) {
-
-                            const startDate = new Date(new Date(key).toISOString().split('T')[0] + ' '+userData.dayHours.startTime)
-                            const endDate = new Date(new Date(key).toISOString().split('T')[0] + ' '+userData.dayHours.endTime)
-
-                            console.log(key, startDate, endDate)
-
-                            if(startDate.getTime() < endDate.getTime()) {
-                                //Trips inside time period
-                                const filteredTrips = dayTrips.filter(t => new Date(t.startTime).getTime() > startDate.getTime()
-                                    && new Date(t.endTime).getTime() < endDate.getTime())
-
-                                day.kms = filteredTrips.reduce((a, b) => a + b.distance, 0) || 0
-                                console.log('Inside trips:' + day.kms)
-                            } else {
-                                //Trips inside time period
-                                const filteredTrips = dayTrips.filter(t => new Date(t.startTime).getTime() > startDate.getTime()
-                                    || new Date(t.endTime).getTime() < endDate.getTime())
-
-                                day.kms = filteredTrips.reduce((a, b) => a + b.distance, 0) || 0
-                                console.log('Inside trips:' + day.kms)
-                            }
-
-                            //Trip starts outside time period and ends inside time period
-                            const startIncompleteTrip = dayTrips.filter(t => new Date(t.startTime).getTime() < startDate.getTime()
-                                && new Date(t.endTime).getTime() > startDate.getTime())
-
-                            //Trip starts inside time period and ends outside time period
-                            const endIncompleteTrip = dayTrips.filter(t => new Date(t.startTime).getTime() < endDate.getTime()
-                                && new Date(t.endTime).getTime() > endDate.getTime())
-
-                            if (startIncompleteTrip.length) {
-                                const routeInside = route.filter(p => new Date(p.fixTime).getTime() > startDate.getTime() && new Date(p.fixTime).getTime() < new Date(startIncompleteTrip[0].endTime).getTime())
-                                day.kms = day.kms + (routeInside.reduce((a, b) => a + b.distance, 0) || 0)
-                                console.log('startIncompleteTrip:' + day.kms)
-                            }
-
-                            if (endIncompleteTrip.length) {
-                                const routeInside = route.filter(p => new Date(p.fixTime).getTime() < endDate.getTime() && new Date(p.fixTime).getTime() > new Date(endIncompleteTrip[0].startTime).getTime())
-                                day.kms = day.kms + (routeInside.reduce((a, b) => a + b.distance, 0) || 0)
-                                console.log('endIncompleteTrip:' + day.kms)
-                            }
-                        }
-                    }
+                    day.kms = dayTrips.reduce((a, b) => a + b.distance, 0)
 
                     days.push(day)
                 })
                 devicesResult.push({
-                 device: d,
-                 days: days
+                    device: d,
+                    days: days
                 })
             } else {
                 devicesResult.push({

package/src/speeding-report.js

@@ -346,7 +346,7 @@ async function exportSpeedingReportToPDF(userData, reportData) {
 
   if (overspeedData) {
     let first = true
-    const doc = new jsPDF.jsPDF('l');
+    const doc = new jsPDF.jsPDF('l',undefined, undefined, true);
     await headerFromUser(doc, translations.report.titleSpeedingReport, userData.user)
 
     overspeedData.forEach(d => {
@@ -402,8 +402,10 @@ async function exportSpeedingReportToPDF(userData, reportData) {
           footValues.splice(2, 0, '')
         }
 
-        doc.addFileToVFS("Amiri-Regular.ttf", AmiriRegular());
-        doc.addFont("Amiri-Regular.ttf", "Amiri", "normal");
+        if(timezone === 'Asia/Qatar') {
+          doc.addFileToVFS("Amiri-Regular.ttf", AmiriRegular());
+          doc.addFont("Amiri-Regular.ttf", "Amiri", "normal");
+        }
 
         const style = getStyle(getUserPartner(userData.user))
         doc.autoTable({
@@ -428,7 +430,7 @@ async function exportSpeedingReportToPDF(userData, reportData) {
             fontSize: 9
           },
           startY: space+35 });
-    } catch (e) {
+      } catch (e) {
         console.error(e, 'moving on...')
       }
     })

package/src/trip-report.js

@@ -9,7 +9,7 @@ const {headerFromUser, addTable} = require("./util/pdfDocument")
 const {getStyle} = require("./reportStyle")
 const traccar = require("./util/traccar")
 const trips = require("./util/trips");
-const {isInsideTimetable, addNearestPOIs} = require("./util/trips");
+const {isInsideTimetable, addNearestPOIs, isPartialInsideTimetable} = require("./util/trips");
 
 
 let traccarInstance
@@ -51,14 +51,15 @@ async function createTripReportByDevice(from, to) {
     devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
     const devicesToSlice = devices.slice()
-    const data = await traccar.getTrips(traccarInstance, from, to, devicesToSlice)
+    const tripsData = await traccar.getTrips(traccarInstance, from, to, devicesToSlice)
     const stopsData = await traccar.getStops(traccarInstance, from, to, devicesToSlice)
+    const routeData = await traccar.getRoute(traccarInstance, from, to, devicesToSlice)
 
-    console.log('Trips:' + data.length)
+    console.log('Trips:' + tripsData.length)
 
-    if (data.length > 0) {
-        await trips.checkTripsKms(traccarInstance, from, to,[], data, devices)
-        allData.devices = processDevices(from, to, devices, data, stopsData)
+    if (tripsData.length > 0) {
+        trips.checkTripsKms(traccarInstance, from, to, devices, {trips: tripsData, route: routeData})
+        allData.devices = processDevices(from, to, devices, {trips: tripsData, stops: stopsData, route: routeData})
     }
 
     return allData
@@ -82,11 +83,14 @@ async function createTripReportByGroup(from, to) {
             const stopsResponse = await traccarInstance.reports.reportsStopsGet(from, to, null, [g.id])
             const stopsData = stopsResponse.data
 
+            const routeResponse = await traccarInstance.reports.reportsRouteGet(from, to, null, [g.id])
+            const routeData = routeResponse.data
+
             devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
             if (tripsData.length > 0) {
                 console.log('Trips:' + tripsData.length)
-                groupData.devices = processDevices(from, to, devices, tripsData, stopsData, userData)
+                groupData.devices = processDevices(from, to, devices, {trips: tripsData, stops: stopsData, route: routeData})
 
                 reportData.push(groupData)
             }
@@ -112,17 +116,19 @@ async function createTripReportByDriver(from, to){
     }
 
     const tripsData = await traccar.getTrips(traccarInstance, from, to, devices)
+    const routeData = await traccar.getRoute(traccarInstance, from, to, devices)
 
-    return { drivers: processDrivers(from, to, userData.drivers, tripsData)}
+    return { drivers: processDrivers(from, to, userData.drivers, {trips: tripsData, route: routeData})}
 }
 
-function processDevices(from, to, devices, data, stopsData) {
+function processDevices(from, to, devices, data) {
     const devicesResult = []
 
     devices.forEach(d => {
-        const trips = data.filter(t => t.deviceId === d.id
-            && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData)))
-        const stops = stopsData.filter(s => s.deviceId === d.id)
+        const route = data.route.filter(t => t.deviceId === d.id)
+        const trips = data.trips.filter(t => t.deviceId === d.id
+            && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
+        const stops = data.stops.filter(s => s.deviceId === d.id)
 
         addNearestPOIs(trips, userData)
 
@@ -136,7 +142,7 @@ function processDevices(from, to, devices, data, stopsData) {
             }
 
             const stop = getStop(new Date(trip.startTime), stops)
-            if (stop) {
+            if (stop && !trip.endTimeIsOut) {
                 trip.stopDuration = (new Date(stop.endTime) - new Date(stop.startTime))
                 trip.stopEngineHours = stop.engineHours
             } else {
@@ -173,8 +179,9 @@ function processDrivers(from, to, drivers, data) {
     console.log(data)
     const driversResult = []
     drivers.forEach(d => {
-        const trips = data.filter(t => t.driverUniqueId === d.uniqueId
-            && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData)))
+        const route = data.route.filter(p => p.attributes.driverUniqueId === d.uniqueId)
+        const trips = data.trips.filter(t => t.driverUniqueId === d.uniqueId
+            && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
 
         trips.sort((a,b)=>new Date(a.startTime).getTime()-new Date(b.startTime).getTime())
 

package/src/util/trips.js

@@ -1,4 +1,3 @@
-const traccar = require("./traccar");
 const {coordsDistance} = require("./utils");
 
 const minDistance = 0
@@ -25,15 +24,14 @@ function addNearestPOIs(trips, userData){
     })
 }
 
-async function checkTripsKms(traccarInstance, from, to, routeData, tripsData, devices) {
+function checkTripsKms(traccarInstance, from, to, devices, data) {
     console.log('checkTripsKms')
-    const trips = tripsData.filter(t => t.distance === minDistance && t.averageSpeed > minAvgSpeed)
+    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
-        const route = routeData.length === 0 ? await traccar.getRoute(traccarInstance, from, to, devices) : routeData
         trips.forEach(t => {
             if(t.distance === minDistance && t.averageSpeed > minAvgSpeed) {
-                const tripRoute = route.filter(p => p.deviceId === t.deviceId
+                const tripRoute = data.route.filter(p => p.deviceId === t.deviceId
                     && new Date(p.fixTime).getTime() >= new Date(t.startTime).getTime()
                     && new Date(p.fixTime).getTime() <= new Date(t.endTime).getTime())
                 t.distance = tripRoute.reduce((a, b) => a + b.attributes.distance, 0)
@@ -42,6 +40,70 @@ async function checkTripsKms(traccarInstance, from, to, routeData, tripsData, de
     }
 }
 
+function isPartialInsideTimetable(t, userData, route){
+    const tripStart  = new Date(t.startTime)
+    let isPartialInside = false
+
+    if((tripStart.getDay() === 0 && userData.weekDays.sunday) ||
+        (tripStart.getDay() === 1 && userData.weekDays.monday) ||
+        (tripStart.getDay() === 2 && userData.weekDays.tuesday) ||
+        (tripStart.getDay() === 3 && userData.weekDays.wednesday)  ||
+        (tripStart.getDay() === 4 && userData.weekDays.thursday) ||
+        (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)
+
+        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()) {
+                //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()
+                t.endTimeIsOut = true
+                isPartialInside = true
+            }
+
+            if (new Date(t.startTime).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()
+                t.startTimeIsOut = true
+                isPartialInside = true
+            }
+
+        } else {
+            if (new Date(t.startTime).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()
+                t.startTimeIsOut = true
+                isPartialInside = true
+            }
+
+            if (new Date(t.startTime).getTime() < endDate.getTime()
+                && new Date(t.endTime).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()
+                t.endTimeIsOut = true
+                isPartialInside = true
+            }
+        }
+    }
+
+    return isPartialInside
+}
+
 function isInsideTimetable(t, userData){
     const tripStart  = new Date(t.startTime)
     const tripEnd  = new Date(t.endTime)
@@ -71,6 +133,15 @@ function isInsideTimetable(t, userData){
     return false
 }
 
+function updateTrip(t, route){
+    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()
+    t.maxSpeed = route.reduce((a, b) => Math.max(a, b.speed), 0)
+    t.averageSpeed = distance > 0 ? ((route.reduce((a, b) => a + b.speed, 0)) / route.length) : 0
+}
+
 exports.checkTripsKms = checkTripsKms
 exports.isInsideTimetable = isInsideTimetable
+exports.isPartialInsideTimetable = isPartialInsideTimetable
 exports.addNearestPOIs = addNearestPOIs

package/.idea/codeStyles/Project.xml

@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <ScalaCodeStyleSettings>
-      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
-    </ScalaCodeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>

package/.idea/jsLibraryMappings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptLibraryMappings">
-    <file url="file://$PROJECT_DIR$" libraries="{Node.js Core}" />
-  </component>
-</project>