fleetmap-reports 1.0.815 → 1.0.817

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.815",
+  "version": "1.0.817",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -20,8 +20,8 @@
     "file-saver": "^2.0.5",
     "fleetmap-partners": "^1.0.76",
     "json-as-xlsx": "^1.2.1",
-    "jspdf": "^2.3.1",
-    "jspdf-autotable": "^3.5.14",
+    "jspdf": "^2.5.1",
+    "jspdf-autotable": "3.6.0",
     "moment": "^2.29.4",
     "tough-cookie": "^4.0.0",
     "traccar-api": "^1.0.5",

package/src/partnerReports/afriquia.js

@@ -7,6 +7,10 @@ function calculateLastStopTime (stopTime, to, time) {
   return stopTime + (to.getTime() - new Date(time).getTime())
 }
 
+function calculateFirstStopTime (stopTime, from, time) {
+  return stopTime + (new Date(time).getTime() - from.getTime())
+}
+
 async function createActivityReport (from, to, userData, traccarInstance) {
   const unauthorizedGeofences = []
   const authorizedGeofences = []

package/src/tests/activity.test.js

@@ -7,13 +7,13 @@ describe('activity report', function () {
   it('Activity by device', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
-    userData.groupByDay = true
-    const data = await report.activityReport(new Date(2023, 0, 1, 0, 0, 0, 0),
-      new Date(2023, 0, 31, 23, 59, 59, 0),
+
+    const data = await report.activityReport(new Date(2022, 0, 1, 0, 0, 0, 0),
+      new Date(2022, 0, 31, 23, 59, 59, 0),
       userData)
     assert.equal(data.length, 1)
     const device = data[0].devices.find(d => d.device.id === 22326)
-    assert.equal(device.summary[0].startOdometer, 248891759.24)
+    assert.equal(device.summary[0].startOdometer, 0)
     assert.equal(device.summary[0].distance, 0)
     assert.equal(device.summary[0].startTime, 0)
     assert.equal(device.summary[0].endTime, 0)
@@ -72,17 +72,4 @@ describe('activity report', function () {
     console.log(device)
     assert.equal(device.summary.reduce((a, b) => a + b.convertedSpentFuel, 0), 168.79999999999995)
   }, 800000)
-  it('Activity test performance', async () => {
-    const report = await getReports()
-    const userData = await report.getUserData()
-    userData.groupByDay = true
-    userData.devices = userData.devices.filter(d => d.id === 69114)
-    const data = await report.activityReport(new Date(2023, 5, 11, 0, 0, 0, 0),
-        new Date(2023, 6, 11, 23, 59, 59, 0),
-        userData)
-    assert.equal(data.length, 1)
-    const device = data[0].devices.find(d => d.device.id === 69114)
-    console.log(device)
-    assert.equal(device.summary.reduce((a, b) => a + b.convertedSpentFuel, 0), 168.79999999999995)
-  }, 800000)
 })

package/src/tests/index.test.js

@@ -12,10 +12,11 @@ describe('Test_Reports', function () {
     userData.customSpeed = false
     userData.useVehicleSpeedLimit = true
     const data = await report.speedingReport(
-      new Date(Date.UTC(2022, 9, 22, 0, 0, 0, 0)),
-      new Date(Date.UTC(2022, 9, 22, 23, 59, 59, 0)),
+      new Date(Date.UTC(2023, 7, 1, 0, 0, 0, 0)),
+      new Date(Date.UTC(2023, 7, 2, 23, 59, 59, 0)),
       userData)
-    await report.speedingReportToPDF(userData, data)
+    const pdf = await report.speedingReportToPDF(userData, data[0])
+    pdf.save()
   }, 40000)
 
   it('converts madrid time', async () => {

package/src/util/pdfDocument.js

@@ -15,6 +15,7 @@ async function header (doc, title, hostname, style, orientation) {
         doc.addImage(image, 'PNG', (orientation === 'l' ? 220 : 135) + (style.imgWidth < 50 ? 25 : 0), 5, style.imgWidth, style.imgHeight)
       }
     } catch (e) {
+      console.error(e)
     }
   }
   doc.setFont('helvetica', 'normal')

package/src/util/utils.js

@@ -136,7 +136,7 @@ async function getImageBase64 (url) {
 
 function getLogoUrl (hostname) {
   const path = `/img/logos/${hostname}.png`
-  return window ? path : `https://${hostname}${path}`
+  return isClientSide() ? path : `https://${hostname}${path}`
 }
 
 async function getImgFromUrl (hostname) {
@@ -253,3 +253,4 @@ exports.calculateDistance = (positions) => {
 }
 
 exports.sortPositions = (a, b) => new Date(a.fixTime).getTime() - new Date(b.fixTime).getTime()
+exports.getLogoUrl = getLogoUrl