fleetmap-reports 1.0.328 → 1.0.333

package/package.json

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

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

package/src/index.test.js

@@ -17,7 +17,7 @@ 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]))
+        console.log(reports.kmsReportToExcel(userData, report[0]))
     })
     it('test allinone', async() => {
         console.log('Start')

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/util/traccar.js

@@ -68,7 +68,7 @@ async function getSummary(traccar, from, to, devices){
 
 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()}`
+    let url = `/api/reports/allinone?&from=${from.toISOString()}&to=${to.toISOString()}`
     if(getRoutes)  url += `&type=route`
     if(getTrips)   url += `&type=trips`
     if(getStops)   url += `&type=stops`
@@ -83,7 +83,7 @@ async function getAllInOne(traccar, from, to, devices, getRoutes, getTrips, getS
         for(const d of a){
             sliceUrl += `&deviceId=${d.id}`
         }
-        const promise = traccar.basic.axios.get(sliceUrl, traccar.basic.config.baseOptions)
+        const promise = traccar.axios.get(sliceUrl)
         requests = requests.concat(promise)
     }