fleetmap-reports 1.0.328 → 1.0.329

package/.idea/aws.xml

@@ -0,0 +1,17 @@
+<?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

@@ -0,0 +1,7 @@
+<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

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

package/.idea/fleetmap-reports.iml

@@ -0,0 +1,9 @@
+<?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

@@ -0,0 +1,6 @@
+<?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

@@ -0,0 +1,6 @@
+<?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

@@ -0,0 +1,8 @@
+<?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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.328",
+  "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

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

package/src/index.js

@@ -7,8 +7,7 @@ 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),
-        basic: {config:config, axios:axios}
+        geofences: new GeofencesApi(config, null, axios)
     }
     this.getUserData = async () => {
         return {

package/src/index.test.js

@@ -17,24 +17,6 @@ describe('speedingReport', function() {
         const report = await reports.kmsReport(new Date(2021, 9, 30), new Date(2021, 10),
             userData)
         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')
+        console.log(reports.kmsReportToExcel(userData, report[0]))
     })
 })

package/src/kms-report.js

@@ -9,7 +9,6 @@ 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'
 
@@ -431,4 +430,3 @@ function exportKmsReportToExcel(userData, reportData) {
 exports.createKmsReport = createKmsReport
 exports.exportKmsReportToPDF = exportKmsReportToPDF
 exports.exportKmsReportToExcel = exportKmsReportToExcel
-exports.exportKmsReportToWord = word.exportKmsReportToWord

package/src/trip-report.js

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

package/src/util/traccar.js

@@ -11,7 +11,6 @@ async function getRoute(traccar, from, to, devices){
     }
 
     const result = await Promise.all(requests)
-
     return result.map(r => r.data).flat()
 }
 
@@ -66,49 +65,8 @@ 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 = `${traccar.basic.config.basePath}/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.basic.axios.get(sliceUrl, traccar.basic.config.baseOptions)
-        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