fleetmap-reports 1.0.733 → 1.0.735

package/package.json

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

package/src/partnerReports/performance-report.js

@@ -1,25 +1,50 @@
-async function createPerformanceReport (from, to, userData, traccarInstance) {
+const automaticReports = require('../automaticReports')
+const traccarHelper = require('../util/traccar')
+const { getUncompletedTrip } = require('../util/trips')
+
+async function createPerformanceReport (from, to, userData, traccar) {
   const reportData = []
-  userData.devices.forEach(d => {
-    const deviceData = {
-      device: d.name,
-      drivingTime: 850000,
-      idleTime: 200000,
-      drivingConsumption: 20,
-      idleConsumption: 10,
-      drivingDistance: 10000,
-      economicTime: 265000,
-      economicConsumption: 5,
-      economicDistance: 99000,
-      cruiseControlTime: 0,
-      cruiseControlConsumption: 0,
-      cruiseControlDistance: 0,
-      highMotorRPM: 66000,
-      hardBreaking: 10,
-      hardAcceleration: 5
-    }
-    reportData.push(deviceData)
-  })
+
+  const devices = userData.devices
+  const sliced = automaticReports.sliceArray(devices, 5)
+
+  let deviceCount = 0
+  for (const slice of sliced) {
+    const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, true, true, false, deviceCount, devices.length)
+
+    slice.forEach(d => {
+      const deviceRoute = allInOne.route.filter(t => t.deviceId === d.id)
+      const deviceTrips = allInOne.trips.filter(t => t.deviceId === d.id)
+      const deviceStops = allInOne.stops.filter(t => t.deviceId === d.id)
+
+      const uncompletedTrip = getUncompletedTrip(d, deviceRoute, deviceTrips)
+      if (uncompletedTrip) {
+        deviceTrips.push(uncompletedTrip)
+      }
+
+      const deviceData = {
+        device: d.name,
+        drivingTime: deviceTrips.reduce((a, b) => a + b.duration, 0),
+        idleTime: deviceTrips.reduce((a, b) => a + b.idleTime, 0) +
+            deviceStops.reduce((a, b) => a + b.engineHours, 0),
+        drivingConsumption: 20,
+        idleConsumption: 10,
+        drivingDistance: deviceTrips.reduce((a, b) => a + b.distance, 0),
+        economicTime: 265000,
+        economicConsumption: 5,
+        economicDistance: 99000,
+        cruiseControlTime: 0,
+        cruiseControlConsumption: 0,
+        cruiseControlDistance: 0,
+        highEngineRPM: 66000,
+        hardBreaking: 10,
+        hardAcceleration: 5
+      }
+      reportData.push(deviceData)
+    })
+
+    deviceCount = deviceCount + slice.length
+  }
   return reportData
 }
 

package/src/tests/zones.test.js

@@ -2,6 +2,7 @@ const { getReports } = require('./index')
 const assert = require('assert')
 // eslint-disable-next-line no-undef
 describe('zones', function () {
+  this.timeout(500000)
   // eslint-disable-next-line no-undef
   it('works with ellca', async () => {
     const report = await getReports()

package/src/trip-report.js

@@ -10,7 +10,10 @@ const { headerFromUser, addTable } = require('./util/pdfDocument')
 const { getStyle } = require('./reportStyle')
 const traccarHelper = require('./util/traccar')
 const trips = require('./util/trips')
-const { isInsideTimetable, isPartialInsideTimetable, calculateTrip, getTripIdleTime, calculateStopDuration } = require('./util/trips')
+const {
+  isInsideTimetable, isPartialInsideTimetable, getTripIdleTime, calculateStopDuration,
+  getUncompletedTrip
+} = require('./util/trips')
 const { devicesToProcess, deviceName } = require('./util/device')
 const { getIdleEvents } = require('./util/route')
 const { reportByDriver, getDriverName, getDriverData } = require('./util/driver')
@@ -152,11 +155,9 @@ function processDevices (from, to, devices, data, userData, traccar) {
     const deviceRoute = data.route.filter(t => t.deviceId === d.id)
     const deviceTrips = data.trips.filter(t => t.deviceId === d.id)
 
-    if (deviceRoute.length && deviceTrips.length && deviceRoute[deviceRoute.length - 1].attributes.ignition) {
-      const 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 uncompletedTrip = getUncompletedTrip(d, deviceRoute, deviceTrips)
+    if (uncompletedTrip) {
+      deviceTrips.push(uncompletedTrip)
     }
 
     const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))

package/src/util/trips.js

@@ -104,6 +104,15 @@ function updateTrip (t, route) {
   t.averageSpeed = distance > 0 ? ((route.reduce((a, b) => a + b.speed, 0)) / route.length) : 0
 }
 
+function getUncompletedTrip (device, deviceRoute, deviceTrips) {
+  if (deviceRoute.length && deviceTrips.length && deviceRoute[deviceRoute.length - 1].attributes.ignition) {
+    const uncompletedTripRoute = deviceRoute.filter(p => p.attributes.ignition && new Date(p.fixTime).getTime() > new Date(deviceTrips[deviceTrips.length - 1].endTime).getTime())
+    if (uncompletedTripRoute.length) {
+      return calculateTrip(device, uncompletedTripRoute)
+    }
+  }
+}
+
 function calculateTrip (device, route) {
   const startPos = route[0]
   const endPos = route[route.length - 1]
@@ -153,3 +162,4 @@ exports.isPartialInsideTimetable = isPartialInsideTimetable
 exports.calculateTrip = calculateTrip
 exports.getTripIdleTime = getTripIdleTime
 exports.calculateStopDuration = calculateStopDuration
+exports.getUncompletedTrip = getUncompletedTrip

package/src/util/utils.js

@@ -110,7 +110,8 @@ function getDates (startDate, endDate, timezone) {
   const dates = []
   let currentDate = new Date(startDate.getFullYear(), startDate.getMonth(), startDate.getDate(), 12, 0, 0, 0)
   if (!isClientSide() && timezone) {
-    currentDate = convertFromUTC(currentDate, timezone)
+    const startDateUserTimezone = convertFromUTC(startDate, timezone)
+    currentDate = new Date(startDateUserTimezone.getFullYear(), startDateUserTimezone.getMonth(), startDateUserTimezone.getDate(), 12, 0, 0, 0)
   }
   const addDays = function (days) {
     const date = new Date(this.valueOf())