fleetmap-reports 2.0.21 → 2.0.23

package/package.json

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

package/src/kms-report.js

@@ -403,27 +403,46 @@ function getExcelTableColumns (userData, info, translations) {
   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' })
+      if (userData.byDriver) {
+        columns.push(
+          { label: translations.report.vehicle, value: 'name' },
+          { label: translations.report.group, value: 'group' })
+      } 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.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' })
+      if (userData.byDriver) {
+        columns.push({ label: translations.report.total, value: 'total' })
+      } else {
+        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' })
+      if (userData.byDriver) {
+        columns.push(
+          { label: translations.report.vehicle, value: 'name' },
+          { 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 {
+        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) {
     columns.push(
@@ -456,48 +475,46 @@ 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 (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,
-            startOdometer: Number((d.startOdometer / 1000).toFixed(1)),
-            endOdometer: Number((d.endOdometer / 1000).toFixed(1))
-          }
+  if (userData.groupByDay) {
+    const partner = getUserPartner(userData.user)
+    if (d.days) {
+      if (partner.reports.kmsReportDaysInColumns) {
+        const vehicle = {
+          name: userData.byDriver ? d.driver.name : d.device.name,
+          group: group ? group.name : '',
+          licenseplate: userData.byDriver ? '' : d.device.attributes.license_plate,
+          startOdometer: userData.byDriver ? '' : Number((d.startOdometer / 1000).toFixed(1)),
+          endOdometer: userData.byDriver ? '' : Number((d.endOdometer / 1000).toFixed(1))
+        }
 
-          d.days.forEach((day, index) => {
-            vehicle['day' + index] = Number((day.kms / 1000).toFixed(0))
-          })
+        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))
-            }
-          })))
-        }
+        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: userData.byDriver ? d.driver.name : d.device.name,
+            group: group ? group.name : '',
+            licenseplate: userData.byDriver ? '' : 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
 }

package/src/speeding-report.js

@@ -314,7 +314,7 @@ async function getRoadSpeedLimits (devices, routes, threshold, minimumMinutes =
 
 exports.getRoadSpeedLimits = getRoadSpeedLimits
 
-async function invokeValhalla (route, i, chunk, country, threshold, results, retry = 3) {
+async function invokeValhalla (route, i, chunk, country, threshold, results, retry = 10) {
   const slice = route.slice(i, i + chunk)
   const position = slice.find(p => getCountry(p))
   let url
@@ -360,7 +360,7 @@ async function invokeValhalla (route, i, chunk, country, threshold, results, ret
     })
   } catch (e) {
     if (--retry) {
-      console.log(e.message, 'retry:', retry)
+      console.error(e.message, 'retry:', retry)
       return invokeValhalla(route, i, chunk, country, threshold, results, retry)
     } else {
       console.error(e.message, (e.response && e.response.data) || url, 'deviceId',

package/src/tests/index.js

@@ -12,7 +12,9 @@ const axios = require('axios').create({ ...traccarConfig.baseOptions, baseURL: t
 
 const getReports = async (email, password) => {
   try {
-    console.log('email / pass', process.env.email || email, process.env.password || password)
+    email = email || process.env.email
+    password = password || process.env.password
+    console.log('email / pass', email, password)
     const formData = `email=${encodeURIComponent(email)}&password=${encodeURIComponent(password)}`
     const [cookie] = (await axios.post('/session', formData)).headers['set-cookie']
     axios.defaults.headers.common.cookie = cookie

package/src/tests/speeding.test.js

@@ -16,9 +16,10 @@ async function getSpeedingReport (report, userData) {
 // eslint-disable-next-line no-undef
 describe('speeding tests', function () {
   // eslint-disable-next-line no-undef
-  it('works with road speed limits', async () => {
-    const report = await getReports()
+  it('works with road speed limits in Chile', async () => {
+    const report = await getReports(process.env.USER_CHILE, process.env.PASS_CHILE)
     const userData = await report.getUserData()
+    userData.devices = [userData.devices[0]]
     userData.roadSpeedLimits = true
     const { device } = await getSpeedingReport(report, userData)
     assert.equal(device.alerts.length, 6) // Total Alerts