fleetmap-reports 1.0.253 → 1.0.258

package/.idea/workspace.xml

@@ -1,12 +1,17 @@
 <?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="Trip and activity report with time period">
+    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="Fix trips distance because imported positions generate trips with 0 kms">
+      <change beforePath="$PROJECT_DIR$/lang/enGB.js" beforeDir="false" afterPath="$PROJECT_DIR$/lang/enGB.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lang/esCL.js" beforeDir="false" afterPath="$PROJECT_DIR$/lang/esCL.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lang/ptBR.js" beforeDir="false" afterPath="$PROJECT_DIR$/lang/ptBR.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lang/ptPT.js" beforeDir="false" afterPath="$PROJECT_DIR$/lang/ptPT.js" afterDir="false" />
       <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/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/location-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/location-report.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/util/driver.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/driver.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/util/trips.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/trips.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -213,7 +218,8 @@
       <workItem from="1639592539998" duration="27141000" />
       <workItem from="1639766010908" duration="4991000" />
       <workItem from="1639872937953" duration="1438000" />
-      <workItem from="1639954341221" duration="7636000" />
+      <workItem from="1639954341221" duration="11986000" />
+      <workItem from="1640272520380" duration="1339000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>
@@ -313,7 +319,14 @@
       <option name="project" value="LOCAL" />
       <updated>1639873766072</updated>
     </task>
-    <option name="localTasksCounter" value="15" />
+    <task id="LOCAL-00015" summary="Fix trips distance because imported positions generate trips with 0 kms">
+      <created>1640000462824</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1640000462825</updated>
+    </task>
+    <option name="localTasksCounter" value="16" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -345,6 +358,7 @@
     <MESSAGE value="speeding report with customSpeed" />
     <MESSAGE value="fix speeding report" />
     <MESSAGE value="Trip and activity report with time period" />
-    <option name="LAST_COMMIT_MESSAGE" value="Trip and activity report with time period" />
+    <MESSAGE value="Fix trips distance because imported positions generate trips with 0 kms" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fix trips distance because imported positions generate trips with 0 kms" />
   </component>
 </project>

package/lang/enGB.js

@@ -162,7 +162,6 @@ module.exports = {
   },
   report: {
     temperature: 'Temperatura',
-    temperature2: 'Temperatura2',
     select_vehicles: 'Select vehicles',
     select_vehicles_placeholder: 'Vehicles',
     select_geofences: 'Select geofences',

package/lang/esCL.js

@@ -157,7 +157,6 @@ module.exports = {
   },
   report: {
     temperature: 'Temperatura',
-    temperature2: 'Temperatura2',
     select_vehicles: 'Seleccione vehículos',
     select_vehicles_placeholder: 'Vehículos',
     select_geofences: 'Seleccione geocercas',

package/lang/ptBR.js

@@ -154,7 +154,6 @@ module.exports = {
   },
   report: {
     temperature: 'Temperatura',
-    temperature2: 'Temperatura2',
     select_vehicles: 'Seleccionar veículos',
     select_vehicles_placeholder: 'Veículos',
     select_geofences: 'Seleccionar balizas',

package/lang/ptPT.js

@@ -158,7 +158,6 @@ module.exports = {
   },
   report: {
     temperature: 'Temperatura',
-    temperature2: 'Temperatura2',
     select_vehicles: 'Seleccionar veículos',
     select_vehicles_placeholder: 'Veículos',
     select_geofences: 'Seleccionar balizas',

package/package.json

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

package/src/location-report.js

@@ -112,7 +112,7 @@ async function exportLocationReportToPDF(userData, reportData) {
         translations.report.speed,
         translations.report.ignition,
         translations.report.driver,
-        translations.temperature
+        translations.report.temperature
     ]
 
     if (reportData.devices) {

package/src/util/driver.js

@@ -2,8 +2,7 @@ const traccar = require("./traccar");
 
 //get devices used by each driver between two dates
 async function devicesByDriver(traccarInstance, from, to, drivers, devices){
-    const eventsData = traccar.getEvents(traccarInstance, from, to , devices, ['driverChanged'])
-
+    const eventsData = await traccar.getEvents(traccarInstance, from, to , devices, ['driverChanged'])
     const deviceIds = []
     for(const d of drivers) {
         const events = eventsData.filter(e => {

package/src/util/trips.js

@@ -1,16 +1,21 @@
 const traccar = require("./traccar");
 
+const minDistance = 0
+const minAvgSpeed = 0
+
 async function checkTripsKms(traccarInstance, from, to, routeData, tripsData, devices) {
     console.log('checkTripsKms')
-    const trips = tripsData.filter(t => t.distance === 0 && t.averageSpeed > 10)
+    const trips = tripsData.filter(t => t.distance === minDistance && t.averageSpeed > minAvgSpeed)
     if(trips.length > 0) {
         //Vehicles with imported positions. calculate trip distance with route positions
         const route = routeData.length === 0 ? await traccar.getRoute(traccarInstance, from, to, devices) : routeData
         trips.forEach(t => {
-            const tripRoute = route.filter(p => p.deviceId === t.deviceId
-                && new Date(p.fixTime).getTime() > new Date(t.startTime).getTime()
-                && new Date(p.fixTime).getTime() < new Date(t.endTime).getTime())
-            t.distance = tripRoute.reduce((a, b) => a + b.attributes.distance, 0)
+            if(t.distance === minDistance && t.averageSpeed > minAvgSpeed) {
+                const tripRoute = route.filter(p => p.deviceId === t.deviceId
+                    && new Date(p.fixTime).getTime() >= new Date(t.startTime).getTime()
+                    && new Date(p.fixTime).getTime() <= new Date(t.endTime).getTime())
+                t.distance = tripRoute.reduce((a, b) => a + b.attributes.distance, 0)
+            }
         })
     }
 }