fleetmap-reports 1.0.440 → 1.0.443

package/package.json

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

package/src/index.test.js

@@ -15,10 +15,12 @@ async function getSpeedingReport (report, userData) {
 
 // eslint-disable-next-line no-undef
 describe('Test_Reports', function () {
+  this.timeout(500000)
   // eslint-disable-next-line no-undef
   it('Speeding by device', async () => {
     const report = await getReports()
     const userData = await report.getUserData()
+    userData.roadSpeedLimit = true
     const { device, totalDistance, totalEventTime } = await getSpeedingReport(report, userData)
     assert.equal(device.alerts.length, 15) // Total Alerts
     assert.equal(totalDistance, 19.59984677533689) // Total Kms

package/src/kms-report.js

@@ -1,442 +1,445 @@
 const messages = require('../lang')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
-const {getStyle} = require("./reportStyle")
-const {headerFromUser,addTable} = require("./util/pdfDocument")
-const {getUserPartner} = require("fleetmap-partners")
-const traccar = require("./util/traccar")
-const {getDates, convertFromUTC} = require("./util/utils")
-const trips = require("./util/trips")
-const drivers = require("./util/driver")
-const { isInsideTimetable, isPartialInsideTimetable, calculateTrip} = require("./util/trips")
-const traccarHelper = require("./util/traccar");
-const {devicesToProcess} = require("./util/device");
+const { getStyle } = require('./reportStyle')
+const { headerFromUser, addTable } = require('./util/pdfDocument')
+const { getUserPartner } = require('fleetmap-partners')
+const traccar = require('./util/traccar')
+const { getDates, convertFromUTC } = require('./util/utils')
+const trips = require('./util/trips')
+const drivers = require('./util/driver')
+const { isInsideTimetable, isPartialInsideTimetable, calculateTrip } = require('./util/trips')
+const traccarHelper = require('./util/traccar')
+const { devicesToProcess } = require('./util/device')
 
 const fileName = 'KmsReport'
 
-async function createKmsReport(from, to, userData, traccarInstance) {
-    console.log('Create KmsReport')
-
-    console.log(from, to)
-    const reportData = []
-    if(userData.byDriver){
-        console.log("ByDriver")
-        const allData = await createKmsReportByDriver(from, to, userData, traccarInstance)
-        reportData.push(allData)
-    }
-    else if(userData.byGroup){
-        console.log("ByGroup")
-        const allData = await createKmsReportByGroup(from, to, userData, traccarInstance)
-        reportData.push(...allData)
-    } else {
-        console.log("ByDevice")
-        const allData = await createKmsReportByDevice(from, to, userData, traccarInstance)
-        reportData.push(allData)
-    }
-
-    return reportData
+async function createKmsReport (from, to, userData, traccarInstance) {
+  console.log('Create KmsReport')
+
+  console.log(from, to)
+  const reportData = []
+  if (userData.byDriver) {
+    console.log('ByDriver')
+    const allData = await createKmsReportByDriver(from, to, userData, traccarInstance)
+    reportData.push(allData)
+  } else if (userData.byGroup) {
+    console.log('ByGroup')
+    const allData = await createKmsReportByGroup(from, to, userData, traccarInstance)
+    reportData.push(...allData)
+  } else {
+    console.log('ByDevice')
+    const allData = await createKmsReportByDevice(from, to, userData, traccarInstance)
+    reportData.push(allData)
+  }
+
+  return reportData
 }
 
-async function createKmsReportByDevice(from, to, userData, traccarInstance) {
-    const devices = devicesToProcess(userData)
+async function createKmsReportByDevice (from, to, userData, traccarInstance) {
+  const devices = devicesToProcess(userData)
 
-    const allData = {
-        devices: [],
-        from: from,
-        to: to
-    }
+  const allData = {
+    devices: [],
+    from,
+    to
+  }
 
-    const allInOne =  await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, true, false, false)
-    const tripsData = allInOne.trips
-    const routeData = allInOne.route
+  const allInOne = await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, true, false, false)
+  const tripsData = allInOne.trips
+  const routeData = allInOne.route
 
-    console.log('trips:' + tripsData.length)
+  console.log('trips:' + tripsData.length)
 
-    if (tripsData.length > 0) {
-        trips.checkTripsKms(traccarInstance, from, to, devices, {trips: tripsData, route: routeData})
-        allData.devices = processDevices(from, to, devices, {trips: tripsData, route: routeData}, userData)
-    }
+  if (tripsData.length > 0) {
+    trips.checkTripsKms(traccarInstance, from, to, devices, { trips: tripsData, route: routeData })
+    allData.devices = processDevices(from, to, devices, { trips: tripsData, route: routeData }, userData)
+  }
 
-    return allData
+  return allData
 }
 
-async function createKmsReportByDriver(from, to, userData, traccarInstance) {
-    const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
-    console.log(devices.length)
-
-    if(!devices.length) {
-        //empty report
-        return { drivers: [] }
-    }
+async function createKmsReportByDriver (from, to, userData, traccarInstance) {
+  const devices = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
+  console.log(devices.length)
 
-    const allInOne =  await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, true, false, false)
-    const tripsData = allInOne.trips
-    const routeData = allInOne.route
+  if (!devices.length) {
+    // empty report
+    return { drivers: [] }
+  }
 
+  const allInOne = await traccarHelper.getAllInOne(traccarInstance, from, to, devices, true, true, false, false)
+  const tripsData = allInOne.trips
+  const routeData = allInOne.route
 
-    return { drivers: processDrivers(from, to, userData, {trips: tripsData, route: routeData}) }
+  return { drivers: processDrivers(from, to, userData, { trips: tripsData, route: routeData }) }
 }
 
-async function createKmsReportByGroup(from, to, userData, traccarInstance) {
-    const reportData = []
-    for (const g of userData.groups) {
-        const devices = userData.devices.filter(d => d.groupId === g.id)
-        console.log(g.name + ' devices:' + devices.length)
-        if(devices.length > 0) {
-            const groupData = {
-                devices: [],
-                group: g,
-                xpert: devices.filter(d => d.attributes.xpert).length > 0
-            }
+async function createKmsReportByGroup (from, to, userData, traccarInstance) {
+  const reportData = []
+  for (const g of userData.groups) {
+    const devices = userData.devices.filter(d => d.groupId === g.id)
+    console.log(g.name + ' devices:' + devices.length)
+    if (devices.length > 0) {
+      const groupData = {
+        devices: [],
+        group: g,
+        xpert: devices.filter(d => d.attributes.xpert).length > 0
+      }
 
-            const route = userData.allWeek ? [] : await traccar.getRoute(traccarInstance, from, to, devices)
-            const tripsData = await traccar.getTrips(traccarInstance, from, to, devices)
+      const route = userData.allWeek ? [] : await traccar.getRoute(traccarInstance, from, to, devices)
+      const tripsData = await traccar.getTrips(traccarInstance, from, to, devices)
 
-            devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
+      devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
-            console.log('trips:' + tripsData.length)
+      console.log('trips:' + tripsData.length)
 
-            if (tripsData.length > 0) {
-                trips.checkTripsKms(traccarInstance, from, to, devices, {trips: tripsData, route: route})
-                groupData.devices = processDevices(from, to, devices, {trips: tripsData, route: route}, userData)
-            }
+      if (tripsData.length > 0) {
+        trips.checkTripsKms(traccarInstance, from, to, devices, { trips: tripsData, route })
+        groupData.devices = processDevices(from, to, devices, { trips: tripsData, route }, userData)
+      }
 
-            reportData.push(groupData)
-        }
+      reportData.push(groupData)
     }
+  }
 
-    const withoutGroupData = await createKmsReportByDevice(from, to, userData, traccarInstance)
-    reportData.push(withoutGroupData)
+  const withoutGroupData = await createKmsReportByDevice(from, to, userData, traccarInstance)
+  reportData.push(withoutGroupData)
 
-    return reportData
+  return reportData
 }
 
-function processDrivers(from, to, userData, data) {
-    console.log(data)
-    const driversResult = []
-    userData.drivers.forEach(d => {
-        const route = data.route.filter(p => p.attributes.driverUniqueId === d.uniqueId)
-        const trips = data.trips.filter(t => t.driverUniqueId === d.uniqueId
-            && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
-
-        if (trips.length > 0) {
-            const driverData = {
-                driver: d
-            }
-            if(userData.groupByDay) {
-                driverData.days = []
-                const dates = getDates(from, to)
-                for(const date of dates){
-                    const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
-                    const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
-
-                    const tripsByDay = trips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay))
-
-                    driverData.days.push({
-                        date: date,
-                        kms: tripsByDay.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
-                    })
-                }
-            } else {
-                driverData.summary = {
-                    distance: trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
-                }
-            }
-            driversResult.push(driverData)
+function processDrivers (from, to, userData, data) {
+  console.log(data)
+  const driversResult = []
+  userData.drivers.forEach(d => {
+    const route = data.route.filter(p => p.attributes.driverUniqueId === d.uniqueId)
+    const trips = data.trips.filter(t => t.driverUniqueId === d.uniqueId &&
+            (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
+
+    if (trips.length > 0) {
+      const driverData = {
+        driver: d
+      }
+      if (userData.groupByDay) {
+        driverData.days = []
+        const dates = getDates(from, to)
+        for (const date of dates) {
+          const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
+          const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
+
+          const tripsByDay = trips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay))
+
+          driverData.days.push({
+            date,
+            kms: tripsByDay.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
+          })
         }
-    })
+      } else {
+        driverData.summary = {
+          distance: trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
+        }
+      }
+      driversResult.push(driverData)
+    }
+  })
 
-    return driversResult
+  return driversResult
 }
 
-function processDevices(from, to, devices, data, userData) {
-    const devicesResult = []
+function processDevices (from, to, devices, data, userData) {
+  const devicesResult = []
 
-    for (const d of devices) {
-        const deviceRoute = data.route.filter(t => t.deviceId === d.id)
-        const deviceTrips = data.trips.filter(t => t.deviceId === d.id)
+  for (const d of devices) {
+    const deviceRoute = data.route.filter(t => t.deviceId === d.id)
+    const deviceTrips = data.trips.filter(t => t.deviceId === d.id)
 
-        let uncompletedTripRoute = []
-        if(deviceRoute.length && deviceTrips.length && deviceRoute[deviceRoute.length-1].attributes.ignition) {
-            uncompletedTripRoute = deviceRoute.filter(p => p.attributes.ignition && new Date(p.fixTime).getTime() > new Date(deviceTrips[deviceTrips.length-1].endTime).getTime())
-            if(uncompletedTripRoute.length) {
-                deviceTrips.push(calculateTrip(d, uncompletedTripRoute))
-            }
-        }
+    let uncompletedTripRoute = []
+    if (deviceRoute.length && deviceTrips.length && deviceRoute[deviceRoute.length - 1].attributes.ignition) {
+      uncompletedTripRoute = deviceRoute.filter(p => p.attributes.ignition && new Date(p.fixTime).getTime() > new Date(deviceTrips[deviceTrips.length - 1].endTime).getTime())
+      if (uncompletedTripRoute.length) {
+        deviceTrips.push(calculateTrip(d, uncompletedTripRoute))
+      }
+    }
 
-        const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
-
-        if (trips.length > 0) {
-            if(userData.groupByDay) {
-                trips.forEach(t => t.tripDay = convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' 12:00 PM')
-                const groupedTrips = trips.reduce(
-                    (entryMap, e) => entryMap.set(e.tripDay, [...entryMap.get(e.tripDay)||[], e]),
-                    new Map()
-                )
-
-                const allDates = getDates(from, to)
-
-                const days = []
-                let keys = Array.from(groupedTrips.keys())
-                allDates.forEach(d => {
-                    const day = d.toISOString().split('T')[0] + ' 12:00 PM'
-                    if(!keys.includes(day)){
-                        groupedTrips.set(day, [])
-                    }
-                })
-
-                keys = Array.from(groupedTrips.keys())
-                keys.sort((a,b)=>new Date(a).getTime()-new Date(b).getTime());
-                keys.forEach(key => {
-                    const currentDate = new Date(key)
-                    const dayTrips = groupedTrips.get(key)
-                    const day = {
-                        date: currentDate,
-                        kms: 0
-                    }
-
-                    day.kms = dayTrips.reduce((a, b) => a + b.distance, 0)
-
-                    days.push(day)
-                })
-                devicesResult.push({
-                    device: d,
-                    days: days
-                })
-            } else {
-                devicesResult.push({
-                    device: d,
-                    summary: {
-                        distance: trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0),
-                    }
-                })
-            }
-        }
+    const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
+
+    if (trips.length > 0) {
+      if (userData.groupByDay) {
+        trips.forEach(t => {
+          t.tripDay = convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' 12:00 PM'
+        })
+        const groupedTrips = trips.reduce(
+          (entryMap, e) => entryMap.set(e.tripDay, [...entryMap.get(e.tripDay) || [], e]),
+          new Map()
+        )
+
+        const allDates = getDates(from, to)
+
+        const days = []
+        let keys = Array.from(groupedTrips.keys())
+        allDates.forEach(d => {
+          const day = d.toISOString().split('T')[0] + ' 12:00 PM'
+          if (!keys.includes(day)) {
+            groupedTrips.set(day, [])
+          }
+        })
+
+        keys = Array.from(groupedTrips.keys())
+        keys.sort((a, b) => new Date(a).getTime() - new Date(b).getTime())
+        keys.forEach(key => {
+          const currentDate = new Date(key)
+          const dayTrips = groupedTrips.get(key)
+          const day = {
+            date: currentDate,
+            kms: 0
+          }
+
+          day.kms = dayTrips.reduce((a, b) => a + b.distance, 0)
+
+          days.push(day)
+        })
+        devicesResult.push({
+          device: d,
+          days
+        })
+      } else {
+        devicesResult.push({
+          device: d,
+          summary: {
+            distance: trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
+          }
+        })
+      }
     }
+  }
 
-    return devicesResult
+  return devicesResult
 }
 
-async function exportKmsReportToPDF(userData, reportData) {
-    const lang = userData.user.attributes.lang || (navigator && navigator.language)
-    const translations = messages[lang] ? messages[lang] : messages['en-GB']
-    const kmsData = userData.byDriver ? reportData.drivers : reportData.devices
-
-    const weekDays = [
-        translations.report.sunday,
-        translations.report.monday,
-        translations.report.tuesday,
-        translations.report.wednesday,
-        translations.report.thursday,
-        translations.report.friday,
-        translations.report.saturday
-    ]
-
-    const headers = []
-    if(userData.groupByDay) {
-        headers.push(translations.report.date,
-            translations.report.distance)
-    }
-    else if(userData.byDriver) {
-        headers.push(translations.report.driver,
-            translations.report.group,
-            translations.report.distance)
-    } else {
-        headers.push(translations.report.name,
-            translations.settings.vehicle_model,
-            translations.report.group,
-            translations.report.distance)
-    }
-    if (kmsData) {
-        const orientation = userData.groupByDay ? 'p' : 'l'
-        const doc = new jsPDF.jsPDF(orientation)
-        await headerFromUser(doc, translations.report.titleKmsReport, userData.user, orientation)
-
-        if (userData.groupByDay) {
-            kmsData.forEach(function (d, index) {
-                const name = userData.byDriver ? d.driver.name : d.device.name
-                const group = userData.byDriver ? userData.groups.find(g => g.drivers.includes(d.id)) : userData.groups.find(g => d.device.groupId === g.id)
-
-                let space = index === 0 ? 8 : 0
-                if(index){
-                    doc.addPage()
-                }
-
-                doc.setFontSize(13)
-                doc.text(name, 20, space + 20)
-                doc.setFontSize(11)
-                doc.text(group ? translations.report.group + ': ' + group.name : '', 150, space + 20)
-                doc.text(new Date(reportData.from).toLocaleString() + ' - ' + new Date(reportData.to).toLocaleString(), 20, space + 25)
-
-                if(!userData.allWeek && userData.weekDays) {
-                    doc.text((userData.weekDays.monday ? ' ' + translations.report.monday + ',' : '')
-                        + (userData.weekDays.tuesday ? ' ' + translations.report.tuesday + ',' : '')
-                        + (userData.weekDays.wednesday ? ' ' + translations.report.wednesday + ',' : '')
-                        + (userData.weekDays.thursday ? ' ' + translations.report.thursday + ',' : '')
-                        + (userData.weekDays.friday ? ' ' + translations.report.friday + ',' : '')
-                        + (userData.weekDays.saturday ? ' ' + translations.report.saturday + ',' : '')
-                        + (userData.weekDays.sunday ? ' ' + translations.report.sunday + ',' : '')
-                        + ' das '
-                        + userData.dayHours.startTime + ' - ' + userData.dayHours.endTime, 20, space + 30)
-                }
-
-                const data = []
-                d.days.forEach(day => {
-                    const temp = [
-                        new Date(day.date).toLocaleDateString() + ' - ' + weekDays[day.date.getDay()],
-                        (day.kms/1000).toFixed(0)
-                    ]
-
-                    data.push(temp)
-                })
-
-                const footValues = []
-                footValues.push(
-                    '',
-                    (d.days.reduce((a, b) => a + b.kms, 0)/1000).toFixed(0)
-                )
-
-                const style = getStyle(getUserPartner(userData.user))
-                addTable(doc, headers, data, footValues, style, 40)
-            })
-        } else {
-            const data = []
-            if (userData.byDriver) {
-                reportData.drivers.forEach(d => {
-                    const group = userData.groups.find(g => g.drivers.includes(d.driver.id))
-
-                    const temp = [
-                        d.driver.name,
-                        group ? group.name : '',
-                        Number((d.summary.distance / 1000).toFixed(0)),
-                    ]
-                    data.push(temp)
-                })
-            } else {
-                reportData.devices.forEach(d => {
-                    const group = userData.groups.find(g => d.device.groupId === g.id)
-
-                    const temp = [
-                        d.device.name,
-                        d.device.model,
-                        group ? group.name : '',
-                        Number((d.summary.distance / 1000).toFixed(0))
-                    ]
-                    data.push(temp)
-                })
-            }
-
-            const footValues = []
-            if(userData.byDriver) {
-                footValues.push(
-                    'Total:' + reportData.drivers.length,
-                    '',
-                    (reportData.drivers.reduce((a, b) => a + b.summary.distance, 0)/1000).toFixed(0)
-                )
-            } else {
-                footValues.push(
-                    'Total:' + reportData.devices.length,
-                    '',
-                    '',
-                    (reportData.devices.reduce((a, b) => a + b.summary.distance, 0)/1000).toFixed(0),
-                )
-            }
-
-            const style = getStyle(getUserPartner(userData.user))
-
-            addTable(doc, headers, data, footValues, style, 35)
+async function exportKmsReportToPDF (userData, reportData) {
+  const lang = userData.user.attributes.lang || (navigator && navigator.language)
+  const translations = messages[lang] ? messages[lang] : messages['en-GB']
+  const kmsData = userData.byDriver ? reportData.drivers : reportData.devices
+
+  const weekDays = [
+    translations.report.sunday,
+    translations.report.monday,
+    translations.report.tuesday,
+    translations.report.wednesday,
+    translations.report.thursday,
+    translations.report.friday,
+    translations.report.saturday
+  ]
+
+  const headers = []
+  if (userData.groupByDay) {
+    headers.push(translations.report.date,
+      translations.report.distance)
+  } else if (userData.byDriver) {
+    headers.push(translations.report.driver,
+      translations.report.group,
+      translations.report.distance)
+  } else {
+    headers.push(translations.report.name,
+      translations.settings.vehicle_model,
+      translations.report.group,
+      translations.report.distance)
+  }
+  if (kmsData) {
+    const orientation = userData.groupByDay ? 'p' : 'l'
+    const doc = new jsPDF.jsPDF(orientation)
+    await headerFromUser(doc, translations.report.titleKmsReport, userData.user, orientation)
+
+    if (userData.groupByDay) {
+      kmsData.forEach(function (d, index) {
+        const name = userData.byDriver ? d.driver.name : d.device.name
+        const group = userData.byDriver ? userData.groups.find(g => g.drivers.includes(d.id)) : userData.groups.find(g => d.device.groupId === g.id)
+
+        const space = index === 0 ? 8 : 0
+        if (index) {
+          doc.addPage()
         }
-        return doc
-    }
-}
 
-function exportKmsReportToExcel(userData, reportData) {
-    console.log('Export to Excel')
-
-    const lang = userData.user.attributes.lang || (navigator && navigator.language)
-    const translations = messages[lang] ? messages[lang] : messages['en-GB']
-
-    const weekDays = [
-        translations.report.sunday,
-        translations.report.monday,
-        translations.report.tuesday,
-        translations.report.wednesday,
-        translations.report.thursday,
-        translations.report.friday,
-        translations.report.saturday
-    ]
-
-    const settings = {
-        sheetName: translations.report.titleKmsReport, // The name of the sheet
-        fileName: fileName // The name of the spreadsheet
-    }
+        doc.setFontSize(13)
+        doc.text(name, 20, space + 20)
+        doc.setFontSize(11)
+        doc.text(group ? translations.report.group + ': ' + group.name : '', 150, space + 20)
+        doc.text(new Date(reportData.from).toLocaleString() + ' - ' + new Date(reportData.to).toLocaleString(), 20, space + 25)
+
+        if (!userData.allWeek && userData.weekDays) {
+          doc.text((userData.weekDays.monday ? ' ' + translations.report.monday + ',' : '') +
+                        (userData.weekDays.tuesday ? ' ' + translations.report.tuesday + ',' : '') +
+                        (userData.weekDays.wednesday ? ' ' + translations.report.wednesday + ',' : '') +
+                        (userData.weekDays.thursday ? ' ' + translations.report.thursday + ',' : '') +
+                        (userData.weekDays.friday ? ' ' + translations.report.friday + ',' : '') +
+                        (userData.weekDays.saturday ? ' ' + translations.report.saturday + ',' : '') +
+                        (userData.weekDays.sunday ? ' ' + translations.report.sunday + ',' : '') +
+                        ' das ' +
+                        userData.dayHours.startTime + ' - ' + userData.dayHours.endTime, 20, space + 30)
+        }
 
-    const headers = []
-
-    if(userData.groupByDay) {
-        headers.push(
-            {label: translations.report.vehicle, value: 'name'},
-            {label: translations.report.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(
-            {label: translations.report.driver, value: 'name'},
-            {label: translations.report.group, value: 'group'},
-            {label: translations.report.distance, value: 'distance'})
-    } else {
-        headers.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'})
-    }
+        const data = []
+        d.days.forEach(day => {
+          const temp = [
+            new Date(day.date).toLocaleDateString() + ' - ' + weekDays[day.date.getDay()],
+            (day.kms / 1000).toFixed(0)
+          ]
 
-    let data = []
-    const info = userData.byDriver ? reportData.drivers : reportData.devices
-    info.forEach(d => {
-        const group = userData.byDriver ? userData.groups.find(g => g.drivers.includes(d.driver.id)) :
-            userData.groups.find(g => d.device.groupId === g.id)
-
-        if (userData.groupByDay) {
-            data = data.concat([{}])
-            data = data.concat(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))
-            }])
-        }
-    })
+          data.push(temp)
+        })
 
-    // add total
-    if (data.length) {
-        data = data.concat({
-            name: '',
-            group: '',
-            licenseplate: 'Total',
-            distance: data.reduce((prev, curr) => curr.distance ? {distance: (prev.distance || 0) + curr.distance} : prev).distance
+        const footValues = []
+        footValues.push(
+          '',
+          (d.days.reduce((a, b) => a + b.kms, 0) / 1000).toFixed(0)
+        )
+
+        const style = getStyle(getUserPartner(userData.user))
+        addTable(doc, headers, data, footValues, style, 40)
+      })
+    } else {
+      doc.setFontSize(11)
+      doc.text(new Date(reportData.from).toLocaleString() + ' - ' + new Date(reportData.to).toLocaleString(), 20, 33)
+
+      const data = []
+      if (userData.byDriver) {
+        reportData.drivers.forEach(d => {
+          const group = userData.groups.find(g => g.drivers.includes(d.driver.id))
+
+          const temp = [
+            d.driver.name,
+            group ? group.name : '',
+            Number((d.summary.distance / 1000).toFixed(0))
+          ]
+          data.push(temp)
+        })
+      } else {
+        reportData.devices.forEach(d => {
+          const group = userData.groups.find(g => d.device.groupId === g.id)
+
+          const temp = [
+            d.device.name,
+            d.device.model,
+            group ? group.name : '',
+            Number((d.summary.distance / 1000).toFixed(0))
+          ]
+          data.push(temp)
         })
+      }
+
+      const footValues = []
+      if (userData.byDriver) {
+        footValues.push(
+          'Total:' + reportData.drivers.length,
+          '',
+          (reportData.drivers.reduce((a, b) => a + b.summary.distance, 0) / 1000).toFixed(0)
+        )
+      } else {
+        footValues.push(
+          'Total:' + reportData.devices.length,
+          '',
+          '',
+          (reportData.devices.reduce((a, b) => a + b.summary.distance, 0) / 1000).toFixed(0)
+        )
+      }
+
+      const style = getStyle(getUserPartner(userData.user))
+
+      addTable(doc, headers, data, footValues, style, 35)
     }
+    return doc
+  }
+}
 
-    return {
-        headers,
-        data,
-        settings
+function exportKmsReportToExcel (userData, reportData) {
+  console.log('Export to Excel')
+
+  const lang = userData.user.attributes.lang || (navigator && navigator.language)
+  const translations = messages[lang] ? messages[lang] : messages['en-GB']
+
+  const weekDays = [
+    translations.report.sunday,
+    translations.report.monday,
+    translations.report.tuesday,
+    translations.report.wednesday,
+    translations.report.thursday,
+    translations.report.friday,
+    translations.report.saturday
+  ]
+
+  const settings = {
+    sheetName: translations.report.titleKmsReport, // The name of the sheet
+    fileName // The name of the spreadsheet
+  }
+
+  const headers = []
+
+  if (userData.groupByDay) {
+    headers.push(
+      { label: translations.report.vehicle, value: 'name' },
+      { label: translations.report.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(
+      { label: translations.report.driver, value: 'name' },
+      { label: translations.report.group, value: 'group' },
+      { label: translations.report.distance, value: 'distance' })
+  } else {
+    headers.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' })
+  }
+
+  let data = []
+  const info = userData.byDriver ? reportData.drivers : reportData.devices
+  info.forEach(d => {
+    const group = userData.byDriver
+      ? userData.groups.find(g => g.drivers.includes(d.driver.id))
+      : userData.groups.find(g => d.device.groupId === g.id)
+
+    if (userData.groupByDay) {
+      data = data.concat([{}])
+      data = data.concat(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) {
+    data = data.concat({
+      name: '',
+      group: '',
+      licenseplate: 'Total',
+      distance: data.reduce((prev, curr) => curr.distance ? { distance: (prev.distance || 0) + curr.distance } : prev).distance
+    })
+  }
+
+  return {
+    headers,
+    data,
+    settings
+  }
 }
 
 exports.createKmsReport = createKmsReport

package/src/speeding-report.js

@@ -76,7 +76,7 @@ async function createSpeedingReportByDevice (from, to, userData, traccarInstance
     xpert: devices.filter(d => d && d.attributes && d.attributes.xpert).length > 0
   }
 
-  const sliced = automaticReports.sliceArray(devices, 20)
+  const sliced = automaticReports.sliceArray(devices, 10)
 
   let deviceCount = 0
   for (const slice of sliced) {

package/src/trip-report.js

@@ -276,7 +276,7 @@ async function exportTripReportToPDF (userData, reportData) {
     tripsData.forEach(function (d, index) {
       const data = []
       const name = userData.byDriver ? d.driver.name : deviceName(d.device)
-      const group = userData.byDriver ? userData.groups.find(g => g.drivers.includes(d.id)) : userData.groups.find(g => d.device.groupId === g.id)
+      const group = userData.byDriver ? userData.groups.find(g => g.drivers && g.drivers.includes(d.id)) : userData.groups.find(g => d.device.groupId === g.id)
 
       const space = index === 0 ? 8 : 0
       if (index) {

package/src/util/odoo.js

@@ -1,14 +1,16 @@
 
-async function getOdooFuelServices(traccar, from, to) {
-    const url = `/odoo/reports/refuelingServices?startDate=${from.toDateString()}&endDate=${to.toDateString()}`
+async function getOdooFuelServices (traccar, from, to) {
+  const url = `/odoo/reports/refuelingServices?startDate=${from.toDateString()}&endDate=${to.toDateString()}`
 
-    const {data} = await traccar.axios.get(url,{
-        jar: traccar.cookieJar,
-        withCredentials: true })
+  console.log('LOADING_MESSAGE:' + url)
+  const { data } = await traccar.axios.get(url, {
+    jar: traccar.cookieJar,
+    withCredentials: true
+  })
 
-    console.log(data)
+  console.log(data)
 
-    return data
+  return data
 }
 
 exports.getOdooFuelServices = getOdooFuelServices