fleetmap-reports 1.0.329 → 1.0.331

package/package.json

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

package/src/activity-report.js

@@ -87,10 +87,11 @@ async function createActivityReportByDevice(from, to, userData, traccarInstance)
 
     let summaries = []
     let routeData = []
-    const tripsData = await traccar.getTrips(traccarInstance, from, to, devicesToProcess)
+    const allInOne  = await traccar.getAllInOne(traccarInstance, from, to, devicesToProcess, userData.groupByDay && !userData.allWeek, true, false, !userData.groupByDay)
+    const tripsData = allInOne.trips
 
     if(userData.groupByDay) {
-        routeData = userData.allWeek ? [] : await traccar.getRoute(traccarInstance, from, to, devicesToProcess)
+        routeData = allInOne.route
         console.log('trips:' + tripsData.length)
 
         if (tripsData.length > 0) {
@@ -109,7 +110,7 @@ async function createActivityReportByDevice(from, to, userData, traccarInstance)
             }
         }
     } else {
-        summaries = await traccar.getSummary(traccarInstance, from, to, devicesToProcess)
+        summaries = allInOne.summary
     }
 
     console.log('Summary:' + summaries.length)
@@ -128,8 +129,9 @@ async function createActivityReportByDriver(from, to, userData, traccarInstance)
     let tripsData = []
     let routeData = []
     if(devices.length > 0) {
-        tripsData = await traccar.getTrips(traccarInstance, from, to, devices)
-        routeData = await traccar.getRoute(traccarInstance, from, to, devices)
+        const allInOne = await traccar.getAllInOne(traccarInstance, from, to, devices, true, true, false, false)
+        tripsData = allInOne.trips
+        routeData = allInOne.route
     }
 
     const allData = {

package/src/index.js

@@ -7,7 +7,8 @@ function Reports(config, axios) {
         devices: new DevicesApi(config, null, axios),
         groups: new GroupsApi(config, null, axios),
         drivers: new DriversApi(config, null, axios),
-        geofences: new GeofencesApi(config, null, axios)
+        geofences: new GeofencesApi(config, null, axios),
+        axios: axios || require('axios').create(config.baseOptions)
     }
     this.getUserData = async () => {
         return {

package/src/index.test.js

@@ -19,4 +19,22 @@ describe('speedingReport', function() {
         console.log('report', report)
         console.log(reports.kmsReportToExcel(userData, report[0]))
     })
+    it('test allinone', async() => {
+        console.log('Start')
+
+        const reports = await getReports()
+
+        const r = await require("./util/traccar").getAllInOne(reports.traccar,
+            new Date(2022, 1, 2),
+            new Date(2022, 1, 3),
+            [{"id":22327}],
+            false,
+            true,
+            true,
+            false)
+
+        console.log(r)
+
+        console.log('End')
+    })
 })

package/src/trip-report.js

@@ -47,9 +47,10 @@ async function createTripReportByDevice(from, to, userData, traccar) {
     devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
     const devicesToSlice = devices.slice()
-    const tripsData = await traccarHelper.getTrips(traccar, from, to, devicesToSlice)
-    const stopsData = await traccarHelper.getStops(traccar, from, to, devicesToSlice)
-    const routeData = await traccarHelper.getRoute(traccar, from, to, devicesToSlice)
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devicesToSlice, true, true, true, false)
+    const tripsData = allInOne.trips
+    const stopsData = allInOne.stops
+    const routeData = allInOne.route
 
     console.log('Trips:' + tripsData.length)
 
@@ -108,8 +109,9 @@ async function createTripReportByDriver(from, to, userData, traccar){
         return { drivers:[] }
     }
 
-    const tripsData = await traccarHelper.getTrips(traccar, from, to, devices)
-    const routeData = await traccarHelper.getRoute(traccar, from, to, devices)
+    const allInOne =  await traccarHelper.getAllInOne(traccar, from, to, devices, true, true, false, false)
+    const tripsData = allInOne.trips
+    const routeData = allInOne.route
 
     return { drivers: processDrivers(from, to, userData, {trips: tripsData, route: routeData})}
 }

package/src/util/traccar.js

@@ -11,6 +11,7 @@ async function getRoute(traccar, from, to, devices){
     }
 
     const result = await Promise.all(requests)
+
     return result.map(r => r.data).flat()
 }
 
@@ -65,8 +66,49 @@ async function getSummary(traccar, from, to, devices){
     return result.map(r => r.data).flat()
 }
 
+async function getAllInOne(traccar, from, to, devices, getRoutes, getTrips, getStops, getSummary){
+
+    let url = `/reports/allinone?&from=${from.toISOString()}&to=${to.toISOString()}`
+    if(getRoutes)  url += `&type=route`
+    if(getTrips)   url += `&type=trips`
+    if(getStops)   url += `&type=stops`
+    if(getSummary) url += `&type=summary`
+
+    const devicesToSlice = devices.slice()
+    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
+    let requests = []
+
+    for (const a of arrayOfArrays) {
+        let sliceUrl = url
+        for(const d of a){
+            sliceUrl += `&deviceId=${d.id}`
+        }
+        const promise = traccar.axios.get(sliceUrl)
+        requests = requests.concat(promise)
+    }
+
+    const resultList = await Promise.all(requests)
+
+    const result = {
+        route : [],
+        trips : [],
+        stops : [],
+        summary : []
+    }
+
+    for(const r of resultList){
+        if(getRoutes)  result.route   = result.route.concat(r.data.route)
+        if(getTrips)   result.trips   = result.trips.concat(r.data.trips)
+        if(getStops)   result.stops   = result.stops.concat(r.data.stops)
+        if(getSummary) result.summary = result.summary.concat(r.data.summary)
+    }
+
+    return result
+}
+
 exports.getRoute = getRoute
 exports.getTrips = getTrips
 exports.getStops = getStops
 exports.getEvents = getEvents
 exports.getSummary = getSummary
+exports.getAllInOne = getAllInOne

package/.idea/aws.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="accountSettings">
-    <option name="activeProfile" value="profile:default" />
-    <option name="activeRegion" value="us-east-1" />
-    <option name="recentlyUsedProfiles">
-      <list>
-        <option value="profile:default" />
-      </list>
-    </option>
-    <option name="recentlyUsedRegions">
-      <list>
-        <option value="us-east-1" />
-      </list>
-    </option>
-  </component>
-</project>

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/fleetmap-reports.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

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>

package/.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/fleetmap-reports.iml" filepath="$PROJECT_DIR$/.idea/fleetmap-reports.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>