fleetmap-reports 1.0.392 → 1.0.399

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.392",
+  "version": "1.0.399",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -10,11 +10,13 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@turf/turf": "^6.5.0",
+    "@turf/distance": "^6.5.0",
+    "@turf/helpers": "^6.5.0",
+    "@turf/point-on-feature": "^6.5.0",
+    "@turf/point-to-line-distance": "^6.5.0",
     "axios": "^0.21.1",
     "axios-cookiejar-support": "^1.0.1",
     "docx": "^7.3.0",
-    "eslint": "^8.8.0",
     "file-saver": "^2.0.5",
     "fleetmap-partners": "^1.0.76",
     "json-as-xlsx": "^1.2.1",
@@ -23,12 +25,15 @@
     "moment": "^2.29.1",
     "tough-cookie": "^4.0.0",
     "traccar-api": "^1.0.5",
-    "turf": "^3.0.14",
-    "turf-point": "^2.0.1",
     "wkt": "^0.1.1"
   },
   "devDependencies": {
     "axios-debug-log": "^0.8.4",
+    "eslint": "^8.15.0",
+    "eslint-config-standard": "^17.0.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-n": "^15.2.0",
+    "eslint-plugin-promise": "^6.0.0",
     "jest": "^27.5.0",
     "mocha": "^9.0.3",
     "webpack": "^5.24.3",

package/src/activity-report.js

@@ -197,15 +197,33 @@ function processDevices(from, to, devices, data, userData) {
                 }
             }
         } else {
-            summary.push(...data.summaries.filter(s => s.deviceId === d.id))
-
-            if (summary.length) {
-                summary.forEach(s => {
-                    s.distance = deviceTrips.reduce((a, b) => a + b.distance, 0)
-                    s.convertedSpentFuel = automaticReports.calculateSpentFuel(s.spentFuel, d)
-                    s.startTime = deviceTrips.length && deviceTrips[0].startTime
-                    s.endTime = deviceTrips.length && deviceTrips[deviceTrips.length-1].endTime
+            if(!userData.allWeek && userData.weekDays && userData.dayHours) {
+                const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
+                const distance = trips.reduce((a, b) => a + b.distance, 0)
+                summary.push({
+                    deviceId: d.id,
+                    averageSpeed: distance > 0 ? ((trips.reduce((a, b) => a + (b.averageSpeed * b.distance), 0)) / distance) : 0,
+                    distance: distance,
+                    engineHours: trips.reduce((a, b) => a + b.duration, 0),
+                    maxSpeed: trips.reduce((a, b) => {
+                        return a > b.maxSpeed ? a : b.maxSpeed
+                    }, 0),
+                    startOdometer: trips.length ? trips[0].startOdometer : 0,
+                    endOdometer: trips.length ? trips[trips.length - 1].endOdometer : 0,
+                    startTime: trips.length && trips[0].startTime,
+                    endTime: trips.length && trips[trips.length - 1].endTime
                 })
+            } else {
+                summary.push(...data.summaries.filter(s => s.deviceId === d.id))
+
+                if (summary.length) {
+                    summary.forEach(s => {
+                        s.distance = deviceTrips.reduce((a, b) => a + b.distance, 0)
+                        s.convertedSpentFuel = automaticReports.calculateSpentFuel(s.spentFuel, d)
+                        s.startTime = deviceTrips.length && deviceTrips[0].startTime
+                        s.endTime = deviceTrips.length && deviceTrips[deviceTrips.length - 1].endTime
+                    })
+                }
             }
         }