fleetmap-reports 1.0.783 → 1.0.784

package/package.json

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

package/src/activity-report.js

@@ -83,15 +83,16 @@ async function createActivityReportByDevice (from, to, userData, traccarInstance
     to
   }
 
-  const sliced = automaticReports.sliceArray(allDevices, 5)
+  const sliced = automaticReports.sliceArray(allDevices, 4)
   let deviceCount = 0
   for (const devices of sliced) {
     let summaries = []
+    const needRoute = userData.groupByDay || !userData.allWeek
     const {
       trips,
       route,
       summary
-    } = await traccar.getAllInOne(traccarInstance, from, to, devices, true, true, false, !userData.groupByDay, deviceCount, allDevices.length)
+    } = await traccar.getAllInOne(traccarInstance, from, to, devices, needRoute, true, false, !userData.groupByDay, deviceCount, allDevices.length)
 
     if (userData.groupByDay) {
       console.log('trips:' + trips.length)
@@ -400,20 +401,22 @@ function exportActivityReportToPDFVehicle (doc, translations, reportData, userDa
   reportData.devices.forEach(d => {
     const group = userData.groups.find(g => d.device.groupId === g.id)
 
-    const temp = [
-      d.device.name,
-      group ? group.name : '',
-      d.summary[0].startTime ? new Date(d.summary[0].startTime).toLocaleString() : '',
-      d.summary[0].endTime ? new Date(d.summary[0].endTime).toLocaleString() : '',
-      Number((d.summary[0].distance / 1000).toFixed(1)),
-      Number((d.summary[0].startOdometer / 1000).toFixed(1)),
-      Number((d.summary[0].endOdometer / 1000).toFixed(1)),
-      Math.round(d.summary[0].averageSpeed * 1.85200),
-      Math.round(d.summary[0].maxSpeed * 1.85200),
-      convertMS(d.summary[0].engineHours),
-      d.summary[0].convertedSpentFuel >= 0 ? d.summary[0].convertedSpentFuel : 0
-    ]
-    data.push(temp)
+    if (d.summary) {
+      const temp = [
+        d.device.name,
+        group ? group.name : '',
+        d.summary[0].startTime ? new Date(d.summary[0].startTime).toLocaleString() : '',
+        d.summary[0].endTime ? new Date(d.summary[0].endTime).toLocaleString() : '',
+        Number((d.summary[0].distance / 1000).toFixed(1)),
+        Number((d.summary[0].startOdometer / 1000).toFixed(1)),
+        Number((d.summary[0].endOdometer / 1000).toFixed(1)),
+        Math.round(d.summary[0].averageSpeed * 1.85200),
+        Math.round(d.summary[0].maxSpeed * 1.85200),
+        convertMS(d.summary[0].engineHours),
+        d.summary[0].convertedSpentFuel >= 0 ? d.summary[0].convertedSpentFuel : 0
+      ]
+      data.push(temp)
+    }
   })
 
   const footValues = ['Total:' + reportData.devices.length,
@@ -718,19 +721,21 @@ function exportActivityReportToExcelVehicle (settings, translations, reportData,
     reportData.devices.forEach(d => {
       const group = userData.groups.find(g => d.device.groupId === g.id)
 
-      data = data.concat([{
-        name: d.device.name,
-        group: group ? group.name : '',
-        start: d.summary[0].startTime ? new Date(d.summary[0].startTime).toLocaleString() : '',
-        end: d.summary[0].endTime ? new Date(d.summary[0].endTime).toLocaleString() : '',
-        distance: Number((d.summary[0].distance / 1000).toFixed(0)),
-        startOdometer: Number((d.summary[0].startOdometer / 1000).toFixed(0)),
-        endOdometer: Number((d.summary[0].endOdometer / 1000).toFixed(0)),
-        avgSpeed: Math.round(d.summary[0].averageSpeed * 1.85200),
-        maxSpeed: Math.round(d.summary[0].maxSpeed * 1.85200),
-        engineHours: convertMS(d.summary[0].engineHours),
-        spentFuel: d.summary[0].convertedSpentFuel >= 0 ? d.summary[0].convertedSpentFuel : 0
-      }])
+      if (d.summary) {
+        data = data.concat([{
+          name: d.device.name,
+          group: group ? group.name : '',
+          start: d.summary[0].startTime ? new Date(d.summary[0].startTime).toLocaleString() : '',
+          end: d.summary[0].endTime ? new Date(d.summary[0].endTime).toLocaleString() : '',
+          distance: Number((d.summary[0].distance / 1000).toFixed(0)),
+          startOdometer: Number((d.summary[0].startOdometer / 1000).toFixed(0)),
+          endOdometer: Number((d.summary[0].endOdometer / 1000).toFixed(0)),
+          avgSpeed: Math.round(d.summary[0].averageSpeed * 1.85200),
+          maxSpeed: Math.round(d.summary[0].maxSpeed * 1.85200),
+          engineHours: convertMS(d.summary[0].engineHours),
+          spentFuel: d.summary[0].convertedSpentFuel >= 0 ? d.summary[0].convertedSpentFuel : 0
+        }])
+      }
     })
     console.log(data)
     return {

package/src/partnerReports/afriquia.js

@@ -7,10 +7,6 @@ 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 = []
@@ -126,4 +122,6 @@ async function createActivityReport (from, to, userData, traccarInstance) {
   return reportData
 }
 
+
+
 exports.createActivityReport = createActivityReport