fleetmap-reports 1.0.233 → 1.0.234

package/package.json

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

package/src/automaticReports.js

@@ -3,7 +3,7 @@ const moment = require('moment')
 function sliceArray(longArray) {
     const arrayToSlice = longArray.slice()
 
-    const size = 200
+    const size = 10
     const arrayOfArrays = []
     for (let i=0; i<arrayToSlice.length; i+=size) {
         arrayOfArrays.push(arrayToSlice.slice(i,i+size));

package/src/index.test.js

@@ -1,27 +1,20 @@
-const Index = require('./index')
-const {SessionApi} = require("traccar-api");
-const axios = require('axios')
-const axiosCookieJarSupport = require('axios-cookiejar-support').default;
-const tough = require('tough-cookie');
-const cookieJar = new tough.CookieJar();
+const {getReports} = require("./tests");
 
-axiosCookieJarSupport(axios)
+describe('speedingReport', function() {
+    this.timeout(500000)
+    it('test speeding', async () => {
+        const report = await getReports()
+        const userData = await report.getUserData()
 
-test('speedingReport', async () => {
-    const traccarConfig = {
-        basePath: 'https://api.pinme.io/api',
-        baseOptions: {
-            withCredentials: true,
-            jar: cookieJar
-        }
-    }
-
-    await new SessionApi(traccarConfig, null, axios).sessionPost('-','-')
-    const report = new Index(traccarConfig,  axios)
-    const userData = await report.getUserData()
-
-    await report.speedingReport(new Date(2021, 2, 30, 0, 0, 0, 0),
-        new Date(2021, 2, 30, 23, 59, 59, 0),
-        userData)
-
-}, 10000)
+        await report.speedingReport(new Date(2021, 2, 30, 0, 0, 0, 0),
+            new Date(2021, 2, 30, 23, 59, 59, 0),
+            userData)
+    })
+    it('test kmsReport by day', async () => {
+        const reports = await getReports()
+        const userData = await reports.getUserData()
+        userData.groupByDay = true
+        await reports.kmsReport(new Date(2021, 9), new Date(2021, 10),
+            userData)
+    })
+})

package/src/kms-report.js

@@ -28,7 +28,9 @@ async function createKmsReportByDevice(from, to, userData) {
     const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
     let data = []
     for (const a of arrayOfArrays) {
+        console.log('getting',from,to,a.map(a => a.id))
         const response = await traccarInstance.reports.reportsRouteGet(from, to, a.map(d => d.id))
+        console.log('concat', response.data.length)
         data = data.concat(response.data)
     }
 

package/src/location-report.js

@@ -139,7 +139,7 @@ async function exportLocationReportToPDF(userData, reportData) {
             doc.text(new Date(d.from).toLocaleString() + ' - ' + new Date(d.to).toLocaleString(), 20, space + 25)
             d.positions.map(a => {
                 const temp = [
-                    a.fixTime,
+                    getLocationDate(a, userData.user),
                     a.address,
                     Math.round(a.speed * 1.85200),
                     a.attributes.ignition ? translations.report.ignitionOn : translations.report.ignitionOff,

package/src/tests/index.js

@@ -0,0 +1,22 @@
+const {SessionApi} = require("traccar-api");
+const axios = require('axios')
+const axiosCookieJarSupport = require('axios-cookiejar-support').default;
+const tough = require('tough-cookie');
+const Index = require('../index');
+const cookieJar = new tough.CookieJar();
+const traccarConfig = {
+    basePath: 'https://api.pinme.io/api',
+    baseOptions: {
+        withCredentials: true,
+        jar: cookieJar
+    }
+}
+
+axiosCookieJarSupport(axios)
+
+exports.getReports = async() => {
+    await new SessionApi(traccarConfig, null, axios).sessionPost(process.env.email, process.env.password)
+    return new Index(traccarConfig, axios)
+}
+
+