fleetmap-reports 2.0.15 → 2.0.17

package/package.json

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

package/src/kms-report.js

@@ -456,46 +456,48 @@ function getExcelContent (userData, d, translations) {
     ? userData.groups.find(g => g.drivers && g.drivers.includes(d.driver.id))
     : userData.groups.find(g => d.device.groupId === g.id)
 
-  if (userData.groupByDay) {
-    const partner = getUserPartner(userData.user)
-    if (d.days) {
-      if (partner.reports.kmsReportDaysInColumns) {
-        const vehicle = {
-          name: d.device.name,
-          group: group ? group.name : '',
-          licenseplate: d.device.attributes.license_plate,
-          startOdometer: Number((d.startOdometer / 1000).toFixed(1)),
-          endOdometer: Number((d.endOdometer / 1000).toFixed(1))
-        }
-
-        d.days.forEach((day, index) => {
-          vehicle['day' + index] = Number((day.kms / 1000).toFixed(0))
-        })
-
-        vehicle.total = Number(d.days.reduce((a, b) => a + (b.kms / 1000), 0).toFixed(0))
-
-        data.push(vehicle)
-      } else {
-        data.push({})
-        data.push(...(d.days.map(a => {
-          return {
+  if (d.device) {
+    if (userData.groupByDay) {
+      const partner = getUserPartner(userData.user)
+      if (d.days) {
+        if (partner.reports.kmsReportDaysInColumns) {
+          const vehicle = {
             name: d.device.name,
             group: group ? group.name : '',
             licenseplate: d.device.attributes.license_plate,
-            date: new Date(a.date).toLocaleDateString(),
-            weekday: weekDays[new Date(a.date).getDay()],
-            distance: Number((a.kms / 1000).toFixed(0))
+            startOdometer: Number((d.startOdometer / 1000).toFixed(1)),
+            endOdometer: Number((d.endOdometer / 1000).toFixed(1))
           }
-        })))
+
+          d.days.forEach((day, index) => {
+            vehicle['day' + index] = Number((day.kms / 1000).toFixed(0))
+          })
+
+          vehicle.total = Number(d.days.reduce((a, b) => a + (b.kms / 1000), 0).toFixed(0))
+
+          data.push(vehicle)
+        } else {
+          data.push({})
+          data.push(...(d.days.map(a => {
+            return {
+              name: d.device.name,
+              group: group ? group.name : '',
+              licenseplate: d.device.attributes.license_plate,
+              date: new Date(a.date).toLocaleDateString(),
+              weekday: weekDays[new Date(a.date).getDay()],
+              distance: Number((a.kms / 1000).toFixed(0))
+            }
+          })))
+        }
       }
+    } else {
+      data.push({
+        name: userData.byDriver ? d.driver.name : d.device.name,
+        group: group ? group.name : '',
+        licenseplate: userData.byDriver ? '' : d.device.attributes.license_plate,
+        distance: Number((d.summary.distance / 1000).toFixed(0))
+      })
     }
-  } else {
-    data.push({
-      name: userData.byDriver ? d.driver.name : d.device.name,
-      group: group ? group.name : '',
-      licenseplate: userData.byDriver ? '' : d.device.attributes.license_plate,
-      distance: Number((d.summary.distance / 1000).toFixed(0))
-    })
   }
   return data
 }