fleetmap-reports 1.0.267 → 1.0.268

package/.idea/workspace.xml

@@ -1,11 +1,11 @@
 <?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="check if weekDays parameter is set">
+    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="fix trip report">
       <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/trip-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/trip-report.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/speeding-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/speeding-report.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -225,7 +225,8 @@
       <workItem from="1641509412324" duration="41000" />
       <workItem from="1641510744190" duration="1404000" />
       <workItem from="1641526151665" duration="1679000" />
-      <workItem from="1641640203903" duration="3434000" />
+      <workItem from="1641640203903" duration="5320000" />
+      <workItem from="1641740608739" duration="552000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>
@@ -395,7 +396,14 @@
       <option name="project" value="LOCAL" />
       <updated>1641527800170</updated>
     </task>
-    <option name="localTasksCounter" value="25" />
+    <task id="LOCAL-00025" summary="fix trip report">
+      <created>1641664506677</created>
+      <option name="number" value="00025" />
+      <option name="presentableId" value="LOCAL-00025" />
+      <option name="project" value="LOCAL" />
+      <updated>1641664506679</updated>
+    </task>
+    <option name="localTasksCounter" value="26" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -448,6 +456,7 @@
     <MESSAGE value="fix kms-report by driver and fix activity report with time period" />
     <MESSAGE value="Refactor trip and speeding reports" />
     <MESSAGE value="check if weekDays parameter is set" />
-    <option name="LAST_COMMIT_MESSAGE" value="check if weekDays parameter is set" />
+    <MESSAGE value="fix trip report" />
+    <option name="LAST_COMMIT_MESSAGE" value="fix trip report" />
   </component>
 </project>

package/package.json

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

package/src/speeding-report.js

@@ -195,12 +195,10 @@ async function findEventsPosition(from, to, devices, events, routes){
             }
           }
 
-          if(!a.position) {
-            a.position = positions[pIndex]
-            pIndex = calculateEventData(positions, pIndex, a, d, geofence)
+          a.position = positions[pIndex]
+          pIndex = calculateEventData(positions, pIndex, a, d, geofence)
 
-            positions.slice(pIndex)
-          }
+          positions.slice(pIndex)
         }
       }
     }
@@ -238,7 +236,7 @@ async function getCustomSpeedLimitEvents(devices, routes){
 }
 
 async function getHereEvents(devices, routes){
-  console.log('calculate custom speed limit events')
+  console.log('calculate here speed limit events')
   const events = []
   for (const d of devices) {
     const positions = routes.filter(p => p.deviceId === d.id)