fleetmap-reports 2.0.385 → 2.0.386

package/package.json

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

package/src/activity-report.js

@@ -207,7 +207,8 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
               endTime: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endTime,
               endAddress: tripsByDay.length && tripsByDay[tripsByDay.length - 1].endAddress,
               startTimeIsOut: tripsByDay.some(t => t.startTimeIsOut),
-              endTimeIsOut: tripsByDay.some(t => t.endTimeIsOut)
+              endTimeIsOut: tripsByDay.some(t => t.endTimeIsOut),
+              activity: getDayActivity(tripsByDay, fromDay, toDay)
             })
           }
         } else {
@@ -232,6 +233,7 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
           summaryCurrentDay.endOdometer = summaryByDevice.endOdometer
           summaryCurrentDay.startTimeIsOut = tripsByDay.some(t => t.startTimeIsOut)
           summaryCurrentDay.endTimeIsOut = tripsByDay.some(t => t.endTimeIsOut)
+          summaryCurrentDay.activity = getDayActivity(tripsByDay, fromDay, toDay)
           summary.push(summaryCurrentDay)
         }
       }
@@ -285,6 +287,17 @@ async function processDevices (from, to, devices, data, userData, traccarInstanc
   return devicesResult
 }
 
+// Trips of one day as [{ start, end }] in hours since the start of that day (0-24),
+// used to draw the daily activity timeline on screen and in the PDF.
+function getDayActivity (tripsByDay, fromDay, toDay) {
+  const dayStart = new Date(fromDay).getTime()
+  const dayEnd = new Date(toDay).getTime()
+  const toHours = time => (Math.min(Math.max(new Date(time).getTime(), dayStart), dayEnd) - dayStart) / 3600000
+  return tripsByDay
+    .map(t => ({ start: toHours(t.startTime), end: toHours(t.endTime) }))
+    .filter(a => a.end > a.start)
+}
+
 function processDrivers (from, to, drivers, driversData, userData) {
   const driversResult = []
   drivers.forEach(d => {
@@ -508,6 +521,63 @@ function exportActivityReportToPDFVehicleGroupByDay (doc, translations, reportDa
 
     const style = getStyle(getUserPartner(userData.user))
     addTable(doc, headers, data, footValues, style, 40)
+    addActivityTimeline(doc, translations, d.summary, weekDays)
+  })
+}
+
+// Draws one bar per day (00h-24h) below the table: grey when stopped, green while driving.
+function addActivityTimeline (doc, translations, summary, weekDays) {
+  if (!summary.some(s => s.activity)) {
+    return
+  }
+  const pageWidth = doc.internal.pageSize.getWidth()
+  const pageHeight = doc.internal.pageSize.getHeight()
+  const labelX = 14
+  const left = 50
+  const width = pageWidth - 14 - left
+  const rowHeight = 4
+  const rowGap = 2
+  const bottom = pageHeight - 15
+
+  const drawAxis = (y) => {
+    doc.setFontSize(7)
+    doc.setTextColor(80, 80, 80)
+    for (let h = 0; h <= 24; h += 2) {
+      doc.text(String(h).padStart(2, '0') + 'h', left + h / 24 * width, y, { align: 'center' })
+    }
+    return y + 2
+  }
+
+  let y = doc.lastAutoTable.finalY + 10
+  if (y + 20 > bottom) {
+    doc.addPage()
+    y = 20
+  }
+  doc.setFillColor(103, 194, 58)
+  doc.rect(labelX, y - 2.5, 3, 3, 'F')
+  doc.setFontSize(8)
+  doc.setTextColor(0, 0, 0)
+  doc.text(translations.vehicleTable.moving_vehicles, labelX + 4, y)
+  doc.setFillColor(220, 220, 220)
+  doc.rect(labelX + 30, y - 2.5, 3, 3, 'F')
+  doc.text(translations.vehicleTable.stopped_vehicles, labelX + 34, y)
+  y = drawAxis(y + 6)
+
+  summary.forEach(s => {
+    if (y + rowHeight > bottom) {
+      doc.addPage()
+      y = drawAxis(20)
+    }
+    doc.setFontSize(7)
+    doc.setTextColor(0, 0, 0)
+    doc.text(new Date(s.date).toLocaleDateString() + ' - ' + weekDays[new Date(s.date).getDay()], labelX, y + rowHeight - 0.8)
+    doc.setFillColor(220, 220, 220)
+    doc.rect(left, y, width, rowHeight, 'F')
+    doc.setFillColor(103, 194, 58)
+    for (const a of (s.activity || [])) {
+      doc.rect(left + a.start / 24 * width, y, Math.max((a.end - a.start) / 24 * width, 0.3), rowHeight, 'F')
+    }
+    y += rowHeight + rowGap
   })
 }