fleetmap-reports 1.0.470 → 1.0.471

package/package.json

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

package/src/machines-report.js

@@ -38,8 +38,6 @@ async function createMachinesReportByDevice (from, to, userData, traccar) {
     const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, false, false, false, deviceCount, devices.length)
     const routeData = allInOne.route
 
-    console.log('Route:' + routeData.length)
-
     if (routeData.length > 0) {
       allData.devices.push(...processDevices(from, to, slice, {
         route: routeData
@@ -63,41 +61,26 @@ function processDevices (from, to, devices, data, userData) {
       const convertFrom = new Date(convertFromUTC(from, userData.user.attributes.timezone))
       const convertTo = new Date(convertFromUTC(to, userData.user.attributes.timezone))
 
-      const dates = getDates(convertFrom, convertTo)
-
-      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 routeByDay = deviceRoute.filter(p => (new Date(p.fixTime) > fromByDay && new Date(p.fixTime) < toByDay) && p.valid && p.attributes.hours !== undefined)
-
-        routeByDay.sort((a, b) => new Date(a.fixTime).getTime() - new Date(b.fixTime).getTime())
-
-        let firstOn
-        let lastOff
-
-        routeByDay.forEach(p => {
-          if (p.attributes.ignition || (firstOn && !p.attributes.ignition && lastOff.attributes.ignition)) {
-            lastOff = p
-          }
-
-          if (p.attributes.ignition && !firstOn) {
-            firstOn = p
-          }
-        })
-
-        const dayData = {
-          date,
-          deviceId: d.id,
-          engineHours: firstOn ? routeByDay[routeByDay.length - 1].attributes.hours - routeByDay[0].attributes.hours : 0,
-          totalHours: routeByDay.length ? routeByDay[routeByDay.length - 1].attributes.hours : undefined,
-          startTime: firstOn ? firstOn.fixTime : undefined,
-          endTime: lastOff ? lastOff.fixTime : undefined
+      if (userData.withDetails) {
+        const ignitions = calculateIgnitions(deviceRoute)
+        for (const ignition of ignitions) {
+          const dayData = getSummaryData(new Date(ignition.on.fixTime), d, ignition.route, ignition.on, ignition.off)
+          summary.push(dayData)
+        }
+      } else {
+        const dates = getDates(convertFrom, convertTo)
+        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 routeByDay = deviceRoute.filter(p => (new Date(p.fixTime) > fromByDay && new Date(p.fixTime) < toByDay) && p.valid && p.attributes.hours !== undefined)
+          routeByDay.sort((a, b) => new Date(a.fixTime).getTime() - new Date(b.fixTime).getTime())
+
+          const ignitions = calculateIgnitions(routeByDay)
+          const dayData = getSummaryData(date, d, routeByDay, ignitions.length ? ignitions[0].on : undefined, ignitions.length ? ignitions[ignitions.length - 1].off : undefined)
+          summary.push(dayData)
         }
-
-        summary.push(dayData)
       }
-
       if (summary.length) {
         const deviceData = {
           device: d,
@@ -111,6 +94,50 @@ function processDevices (from, to, devices, data, userData) {
   return devicesResult
 }
 
+function getSummaryData (date, device, route, start, end) {
+  return {
+    date,
+    deviceId: device.id,
+    engineHours: start ? route[route.length - 1].attributes.hours - route[0].attributes.hours : undefined,
+    totalHours: route.length ? route[route.length - 1].attributes.hours : undefined,
+    startTime: start ? start.fixTime : undefined,
+    endTime: end ? end.fixTime : undefined
+  }
+}
+
+function calculateIgnitions (routeOfDay) {
+  let indexStart
+  let last
+  const ignitions = []
+  routeOfDay.forEach((p, index) => {
+    // difference between last position and current position is bigger than 5 minutes
+    if ((last && last.attributes.ignition && (new Date(p.fixTime).getTime() - new Date(last.fixTime).getTime()) > 300000) &&
+        ignitions.length &&
+        !ignitions[ignitions.length - 1].off) {
+      ignitions[ignitions.length - 1].off = last
+      ignitions[ignitions.length - 1].route = routeOfDay.slice(indexStart, index)
+    }
+
+    if (p.attributes.ignition && (!ignitions.length || ignitions[ignitions.length - 1].off)) {
+      ignitions.push({ on: p })
+      indexStart = index
+    }
+
+    // ignition is off
+    // or is last route position
+    if ((!p.attributes.ignition || index + 1 === routeOfDay.length) &&
+        ignitions.length &&
+        !ignitions[ignitions.length - 1].off) {
+      ignitions[ignitions.length - 1].off = p
+      ignitions[ignitions.length - 1].route = (index + 1) === routeOfDay.length ? routeOfDay.slice(indexStart) : routeOfDay.slice(indexStart, index + 1)
+    }
+
+    last = p
+  })
+
+  return ignitions
+}
+
 async function exportMachinesReportToPDF (userData, reportData) {
   const doc = new jsPDF.jsPDF('l')
   const translations = getTranslations(userData)
@@ -163,7 +190,7 @@ async function exportMachinesReportToPDF (userData, reportData) {
 
     const footValues = ['',
       '', '',
-      convertMS(d.summary.reduce((a, b) => a + b.engineHours, 0))]
+      convertMS(d.summary.reduce((a, b) => a + (b.engineHours || 0), 0))]
 
     const style = getStyle(getUserPartner(userData.user))
     addTable(doc, headers, data, footValues, style, 40)