fleetmap-reports 1.0.920 → 1.0.922

package/package.json

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

package/src/kms-report.js

@@ -7,7 +7,7 @@ const {
 } = require('./util/pdfDocument')
 const { getUserPartner } = require('fleetmap-partners')
 const traccar = require('./util/traccar')
-const { getDates, getTranslations } = require('./util/utils')
+const { getDates, getTranslations, isClientSide, executeServerSide } = require('./util/utils')
 const drivers = require('./util/driver')
 const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getDataByDay, checkTripsKms } = require('./util/trips')
 const traccarHelper = require('./util/traccar')
@@ -43,21 +43,29 @@ async function createKmsReportByDevice (from, to, userData, traccarInstance) {
     to
   }
 
-  let deviceCount = 0
-  const sliced = automaticReports.sliceArray(allDevices, 20)
-  for (const devices of sliced) {
-    const needRoute = !userData.allWeek
-    const {
-      trips,
-      route
-    } = await traccar.getAllInOne(traccarInstance, from, to, devices, needRoute, true, false, false, deviceCount, allDevices.length, 10, 2)
-
-    // Process report data
-    if (trips.length) {
-      checkTripsKms(traccarInstance, from, to, allDevices, { trips, route })
-      allData.devices = allData.devices.concat(await processDevices(from, to, allDevices, { trips, route }, userData, traccarInstance))
+  if (isClientSide() && allDevices.length > 50 && userData.groupByDay) {
+    const sliced = automaticReports.sliceArray(allDevices, 20)
+    await executeServerSide('kms-report', allData, sliced, from, to, userData, allDevices.length)
+  } else {
+    let deviceCount = 0
+    const sliced = automaticReports.sliceArray(allDevices, 20)
+    for (const devices of sliced) {
+      const needRoute = !userData.allWeek
+      const {
+        trips,
+        route
+      } = await traccar.getAllInOne(traccarInstance, from, to, devices, needRoute, true, false, false, deviceCount, allDevices.length, 10, 2)
+
+      // Process report data
+      if (trips.length) {
+        checkTripsKms(traccarInstance, from, to, allDevices, { trips, route })
+        allData.devices = allData.devices.concat(await processDevices(from, to, allDevices, {
+          trips,
+          route
+        }, userData, traccarInstance))
+      }
+      deviceCount += devices.length
     }
-    deviceCount += devices.length
   }
 
   return allData

package/src/tests/zones.test.js

@@ -45,18 +45,19 @@ describe('zones', function () {
 
   // eslint-disable-next-line no-undef
   it('works with casais zones in columns', async () => {
-    const report = await getReports(process.env.USER_CASAIS, process.env.PASS_CASAIS)
+    const report = await getReports('fleetmap.joao.penas2@gmail.com', 'penas46881')
     const userData = await report.getUserData()
     userData.zonesByColumn = true
-    userData.devices = userData.devices.filter(d => d.name === 'G-1101-E Clio')
-    userData.geofences = userData.geofences.filter(g => g.name === 'baliza 1 - raio verde ')
-    userData.onlyWithKmsOut = true
+    userData.devices = userData.devices.filter(d => d.id === 81202)
+    userData.geofences = userData.geofences.filter(g => g.name === 'baliza 1 - raio verde ' ||
+    g.name === 'baliza 2 - raio amarelo')
+    userData.onlyWithKmsOut = false
     const result = await report.zoneReport(
-      new Date(Date.UTC(2023, 0, 1, 0, 0, 0, 0)),
-      new Date(Date.UTC(2023, 0, 31, 23, 59, 59, 0)),
+      new Date(Date.UTC(2023, 6, 13, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 6, 13, 23, 59, 59, 0)),
       userData)
-    const first = result[0].devices[0].days[0]
+    const first = result[0].devices[0]
     console.log(first)
-    assert.equal(first.distanceOut, 35.52274536571346)
+    assert.equal(first.days[0].distanceOut, 28)
   }, 4000000)
 })

package/src/trip-report.js

@@ -343,7 +343,7 @@ async function exportTripReportToPDF (userData, reportData) {
       doc.text(name, 20, space + 20)
       doc.setFontSize(11)
       doc.text(group ? translations.report.group + ': ' + group.name : '', 200, space + 20)
-      doc.text(convertToLocaleString(d.from, lang, timezone) + ' - ' + convertToLocaleString(d.to, lang, timezone), 20, space + 25)
+      doc.text(convertToLocaleString(d.from, lang, timezone, userData.user) + ' - ' + convertToLocaleString(d.to, lang, timezone, userData.user), 20, space + 25)
       if (!userData.allWeek && userData.weekDays) {
         doc.text((userData.weekDays.monday ? ' ' + translations.report.monday + ',' : '') +
                     (userData.weekDays.tuesday ? ' ' + translations.report.tuesday + ',' : '') +

package/src/util/utils.js

@@ -224,6 +224,18 @@ function weekDaySelected (date, weekDays) {
     (date.getDay() === 6 && weekDays.saturday))
 }
 
+async function executeServerSide (type, allData, sliced, from, to, userData, totalDevices) {
+  let deviceCount = 0
+  for (const devices of sliced) {
+    const url = `https://${process.env.SERVER_HOST}/reports/${type}`
+    const data = await axios.post(url, { from, to, userData: { ...userData, devices } }, { withCredentials: true }).then(d => d.data)
+    allData.devices.push(...(data[0].devices))
+    deviceCount = deviceCount + devices.length
+    console.log(`PROGRESS_PERC:${deviceCount / totalDevices * 100}`)
+  }
+}
+
+exports.executeServerSide = executeServerSide
 exports.getImgFromUrl = getImgFromUrl
 exports.convertMS = convertMS
 exports.coordsDistance = coordsDistance