fleetmap-reports 2.0.124 → 2.0.126

package/package.json

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

package/src/partnerReports/delayedstart-report.js

@@ -22,7 +22,7 @@ async function createDelayedStartReport (from, to, userData, traccar) {
   const sliced = automaticReports.sliceArray(devices, 5)
   let deviceCount = 0
   for (const slice of sliced) {
-    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, false, true, true, false, deviceCount, devices.length)
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, true, false, false, deviceCount, devices.length)
 
     for (const d of slice) {
       const deviceData = await processDeviceData(from, to, allInOne, d, userData, traccar)
@@ -60,6 +60,8 @@ function getDelayDescription (startTime, activityStart, lowDelay, mediumDelay, h
 
 async function processDeviceData (from, to, allInOne, d, userData, traccar) {
   const trips = allInOne.trips.filter(t => t.deviceId === d.id)
+  const route = allInOne.route.filter(t => t.deviceId === d.id)
+
   const translations = getTranslations(userData)
 
   const weekDays = [
@@ -76,12 +78,26 @@ async function processDeviceData (from, to, allInOne, d, userData, traccar) {
 
   const days = []
   for (const date of dates) {
-    const { tripsByDay } = await getDataByDay(d, date, { trips }, userData, traccar)
+    const { tripsByDay, routeByDay } = await getDataByDay(d, date, { trips, route }, userData, traccar)
+
+    let startTime
+    let endTime
+    if (userData.useIgnition) {
+      const firstIgnitionOn = routeByDay.find(p => p.attributes.ignition)
+      if (firstIgnitionOn) {
+        startTime = firstIgnitionOn.fixTime
+      }
+    } else {
+      if (tripsByDay.length) {
+        startTime = tripsByDay[0].startTime
+      }
+    }
 
-    if (tripsByDay.length > 0) {
-      const startTime = tripsByDay[0].startTime
-      const endTime = tripsByDay[tripsByDay.length - 1].endTime
+    if (tripsByDay.length) {
+      endTime = tripsByDay[tripsByDay.length - 1].endTime
+    }
 
+    if (startTime) {
       const deviceDayData = {
         device: d.name,
         groupId: d.groupId,

package/src/zone-report.js

@@ -65,13 +65,14 @@ async function createZoneReport (from, to, userData, traccar) {
     }
   }
 
+  const reportRangeDays = (new Date(to).getTime() - new Date(from).getTime()) / 1000 * 60 * 60 * 24
   const sliced = automaticReports.sliceArray(devices, sliceSize)
 
   let deviceCount = 0
   for (const slice of sliced) {
     const data = await traccarHelper.getAllInOne(
       traccar, from, to, slice, true, false, false, false,
-      deviceCount, devices.length, sliceSize, deviceChunk, undefined)
+      deviceCount, devices.length, sliceSize, reportRangeDays > 31 ? 1 : deviceChunk, undefined)
 
     const route = filterPositions(data.route)
     const alerts = []