fleetmap-reports 1.0.928 → 1.0.930

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.928",
+  "version": "1.0.930",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -19,7 +19,7 @@
     "country-reverse-geocoding": "^0.2.2",
     "docx": "^7.3.0",
     "file-saver": "^2.0.5",
-    "fleetmap-partners": "^1.0.126",
+    "fleetmap-partners": "^1.0.144",
     "json-as-xlsx": "^1.2.1",
     "jspdf": "^2.5.1",
     "jspdf-autotable": "3.6.0",

package/src/kms-report.js

@@ -329,45 +329,93 @@ function exportKmsReportToExcel (userData, reportData) {
     fileName // The name of the spreadsheet
   }
 
-  const headers = []
   const info = userData.byDriver ? reportData.drivers : reportData.devices
+  const columns = getExcelTableColumns(userData, info, translations)
 
-  if (userData.groupByDay) {
-    headers.push(
-      { label: translations.report.vehicle, value: 'name' },
-      { label: translations.settings.vehicle_licenseplate, value: 'licenseplate' },
-      { label: translations.report.group, value: 'group' },
-      { label: translations.report.startOdometer, value: 'startOdometer' })
+  const data = []
+  info.forEach(d => {
+    data.push(...getExcelContent(userData, d, translations))
+  })
 
-    const days = info[0].days
-    days.forEach((day, index) => {
-      headers.push({ label: new Date(day.date).toLocaleDateString(), value: 'day' + index })
+  // add total
+  if (data.length) {
+    data.push({
+      name: '',
+      group: '',
+      licenseplate: 'Total',
+      distance: data.reduce((prev, curr) => curr.distance ? { distance: (prev.distance || 0) + curr.distance } : prev).distance
     })
+  }
 
-    headers.push({ label: translations.report.total, value: 'total' },
-      { label: translations.report.endOdometer, value: 'endOdometer' })
+  return {
+    headers: columns,
+    data,
+    settings
+  }
+}
+
+function getExcelTableColumns (userData, info, translations) {
+  const columns = []
+  if (userData.groupByDay) {
+    const partner = getUserPartner(userData.user)
+    if (partner.reports.kmsReportDaysInColumns) {
+      columns.push(
+        { label: translations.report.vehicle, value: 'name' },
+        { label: translations.settings.vehicle_licenseplate, value: 'licenseplate' },
+        { label: translations.report.group, value: 'group' },
+        { label: translations.report.startOdometer, value: 'startOdometer' })
+
+      const days = info[0].days
+      days.forEach((day, index) => {
+        columns.push({ label: new Date(day.date).toLocaleDateString(), value: 'day' + index })
+      })
+
+      columns.push({ label: translations.report.total, value: 'total' },
+        { label: translations.report.endOdometer, value: 'endOdometer' })
+    } else {
+      columns.push(
+        { label: translations.report.vehicle, value: 'name' },
+        { label: translations.settings.vehicle_licenseplate, value: 'licenseplate' },
+        { label: translations.report.group, value: 'group' },
+        { label: translations.report.date, value: 'date' },
+        { label: translations.report.weekDay, value: 'weekday' },
+        { label: translations.report.distance, value: 'distance' })
+    }
   } else if (userData.byDriver) {
-    headers.push(
+    columns.push(
       { label: translations.report.driver, value: 'name' },
       { label: translations.report.group, value: 'group' },
       { label: translations.report.distance, value: 'distance' })
   } else {
-    headers.push(
+    columns.push(
       { label: translations.report.vehicle, value: 'name' },
       { label: translations.settings.vehicle_licenseplate, value: 'licenseplate' },
       { label: translations.report.group, value: 'group' },
       { label: translations.report.distance, value: 'distance' })
   }
+  return columns
+}
 
-  let data = []
+function getExcelContent (userData, d, translations) {
+  const weekDays = [
+    translations.report.sunday,
+    translations.report.monday,
+    translations.report.tuesday,
+    translations.report.wednesday,
+    translations.report.thursday,
+    translations.report.friday,
+    translations.report.saturday
+  ]
 
-  info.forEach(d => {
-    const group = userData.byDriver
-      ? userData.groups.find(g => g.drivers && g.drivers.includes(d.driver.id))
-      : userData.groups.find(g => d.device.groupId === g.id)
+  const data = []
+  const group = userData.byDriver
+    ? userData.groups.find(g => g.drivers && g.drivers.includes(d.driver.id))
+    : userData.groups.find(g => d.device.groupId === g.id)
 
-    if (userData.groupByDay) {
-      if (d.days) {
+  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 : '',
@@ -382,33 +430,30 @@ function exportKmsReportToExcel (userData, reportData) {
 
         vehicle.total = Number(d.days.reduce((a, b) => a + (b.kms / 1000), 0).toFixed(0))
 
-        data = data.concat([vehicle])
+        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: a.date,
+            weekday: weekDays[a.date.getDay()],
+            distance: Number((a.kms / 1000).toFixed(0))
+          }
+        })))
       }
-    } else {
-      data = data.concat([{
-        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))
-      }])
     }
-  })
-
-  // add total
-  if (data.length && !userData.groupByDay) {
-    data = data.concat({
-      name: '',
-      group: '',
-      licenseplate: 'Total',
-      distance: data.reduce((prev, curr) => curr.distance ? { distance: (prev.distance || 0) + curr.distance } : prev).distance
+  } 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 {
-    headers,
-    data,
-    settings
-  }
+  return data
 }
 
 exports.createKmsReport = createKmsReport

package/src/zone-report.js

@@ -262,7 +262,7 @@ function getAnyNextIn (outDate, alerts, deviceRoute) {
     .filter(a => a.type === 'geofenceEnter')
     .find(a => new Date(a.position.fixTime).getTime() > outDate)
 
-  if (!alerts.filter(a => a.type === 'geofenceExit' &&
+  if (next && !alerts.filter(a => a.type === 'geofenceExit' &&
       new Date(a.position.fixTime).getTime() > outDate &&
       new Date(a.position.fixTime).getTime() < new Date(next.position.fixTime).getTime()).length) {
     return (next && next.position && new Date(next.position.fixTime).getTime()) ||