fleetmap-reports 1.0.261 → 1.0.262

package/.idea/workspace.xml

@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="timezone - check if it's running on client side">
+    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="calculate avg speed">
       <change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/activity-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/activity-report.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/index.test.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.test.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/kms-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/kms-report.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/trip-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/trip-report.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/util/traccar.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/traccar.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -218,7 +221,8 @@
       <workItem from="1640794844118" duration="10128000" />
       <workItem from="1640866364417" duration="67000" />
       <workItem from="1640866782794" duration="123000" />
-      <workItem from="1640866964393" duration="478000" />
+      <workItem from="1640866964393" duration="1022000" />
+      <workItem from="1640870147277" duration="2391000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>
@@ -346,7 +350,14 @@
       <option name="project" value="LOCAL" />
       <updated>1640825795053</updated>
     </task>
-    <option name="localTasksCounter" value="19" />
+    <task id="LOCAL-00019" summary="calculate avg speed">
+      <created>1640867522437</created>
+      <option name="number" value="00019" />
+      <option name="presentableId" value="LOCAL-00019" />
+      <option name="project" value="LOCAL" />
+      <updated>1640867522438</updated>
+    </task>
+    <option name="localTasksCounter" value="20" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -382,6 +393,7 @@
     <MESSAGE value="Fix reports by driver" />
     <MESSAGE value="location report - check if it's running on client side" />
     <MESSAGE value="timezone - check if it's running on client side" />
-    <option name="LAST_COMMIT_MESSAGE" value="timezone - check if it's running on client side" />
+    <MESSAGE value="calculate avg speed" />
+    <option name="LAST_COMMIT_MESSAGE" value="calculate avg speed" />
   </component>
 </project>

package/package.json

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

package/src/activity-report.js

@@ -140,8 +140,7 @@ async function createActivityReportByDriver(from, to){
     console.log(deviceIds)
     let tripsData = []
     if(deviceIds.length > 0) {
-        const response = await traccar.getTrips(traccarInstance, from, to, deviceIds)
-        tripsData = response.data
+        tripsData = await traccar.getTrips(traccarInstance, from, to, deviceIds)
     }
 
     const allData = {
@@ -189,12 +188,12 @@ function processDrivers(drivers, data) {
         if (trips.length > 0) {
             const driverData = {
                 driver: d,
-                summary: {
+                summary: [{
                     distance: trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0),
                     engineHours: trips.reduce((a, b) => a + b.duration, 0),
                     maxSpeed: trips.reduce((a, b) => Math.max(a, b.maxSpeed), 0),
                     averageSpeed: Math.round(trips.reduce((a, b) => a + b.averageSpeed, 0) / trips.length),
-                },
+                }],
             }
             driversResult.push(driverData)
         }
@@ -257,7 +256,7 @@ function exportActivityReportToPDF_Driver(doc, translations, reportData) {
 }
 
 function exportActivityReportToPDF_Vehicle(doc, translations, reportData) {
-    const headers = [translations.report.name,
+    const headers = [translations.report.vehicle,
         translations.report.group,
         translations.report.distance,
         translations.report.start + ' ' + translations.report.odometer,
@@ -275,7 +274,7 @@ function exportActivityReportToPDF_Vehicle(doc, translations, reportData) {
         const group = userData.groups.find(g => d.device.groupId === g.id)
 
         const temp = [
-            d.summary.deviceName,
+            d.summary[0].deviceName,
             group ? group.name : '',
             Number((d.summary[0].distance / 1000).toFixed(2)),
             Number((d.summary[0].startOdometer / 1000).toFixed(2)),
@@ -443,10 +442,10 @@ function exportActivityReportToExcel_Driver(settings, translations, reportData)
         reportData.drivers.forEach(d => {
             data = data.concat([{
                 driver: d.driver.name,
-                distance: Number((d.summary.distance / 1000).toFixed(0)),
-                avgSpeed: Math.round(d.summary.averageSpeed * 1.85200),
-                maxSpeed: Math.round(d.summary.maxSpeed * 1.85200),
-                engineHours: convertMS(d.summary.engineHours)
+                distance: Number((d.summary[0].distance / 1000).toFixed(0)),
+                avgSpeed: Math.round(d.summary[0].averageSpeed * 1.85200),
+                maxSpeed: Math.round(d.summary[0].maxSpeed * 1.85200),
+                engineHours: convertMS(d.summary[0].engineHours)
             }])
         })
         console.log(data)
@@ -475,15 +474,15 @@ function exportActivityReportToExcel_Vehicle(settings, translations, reportData)
             const group = userData.groups.find(g => d.device.groupId === g.id)
 
             data = data.concat([{
-                name: d.summary.deviceName,
+                name: d.summary[0].deviceName,
                 group: group ? group.name : '',
-                distance: Number((d.summary.distance / 1000).toFixed(0)),
-                startOdometer: Number((d.summary.startOdometer / 1000).toFixed(0)),
-                endOdometer: Number((d.summary.endOdometer / 1000).toFixed(0)),
-                avgSpeed: Math.round(d.summary.averageSpeed * 1.85200),
-                maxSpeed: Math.round(d.summary.maxSpeed * 1.85200),
-                engineHours: convertMS(d.summary.engineHours),
-                spentFuel: d.summary.convertedSpentFuel >= 0 ? d.summary.convertedSpentFuel : 0,
+                distance: Number((d.summary[0].distance / 1000).toFixed(0)),
+                startOdometer: Number((d.summary[0].startOdometer / 1000).toFixed(0)),
+                endOdometer: Number((d.summary[0].endOdometer / 1000).toFixed(0)),
+                avgSpeed: Math.round(d.summary[0].averageSpeed * 1.85200),
+                maxSpeed: Math.round(d.summary[0].maxSpeed * 1.85200),
+                engineHours: convertMS(d.summary[0].engineHours),
+                spentFuel: d.summary[0].convertedSpentFuel >= 0 ? d.summary[0].convertedSpentFuel : 0,
             }])
         })
         console.log(data)

package/src/kms-report.js

@@ -26,7 +26,7 @@ async function createKmsReportByDevice(from, to) {
 
     devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
     const route = userData.allWeek ? [] : await traccar.getRoute(traccarInstance, from, to, devicesToProcess)
-    const tripsData = await traccar.getTrips(traccarInstance, from, to, devicesToProcess)
+    const tripsData = await traccar.getTrips(traccarInstance, from, to, devicesToProcess.map(d => d.id))
 
     console.log('trips:' + tripsData.length)
 

package/src/trip-report.js

@@ -51,7 +51,7 @@ async function createTripReportByDevice(from, to, devices) {
     devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
     const devicesToSlice = devices.slice()
-    const data = await traccar.getTrips(traccarInstance, from, to, devicesToSlice)
+    const data = await traccar.getTrips(traccarInstance, from, to, devicesToSlice.map(d => d.id))
     const stopsData = await traccar.getStops(traccarInstance, from, to, devicesToSlice)
 
     console.log('Trips:' + data.length)

package/src/util/traccar.js

@@ -14,12 +14,12 @@ async function getRoute(traccar, from, to, devices){
     return result.map(r => r.data).flat()
 }
 
-async function getTrips(traccar, from, to, devices){
-    const devicesToSlice = devices.slice()
+async function getTrips(traccar, from, to, deviceIds){
+    const devicesToSlice = deviceIds.slice()
     const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
     let requests = []
     for (const a of arrayOfArrays) {
-        const promise = traccar.reports.reportsTripsGet(from, to, a.map(d => d.id))
+        const promise = traccar.reports.reportsTripsGet(from, to, a)
         requests = requests.concat(promise)
     }