fleetmap-reports 1.0.244 → 1.0.248

package/.idea/workspace.xml

@@ -1,11 +1,11 @@
 <?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="kms report with parallel requests">
-      <change beforePath="$PROJECT_DIR$/src/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.js" afterDir="false" />
+    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="refactor speeding and trip report">
+      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" 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/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" />
@@ -37,34 +37,44 @@
     <property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" />
     <property name="vue.rearranger.settings.migration" value="true" />
   </component>
-  <component name="RunManager" selected="Mocha.speedingReport.test kmsReport by day">
-    <configuration name="report" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
+  <component name="RunManager" selected="Mocha.Reports.test event report">
+    <configuration name="Reports.test event report" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
       <node-interpreter>project</node-interpreter>
       <node-options />
       <mocha-package>$PROJECT_DIR$/node_modules/mocha</mocha-package>
       <working-directory>$PROJECT_DIR$</working-directory>
       <pass-parent-env>true</pass-parent-env>
+      <envs>
+        <env name="email" value="jppenas@gmail.com" />
+        <env name="password" value="penas46881" />
+      </envs>
       <ui>bdd</ui>
       <extra-mocha-options />
-      <test-kind>SUITE</test-kind>
+      <test-kind>TEST</test-kind>
       <test-file>$PROJECT_DIR$/src/index.test.js</test-file>
       <test-names>
-        <name value="report" />
+        <name value="Reports" />
+        <name value="test event report" />
       </test-names>
       <method v="2" />
     </configuration>
-    <configuration name="speedingReport" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
+    <configuration name="Reports.test trip report" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
       <node-interpreter>project</node-interpreter>
       <node-options />
       <mocha-package>$PROJECT_DIR$/node_modules/mocha</mocha-package>
       <working-directory>$PROJECT_DIR$</working-directory>
       <pass-parent-env>true</pass-parent-env>
+      <envs>
+        <env name="email" value="jppenas@gmail.com" />
+        <env name="password" value="penas46881" />
+      </envs>
       <ui>bdd</ui>
       <extra-mocha-options />
       <test-kind>TEST</test-kind>
       <test-file>$PROJECT_DIR$/src/index.test.js</test-file>
       <test-names>
-        <name value="speedingReport" />
+        <name value="Reports" />
+        <name value="test trip report" />
       </test-names>
       <method v="2" />
     </configuration>
@@ -88,7 +98,7 @@
       </test-names>
       <method v="2" />
     </configuration>
-    <configuration name="test reports" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
+    <configuration name="speedingReport.test speeding" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
       <node-interpreter>project</node-interpreter>
       <node-options />
       <mocha-package>$PROJECT_DIR$/node_modules/mocha</mocha-package>
@@ -100,43 +110,47 @@
       </envs>
       <ui>bdd</ui>
       <extra-mocha-options />
-      <test-kind>SUITE</test-kind>
+      <test-kind>TEST</test-kind>
       <test-file>$PROJECT_DIR$/src/index.test.js</test-file>
       <test-names>
-        <name value="test reports" />
+        <name value="speedingReport" />
+        <name value="test speeding" />
       </test-names>
       <method v="2" />
     </configuration>
-    <configuration name="test reports.test queue" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
+    <configuration name="test reports" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
       <node-interpreter>project</node-interpreter>
       <node-options />
       <mocha-package>$PROJECT_DIR$/node_modules/mocha</mocha-package>
       <working-directory>$PROJECT_DIR$</working-directory>
       <pass-parent-env>true</pass-parent-env>
+      <envs>
+        <env name="email" value="jppenas@gmail.com" />
+        <env name="password" value="penas46881" />
+      </envs>
       <ui>bdd</ui>
       <extra-mocha-options />
-      <test-kind>TEST</test-kind>
+      <test-kind>SUITE</test-kind>
       <test-file>$PROJECT_DIR$/src/index.test.js</test-file>
       <test-names>
         <name value="test reports" />
-        <name value="test queue" />
       </test-names>
       <method v="2" />
     </configuration>
     <list>
-      <item itemvalue="Mocha.report" />
-      <item itemvalue="Mocha.speedingReport" />
       <item itemvalue="Mocha.test reports" />
-      <item itemvalue="Mocha.test reports.test queue" />
       <item itemvalue="Mocha.speedingReport.test kmsReport by day" />
+      <item itemvalue="Mocha.speedingReport.test speeding" />
+      <item itemvalue="Mocha.Reports.test trip report" />
+      <item itemvalue="Mocha.Reports.test event report" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Mocha.Reports.test event report" />
+        <item itemvalue="Mocha.Reports.test trip report" />
+        <item itemvalue="Mocha.speedingReport.test speeding" />
         <item itemvalue="Mocha.speedingReport.test kmsReport by day" />
         <item itemvalue="Mocha.test reports" />
-        <item itemvalue="Mocha.test reports.test queue" />
-        <item itemvalue="Mocha.speedingReport" />
-        <item itemvalue="Mocha.report" />
       </list>
     </recent_temporary>
   </component>
@@ -171,7 +185,14 @@
       <workItem from="1637868513425" duration="1650000" />
       <workItem from="1637928687573" duration="37000" />
       <workItem from="1637931438656" duration="621000" />
-      <workItem from="1637952151523" duration="3658000" />
+      <workItem from="1637952151523" duration="17766000" />
+      <workItem from="1638270786569" duration="6960000" />
+      <workItem from="1638455902437" duration="120000" />
+      <workItem from="1638486745343" duration="4126000" />
+      <workItem from="1638792860278" duration="2140000" />
+      <workItem from="1638839462028" duration="50000" />
+      <workItem from="1638840110567" duration="597000" />
+      <workItem from="1638888787940" duration="18005000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>
@@ -215,7 +236,28 @@
       <option name="project" value="LOCAL" />
       <updated>1637858604089</updated>
     </task>
-    <option name="localTasksCounter" value="7" />
+    <task id="LOCAL-00007" summary="Kms Report - Calculate distance with traccar trips">
+      <created>1638179219255</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1638179219256</updated>
+    </task>
+    <task id="LOCAL-00008" summary="fix speeding report">
+      <created>1638186780966</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1638186780967</updated>
+    </task>
+    <task id="LOCAL-00009" summary="refactor speeding and trip report">
+      <created>1638288337133</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1638288337135</updated>
+    </task>
+    <option name="localTasksCounter" value="10" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -240,6 +282,9 @@
     <MESSAGE value="Kms report grouped by day" />
     <MESSAGE value="Fix pdf logo" />
     <MESSAGE value="kms report with parallel requests" />
-    <option name="LAST_COMMIT_MESSAGE" value="kms report with parallel requests" />
+    <MESSAGE value="Kms Report - Calculate distance with traccar trips" />
+    <MESSAGE value="fix speeding report" />
+    <MESSAGE value="refactor speeding and trip report" />
+    <option name="LAST_COMMIT_MESSAGE" value="refactor speeding and trip report" />
   </component>
 </project>

package/package.json

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

package/src/index.js

@@ -23,7 +23,7 @@ function Reports(config, axios) {
         return require('./speeding-report').createSpeedingReport(from, to, userData, this.traccar, roadSpeedLimits)
     }
 
-    this.speedingReportToPDF = async (userData, reportData) => {
+    this.speedingReportToPDF = (userData, reportData) => {
         return require('./speeding-report').exportSpeedingReportToPDF(userData, reportData)
     }
 

package/src/index.test.js

@@ -1,14 +1,39 @@
 const {getReports} = require("./tests");
 
-describe('speedingReport', function() {
+describe('Reports', function() {
     this.timeout(500000)
     it('test speeding', async () => {
         const report = await getReports()
         const userData = await report.getUserData()
 
-        await report.speedingReport(new Date(2021, 2, 30, 0, 0, 0, 0),
+        const reportData = await report.speedingReport(new Date(2021, 2, 30, 0, 0, 0, 0),
             new Date(2021, 2, 30, 23, 59, 59, 0),
             userData)
+
+        console.log(reportData)
+
+    })
+    it('test trip report', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
+        userData.byGroup = true
+        const reportData = await report.tripReport(new Date(2021, 2, 30, 0, 0, 0, 0),
+            new Date(2021, 2, 30, 23, 59, 59, 0),
+            userData)
+
+        console.log(reportData)
+
+    })
+    it('test event report', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
+        userData.eventTypes = []
+        const reportData = await report.eventsReport(new Date(2021, 10, 20, 0, 0, 0, 0),
+            new Date(2021, 10, 30, 23, 59, 59, 0),
+            userData)
+
+        console.log(reportData)
+
     })
     it('test kmsReport by day', async () => {
         const reports = await getReports()

package/src/kms-report.js

@@ -9,10 +9,11 @@ const traccar = require("./util/traccar");
 
 
 let traccarInstance
+let userData
 
 const fileName = 'KmsReport'
 
-async function createKmsReportByDevice(from, to, userData) {
+async function createKmsReportByDevice(from, to) {
     const groupIds = userData.groups.map(g => g.id)
     const devicesToProcess = userData.byGroup ? userData.devices.filter(d => !groupIds.includes(d.groupId)) : userData.devices
 
@@ -23,54 +24,99 @@ async function createKmsReportByDevice(from, to, userData) {
     }
 
     devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
-    //const data = await traccar.getRoute(traccarInstance, from, to, devicesToProcess)
-    const data = await traccar.getTrips(traccarInstance, from, to, devicesToProcess)
+    const route = userData.allWeek ? [] : await traccar.getRoute(traccarInstance, from, to, devicesToProcess)
+    const trips = await traccar.getTrips(traccarInstance, from, to, devicesToProcess)
 
-    console.log('trips:' + data.length)
+    console.log('trips:' + trips.length)
 
-    if (data.length > 0) {
-        allData.devices = processDevices(from, to, devicesToProcess, data)
+    if (trips.length > 0) {
+        allData.devices = processDevices(from, to, devicesToProcess, route, trips)
     }
 
     return allData
 }
 
-async function createKmsReportByDriver(from, to, userData) {
+async function createKmsReportByDriver(from, to) {
 
 }
 
-async function createKmsReportByGroup(from, to, userData) {
+async function createKmsReportByGroup(from, to) {
 
 }
 
-function processDevices(from, to, devices, data) {
+function processDevices(from, to, devices, route, trips) {
     const devicesResult = []
 
     for (const d of devices) {
-        const trips = data.filter(t => t.deviceId === d.id)
+        const deviceTrips = trips.filter(t => t.deviceId === d.id)
 
-        if (trips.length > 0) {
-            trips.forEach(t => t.tripDay = new Date(t.startTime).toISOString().split('T')[0] + ' 12:00 PM')
-            const groupedTrips = trips.reduce(
+         if (deviceTrips.length > 0) {
+            deviceTrips.forEach(t => t.tripDay = new Date(t.startTime).toISOString().split('T')[0] + ' 12:00 PM')
+            const groupedTrips = deviceTrips.reduce(
                 (entryMap, e) => entryMap.set(e.tripDay, [...entryMap.get(e.tripDay)||[], e]),
                 new Map()
             )
 
             const days = []
             const keys = Array.from(groupedTrips.keys())
-
             keys.forEach(key => {
-                const dayTrips = groupedTrips.get(key)
+                const currentDate = new Date(key)
+                let dayTrips = groupedTrips.get(key)
                 const day = {
-                    date: new Date(key),
-                    kms: dayTrips.reduce((a, b) => a + b.totalKms, 0) || 0
+                    date: currentDate,
+                    kms: 0
+                }
+
+                if(userData.allWeek){
+                    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)
+
+                        //Trips inside time period
+                        const filteredTrips = dayTrips.filter(t => new Date(t.startTime).getTime() > startDate.getTime()
+                                && new Date(t.endTime).getTime() < endDate.getTime())
+
+                        //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())
+
+                        day.kms = filteredTrips.reduce((a, b) => a + b.distance, 0) || 0
+                        console.log('Inside trips:'+day.kms)
+
+                        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)
+                        }
+                    }
                 }
+
                 days.push(day)
             })
-
             devicesResult.push({
-                device: d,
-                days: days
+             device: d,
+             days: days
             })
         }
     }
@@ -78,23 +124,26 @@ function processDevices(from, to, devices, data) {
     return devicesResult
 }
 
-async function createKmsReport(from, to, userData, traccar) {
+async function createKmsReport(from, to, reportUserData, traccar) {
     console.log('Create KmsReport')
+
+    console.log(from, to)
     traccarInstance = traccar
+    userData = reportUserData
     if(userData.groupByDay){
         const reportData = []
 
         if(userData.byDriver){
-            const allData = await createKmsReportByDriver(from, to, userData)
+            const allData = await createKmsReportByDriver(from, to)
             reportData.push(allData)
         }
         else if(userData.byGroup){
-            const allGroupsData = await createKmsReportByGroup(from, to, userData)
+            const allGroupsData = await createKmsReportByGroup(from, to)
             allGroupsData.forEach(data => reportData.push(data))
-            const withoutGroupDevices = await createKmsReportByDevice(from, to, userData)
+            const withoutGroupDevices = await createKmsReportByDevice(from, to)
             reportData.push(withoutGroupDevices)
         } else {
-            const allData = await createKmsReportByDevice(from, to, userData)
+            const allData = await createKmsReportByDevice(from, to)
             reportData.push(allData)
         }
 

package/src/speeding-report.js

@@ -1,4 +1,3 @@
-const automaticReports = require("./automaticReports")
 const messages = require('../lang')
 const jsPDF = require('jspdf')
 const {convertMS} = require("./util/utils")
@@ -11,6 +10,7 @@ const drivers = require("./util/driver")
 const {distance, point} = require('turf')
 const here = require('./here')
 const {getUserPartner} = require("fleetmap-partners");
+const traccar = require("./util/traccar");
 
 let traccarInstance
 
@@ -37,7 +37,8 @@ async function createSpeedingReport(from, to, userData, traccar, roadSpeedLimits
           xpert: devices.filter(d => d.attributes.xpert).length > 0
         }
 
-        const data = await getReportData(from, to, devices)
+        const events = ['deviceOverspeed']
+        const data = await traccar.getEvents(traccarInstance, from, to, devices, events)
 
         devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
@@ -64,7 +65,8 @@ async function createSpeedingReportByDevice(from, to, userData, roadSpeedLimits)
 
   withoutGroupDevices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
-  const data = await getReportData(from, to, withoutGroupDevices)
+  const events = ['deviceOverspeed']
+  const data = await traccar.getEvents(traccarInstance, from, to, withoutGroupDevices, events)
 
   const allData = { devices: [] }
 
@@ -78,23 +80,20 @@ async function createSpeedingReportByDevice(from, to, userData, roadSpeedLimits)
 
 async function createSpeedingReportByDriver(from, to, userData) {
   const deviceIds = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
-  console.log(deviceIds.length)
+  console.log('Devices with driver',deviceIds.length)
 
   let eventsData = []
   if(deviceIds.length > 0) {
-    console.log('getReportData', deviceIds.length)
     const devices = userData.devices.filter(d => deviceIds.includes(d.id))
-    eventsData = await getReportData(from, to, devices)
+    eventsData = await traccar.getEvents(traccarInstance, from, to, devices,['deviceOverspeed'])
   }
 
   const allData = {
     drivers: []
   }
-
   console.log(eventsData.length)
 
   await getEventsPosition(from , to, userData.devices, userData.geofences, userData.drivers, eventsData)
-
   allData.drivers = await processDrivers(from, to, userData.drivers, eventsData)
   console.log(allData.drivers.length)
   return allData
@@ -125,29 +124,13 @@ async function processDrivers(from, to, drivers, data) {
   return driversResult
 }
 
-async function getReportData(from, to, devices) {
-  const types = ['deviceOverspeed']
-  let data = []
-  const arrayOfArrays = automaticReports.sliceArray(devices)
-  for (const a of arrayOfArrays) {
-    try {
-      const devices = a.map(d => d.id)
-      console.log('reportsEventsGet', from, to, devices, null, types)
-      const response = await traccarInstance.reports.reportsEventsGet(from, to, devices, null, types)
-      data = data.concat(response.data)
-    } catch (e) {
-      console.error(e)
-    }
-  }
-  console.log('Alerts:', data.length)
-  return data
-}
-
 async function processDevices(from, to, devices, geofences, drivers, data, roadSpeedLimits) {
   const devicesResult = []
 
   await getEventsPosition(from , to, devices, geofences, drivers, data, roadSpeedLimits)
 
+  console.log(data)
+
   for (const d of devices) {
     const alerts = data.filter(t => t.deviceId === d.id)
 
@@ -168,14 +151,18 @@ async function processDevices(from, to, devices, geofences, drivers, data, roadS
   return devicesResult
 }
 
-async function getEventsPosition(from, to, devices, geofences, drivers, data, roadSpeedLimits){
-  for (const d of devices) {
+async function getEventsPosition(from, to, devices, geofences, drivers, events, roadSpeedLimits){
 
-    let alerts = data.filter(t => t.deviceId === d.id)
+  const deviceIds = [...new Set(events.map(e => e.deviceId))]
+  const routeData = await traccar.getRoute(traccarInstance, from, to, deviceIds.map(id => { return { id: id } } ))
+
+  console.log(events)
+
+  for (const d of devices) {
+    let alerts = events.filter(t => t.deviceId === d.id)
 
     if (alerts.length > 0 || roadSpeedLimits) {
-      const response = await traccarInstance.reports.reportsRouteGet(from, to, [d.id])
-      const positions = response.data
+      const positions = routeData.filter(p => p.deviceId === d.id)
 
       if (roadSpeedLimits && positions.length) {
         try {
@@ -201,8 +188,8 @@ async function getEventsPosition(from, to, devices, geofences, drivers, data, ro
             }
             return acc
           })
-          data.push(...reduced)
-          alerts = data.filter(t => t.deviceId === d.id)
+          events.push(...reduced)
+          alerts = events.filter(t => t.deviceId === d.id)
         } catch (e) {
           console.error(e)
         }