fleetmap-reports 1.0.657 → 1.0.659

package/package.json

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

package/src/stop-report.js

@@ -2,7 +2,7 @@ const { devicesToProcess, deviceName } = require('./util/device')
 const automaticReports = require('./automaticReports')
 const traccarHelper = require('./util/traccar')
 const { getNearestPOIs, insideGeofence, loadGroupsData } = require('./util/geofence')
-const { getTranslations, convertToLocaleString, convertMS, convertToLocaleDateString, convertToLocaleTimeString } = require('./util/utils')
+const { getTranslations, convertToLocaleString, convertMS } = require('./util/utils')
 const jsPDF = require('jspdf')
 const { headerFromUser, addTable } = require('./util/pdfDocument')
 const { getStyle } = require('./reportStyle')
@@ -33,15 +33,11 @@ async function createStopReportByDevice (from, to, userData, traccar) {
 
   let deviceCount = 0
   for (const slice of sliced) {
-    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, false, false, true, false, deviceCount, devices.length)
-    const stopsData = allInOne.stops
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, false, true, false, deviceCount, devices.length)
+    console.log('Stops:' + allInOne.stops.length)
 
-    console.log('Stops:' + stopsData.length)
-
-    if (stopsData.length > 0) {
-      allData.devices.push(...processDevices(from, to, slice, {
-        stops: stopsData
-      }, userData))
+    if (allInOne.stops.length > 0) {
+      allData.devices.push(...processDevices(from, to, slice, allInOne, userData))
     }
     deviceCount = deviceCount + slice.length
   }
@@ -54,6 +50,7 @@ function processDevices (from, to, devices, data, userData) {
 
   devices.forEach(d => {
     const deviceStops = data.stops.filter(t => t.deviceId === d.id)
+    const route = data.route.filter(t => t.deviceId === d.id)
 
     deviceStops.forEach(stop => {
       const nearestPOIs = getNearestPOIs(stop.longitude, stop.latitude, userData.geofences)
@@ -75,6 +72,10 @@ function processDevices (from, to, devices, data, userData) {
     })
 
     if (deviceStops.length > 0) {
+      if (route.length && !route[0].attributes.ignition) {
+        deviceStops[0].startTime = undefined
+      }
+
       const deviceData = {
         device: d,
         from,
@@ -98,7 +99,6 @@ async function exportStopReportToPDF (userData, reportData) {
   const stopsData = userData.byDriver ? reportData.drivers : reportData.devices
 
   const headers = [
-    translations.report.date,
     translations.report.start,
     translations.report.end,
     translations.report.address,
@@ -131,7 +131,6 @@ async function exportStopReportToPDF (userData, reportData) {
 
       d.stops.forEach(a => {
         data.push([
-          getStopDate(userData.user, a),
           getStopStart(userData.user, a),
           getStopEnd(userData.user, a),
           a.endPOIName || a.address,
@@ -172,7 +171,6 @@ function exportStopReportToExcel (userData, reportData) {
 
   const headers = [
     { label: translations.report.vehicle, value: 'name' },
-    { label: translations.report.date, value: 'date' },
     { label: translations.report.start, value: 'start' },
     { label: translations.report.end, value: 'end' },
     { label: translations.report.address, value: 'address' },
@@ -188,7 +186,6 @@ function exportStopReportToExcel (userData, reportData) {
       data = data.concat(d.stops.map(a => {
         return {
           name: a.deviceName,
-          date: getStopDate(userData.user, a),
           start: getStopStart(userData.user, a),
           end: getStopEnd(userData.user, a),
           address: a.endPOIName || a.address,
@@ -214,16 +211,12 @@ function exportStopReportToExcel (userData, reportData) {
   }
 }
 
-function getStopDate (user, stop) {
-  return convertToLocaleDateString(stop.startTime, user.attributes.lang, user.attributes.timezone)
-}
-
 function getStopStart (user, stop) {
-  return convertToLocaleTimeString(stop.startTime, user.attributes.lang, user.attributes.timezone)
+  return stop.startTime ? convertToLocaleString(stop.startTime, user.attributes.lang, user.attributes.timezone) : ''
 }
 
 function getStopEnd (user, stop) {
-  return convertToLocaleTimeString(stop.endTime, user.attributes.lang, user.attributes.timezone)
+  return stop.endTime ? convertToLocaleString(stop.endTime, user.attributes.lang, user.attributes.timezone) : ''
 }
 
 exports.createStopReport = createStopReport