fleetmap-reports 1.0.722 → 1.0.724

package/package.json

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

package/src/tests/zones.test.js

@@ -47,4 +47,26 @@ describe('zones', function () {
     assert.equal(first.inTime.fixTime, '2023-01-03T21:23:24.000+0000')
     assert.equal(first.outTime.fixTime, '2023-01-07T12:22:53.000+0000')
   }, 4000000)
+
+  // eslint-disable-next-line no-undef
+  it('works with casais 2', async () => {
+    const report = await getReports('mario.andre.moreira@casais.gi', 'Casais.23')
+    const userData = await report.getUserData()
+    userData.groupByDay = true
+    userData.devices = userData.devices.filter(d => d.name === 'G-2542-F Fiat Tipo')
+    userData.geofences = userData.geofences.filter(g => g.name === 'baliza raio verde ')
+    assert.equal(userData.geofences.length > 0, true)
+    assert.equal(userData.devices.length > 0, true)
+    const result = await report.zoneReport(
+      new Date(Date.UTC(2023, 1, 27, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 1, 27, 23, 59, 59, 0)),
+      userData)
+    assert.equal(result[0].devices[0].geofences.length, 1)
+    assert.equal(result[0].devices[0].geofences[0].days.length, 1)
+    const first = result[0].devices[0].geofences[0].days[0]
+    console.log(first)
+    assert.equal(first.firstIn, '2023-02-27T21:53:16.000+0000')
+    assert.equal(first.distanceIn, 93.03917199839687)
+    assert.equal(first.distanceOut, 819.6685737216337)
+  }, 4000000)
 })

package/src/zone-report.js

@@ -119,7 +119,8 @@ async function processDevices (from, to, devices, userData, data) {
           let distanceIn = zoneInOutDayData.length && dayRoute.length ? zoneInOutDayData.reduce((a, b) => a + (b.distanceIn || 0), 0) : 0
           let distanceOut = 0
           if (zoneInOutDayData.length) {
-            distanceOut = zoneInOutDayData.reduce((a, b) => a + (b.distanceOut || 0), 0) - zoneInOutDayData[zoneInOutDayData.length - 1].distanceOut
+            distanceOut = zoneInOutDayData.reduce((a, b) => a + (b.distanceOut || 0), 0) -
+              (zoneInOutDayData[zoneInOutDayData.length - 1].distanceOut || 0)
           } else {
             distanceOut = calculateDistance(deviceRoute.filter(p => new Date(p.fixTime) >= fromByDay && new Date(p.fixTime) < toByDay))
           }
@@ -397,6 +398,9 @@ async function exportZoneReportToPDF (userData, reportData) {
             g.days.reduce((a, b) => a + (b.distanceOut ? b.distanceOut : 0), 0).toLocaleString(lang, { maximumFractionDigits: 2 })
           ]
           addTable(doc, headers, data, footer, style, space + 40, {
+            0: { halign: 'right' },
+            1: { halign: 'right' },
+            2: { halign: 'right' },
             3: { halign: 'right' },
             4: { halign: 'right' },
             5: { halign: 'right' },
@@ -476,7 +480,7 @@ function exportZoneReportToExcel (userData, reportData) {
         })
       } else {
         data = data.concat(d.geofences.map(a => {
-          return getColumns(d, a, userData, translations)
+          return getColumns(d, a, userData, translations, true)
         }))
         data = data.concat([{}])
       }
@@ -510,7 +514,7 @@ function reportHeader (first, doc, translations, device, lang, timezone, userDat
   return space
 }
 
-function getColumns (device, data, userData, translations) {
+function getColumns (device, data, userData, translations, excel) {
   return {
     ...data,
     name: device.device.name,
@@ -520,8 +524,12 @@ function getColumns (device, data, userData, translations) {
     date: convertToLocaleDateString(data.date, userData.user.attributes.lang, userData.user.attributes.timezone),
     firstIn: data.firstIn ? convertToLocaleTimeString(data.firstIn, userData.user.attributes.lang, userData.user.attributes.timezone) : '-',
     lastOut: data.lastOut ? convertToLocaleTimeString(data.lastOut, userData.user.attributes.lang, userData.user.attributes.timezone) : '-',
-    distanceIn: data.distanceIn ? data.distanceIn.toLocaleString(userData.user.attributes.lang, { maximumFractionDigits: 2 }) : 0,
-    distanceOut: data.distanceOut ? data.distanceOut.toLocaleString(userData.user.attributes.lang, { maximumFractionDigits: 2 }) : 0,
+    distanceIn: excel
+      ? data.distanceIn || 0
+      : (data.distanceIn && data.distanceIn.toLocaleString(userData.user.attributes.lang, { maximumFractionDigits: 2 })) || 0,
+    distanceOut: excel
+      ? data.distanceOut || 0
+      : (data.distanceOut && data.distanceOut.toLocaleString(userData.user.attributes.lang, { maximumFractionDigits: 2 })) || 0,
     totalInTime: convertMS(data.totalInTime, !userData.groupByDay),
     totalOutTime: convertMS(data.totalOutTime, !userData.groupByDay),
     zone: data.geofenceName,