fleetmap-reports 1.0.555 → 1.0.556

package/package.json

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

package/src/location-report.js

@@ -205,8 +205,17 @@ async function exportLocationReportToPDF (userData, reportData) {
 
   if (positionsData) {
     if (userData.includeDigitalPorts) {
-      headers.push(getDigitalPort1Label(userData.byDriver ? positionsData[0].driver : positionsData[0].device, translations))
-      headers.push(getDigitalPort2Label(userData.byDriver ? positionsData[0].driver : positionsData[0].device, translations))
+      headers.push(
+        getDigitalPort1Label(
+          userData.byDriver ? positionsData[0].driver : positionsData[0].device,
+          translations,
+          positionsData[0].device.attributes
+        ))
+      headers.push(
+        getDigitalPort2Label(
+          userData.byDriver ? positionsData[0].driver : positionsData[0].device,
+          translations,
+          positionsData[0].device.attributes))
     }
     headers.push('Latitude')
     headers.push('Longitude')
@@ -247,8 +256,8 @@ async function exportLocationReportToPDF (userData, reportData) {
         }
 
         if (userData.includeDigitalPorts) {
-          temp.push(getDigitalPortValue(a, 1, translations))
-          temp.push(getDigitalPortValue(a, 2, translations))
+          temp.push(getDigitalPortValue(a, 1, translations, d.attributes))
+          temp.push(getDigitalPortValue(a, 2, translations, d.attributes))
         }
         temp.push(a.latitude)
         temp.push(a.longitude)
@@ -296,18 +305,24 @@ function getTempValue (row) {
   )) || ''
 }
 
-function getDigitalPort1Label (row, translations) {
-  return row.attributes.door1 || translations.report.digital_ports1
+function getDigitalPort1Label (row, translations, dAttributes) {
+  return dAttributes.sensor1 || translations.report.digital_ports1
 }
 
 function getDigitalPort2Label (row, translations) {
   return row.attributes.door2 || translations.report.digital_ports2
 }
 
-function getDigitalPortValue (row, index, translations) {
+function getDigitalPortValue (row, index, translations, dAttributes) {
   switch (index) {
     case 1:
-      return row.attributes && row.attributes.door1 ? translations.report[row.attributes.door1] : ''
+      if (row.attributes && row.attributes.door1 !== undefined) {
+        return translations.report[row.attributes.door1]
+      }
+      if (row.attributes && row.attributes.sensor !== undefined) {
+        return dAttributes.sensor1On || row.attributes.sensor
+      }
+      break
     case 2:
       if (row.attributes && row.attributes.door2) {
         return translations.report[row.attributes.door2]

package/src/zone-report.js

@@ -80,27 +80,18 @@ async function createZoneReport (from, to, userData, traccar) {
   return reportData
 }
 
-async function getAllInOne (
+async function getRoute (
   traccar,
   from,
   to,
   devices,
-  getRoutes,
-  getTrips,
-  getStops,
-  getSummary,
   currentDeviceCount = 0,
   totalDevices = devices.length,
   sliceSize = 5,
   devicesPerRequest = 1,
   counter = undefined,
   userData) {
-  let url = `/reports/allinone?from=${from.toISOString()}&to=${to.toISOString()}`
-  if (getRoutes) url += '&type=route'
-  if (getTrips) url += '&type=trips'
-  if (getStops) url += '&type=stops'
-  if (getSummary) url += '&type=summary'
-
+  const url = `/reports/allinone?from=${from.toISOString()}&to=${to.toISOString()}&type=route`
   const sliced = automaticReports.sliceArray(devices, sliceSize)
   const result = []
   console.log('getAll, slicing', sliceSize)