fleetmap-reports 1.0.252 → 1.0.253

package/.idea/workspace.xml

@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="fix speeding report">
-      <change beforePath="$PROJECT_DIR$/lang/enGB.js" beforeDir="false" afterPath="$PROJECT_DIR$/lang/enGB.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lang/esCL.js" beforeDir="false" afterPath="$PROJECT_DIR$/lang/esCL.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lang/ptBR.js" beforeDir="false" afterPath="$PROJECT_DIR$/lang/ptBR.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lang/ptPT.js" beforeDir="false" afterPath="$PROJECT_DIR$/lang/ptPT.js" afterDir="false" />
+    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="Trip and activity report with time period">
       <change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/activity-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/activity-report.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/index.test.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.test.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/kms-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/kms-report.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/speeding-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/speeding-report.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/trip-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/trip-report.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/util/traccar.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/traccar.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/util/utils.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/utils.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -220,7 +212,8 @@
       <workItem from="1639591829775" duration="681000" />
       <workItem from="1639592539998" duration="27141000" />
       <workItem from="1639766010908" duration="4991000" />
-      <workItem from="1639872937953" duration="466000" />
+      <workItem from="1639872937953" duration="1438000" />
+      <workItem from="1639954341221" duration="7636000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>
@@ -313,7 +306,14 @@
       <option name="project" value="LOCAL" />
       <updated>1639248407782</updated>
     </task>
-    <option name="localTasksCounter" value="14" />
+    <task id="LOCAL-00014" summary="Trip and activity report with time period">
+      <created>1639873766070</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1639873766072</updated>
+    </task>
+    <option name="localTasksCounter" value="15" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -344,6 +344,7 @@
     <MESSAGE value="kms report - show every selected day" />
     <MESSAGE value="speeding report with customSpeed" />
     <MESSAGE value="fix speeding report" />
-    <option name="LAST_COMMIT_MESSAGE" value="fix speeding report" />
+    <MESSAGE value="Trip and activity report with time period" />
+    <option name="LAST_COMMIT_MESSAGE" value="Trip and activity report with time period" />
   </component>
 </project>

package/package.json

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

package/src/kms-report.js

@@ -6,6 +6,7 @@ const {headerFromUser,addTable} = require("./util/pdfDocument");
 const {getUserPartner} = require("fleetmap-partners");
 const traccar = require("./util/traccar");
 const {getDates} = require("./util/utils");
+const trips = require("./util/trips");
 
 
 let traccarInstance
@@ -25,12 +26,13 @@ async function createKmsReportByDevice(from, to) {
 
     devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
     const route = userData.allWeek ? [] : await traccar.getRoute(traccarInstance, from, to, devicesToProcess)
-    const trips = await traccar.getTrips(traccarInstance, from, to, devicesToProcess)
+    const tripsData = await traccar.getTrips(traccarInstance, from, to, devicesToProcess)
 
-    console.log('trips:' + trips.length)
+    console.log('trips:' + tripsData.length)
 
-    if (trips.length > 0) {
-        allData.devices = processDevices(from, to, devicesToProcess, route, trips)
+    if (tripsData.length > 0) {
+        await trips.checkTripsKms(traccarInstance, from, to, route, tripsData, devicesToProcess)
+        allData.devices = processDevices(from, to, devicesToProcess, route, tripsData)
     }
 
     return allData

package/src/trip-report.js

@@ -9,37 +9,40 @@ const {getUserPartner} = require("fleetmap-partners")
 const {headerFromUser, addTable} = require("./util/pdfDocument")
 const {getStyle} = require("./reportStyle")
 const traccar = require("./util/traccar")
+const trips = require("./util/trips");
 
 
 let traccarInstance
+let userData
 
 const fileName = 'TripReport'
 
-async function createTripReport(from, to, userData, traccar) {
+async function createTripReport(from, to, reportUserData, traccar) {
     console.log('Create TripReport')
+    userData = reportUserData
     traccarInstance = traccar
     const reportData = []
 
     if(userData.byDriver){
-        const allData = await createTripReportByDriver(from, to, userData)
+        const allData = await createTripReportByDriver(from, to)
         reportData.push(allData)
     }
     else if(userData.byGroup){
         console.log("ByGroup")
-        const allData = await createTripReportByGroup(from, to, userData)
+        const allData = await createTripReportByGroup(from, to)
         reportData.push(...allData)
     }
 
     const groupIds = userData.groups.map(g => g.id)
     const withoutGroupDevices = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
 
-    const allData = await createTripReportByDevice(from, to, userData, withoutGroupDevices)
+    const allData = await createTripReportByDevice(from, to, withoutGroupDevices)
     reportData.push(allData)
 
     return reportData
 }
 
-async function createTripReportByDevice(from, to, userData, devices) {
+async function createTripReportByDevice(from, to, devices) {
     const allData = {
         devices: [],
         xpert: devices.filter(d => d.attributes.xpert).length > 0
@@ -54,14 +57,14 @@ async function createTripReportByDevice(from, to, userData, devices) {
     console.log('Trips:' + data.length)
 
     if (data.length > 0) {
-        allData.devices = processDevices(from, to, devices, data, stopsData, userData)
-
+        await trips.checkTripsKms(traccarInstance, from, to,[], data, devices)
+        allData.devices = processDevices(from, to, devices, data, stopsData)
     }
 
     return allData
 }
 
-async function createTripReportByGroup(from, to, userData) {
+async function createTripReportByGroup(from, to) {
     const reportData = []
     for (const g of userData.groups) {
         const devices = userData.devices.filter(d => d.groupId === g.id)
@@ -93,7 +96,7 @@ async function createTripReportByGroup(from, to, userData) {
     return reportData
 }
 
-async function createTripReportByDriver(from, to, userData){
+async function createTripReportByDriver(from, to){
     const deviceIds = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
     console.log(deviceIds.length)
 
@@ -112,7 +115,7 @@ async function createTripReportByDriver(from, to, userData){
     return allData
 }
 
-function processDevices(from, to, devices, data, stopsData, userData) {
+function processDevices(from, to, devices, data, stopsData) {
     const devicesResult = []
 
     devices.forEach(d => {

package/src/util/trips.js

@@ -0,0 +1,18 @@
+const traccar = require("./traccar");
+
+async function checkTripsKms(traccarInstance, from, to, routeData, tripsData, devices) {
+    console.log('checkTripsKms')
+    const trips = tripsData.filter(t => t.distance === 0 && t.averageSpeed > 10)
+    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 => {
+            const tripRoute = 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)
+        })
+    }
+}
+
+exports.checkTripsKms = checkTripsKms