fleetmap-reports 1.0.266 → 1.0.267

package/.idea/workspace.xml

@@ -1,9 +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="Refactor trip and speeding reports">
+    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="check if weekDays parameter is set">
       <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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -222,6 +224,8 @@
       <workItem from="1641387675790" duration="32947000" />
       <workItem from="1641509412324" duration="41000" />
       <workItem from="1641510744190" duration="1404000" />
+      <workItem from="1641526151665" duration="1679000" />
+      <workItem from="1641640203903" duration="3434000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>
@@ -384,12 +388,30 @@
       <option name="project" value="LOCAL" />
       <updated>1641511586537</updated>
     </task>
-    <option name="localTasksCounter" value="24" />
+    <task id="LOCAL-00024" summary="check if weekDays parameter is set">
+      <created>1641527800168</created>
+      <option name="number" value="00024" />
+      <option name="presentableId" value="LOCAL-00024" />
+      <option name="project" value="LOCAL" />
+      <updated>1641527800170</updated>
+    </task>
+    <option name="localTasksCounter" value="25" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ID_ORDER">
+      <list>
+        <option value="Default.Root" />
+        <option value="Default.Author" />
+        <option value="Default.Date" />
+        <option value="Default.Subject" />
+        <option value="Space.CommitStatus" />
+      </list>
+    </option>
+  </component>
   <component name="Vcs.Log.Tabs.Properties">
     <option name="TAB_STATES">
       <map>
@@ -425,6 +447,7 @@
     <MESSAGE value="activity report by driver grouped by day" />
     <MESSAGE value="fix kms-report by driver and fix activity report with time period" />
     <MESSAGE value="Refactor trip and speeding reports" />
-    <option name="LAST_COMMIT_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" />
   </component>
 </project>

package/package.json

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

package/src/trip-report.js

@@ -128,8 +128,8 @@ function processDevices(from, to, devices, data, stopsData) {
 
         trips.forEach(trip => {
             if (automaticReports.deviceWithFuelInfo(d)) {
-                trip.fuelConsumption = Math.round((t.spentFuel * d.attributes.fuel_tank_capacity) / 100)
-                trip.avgFuelConsumption = t.totalKms > 0 ? Math.round(t.fuelConsumption * 100 / t.totalKms) : 0
+                trip.fuelConsumption = Math.round((trip.spentFuel * d.attributes.fuel_tank_capacity) / 100)
+                trip.avgFuelConsumption = trip.totalKms > 0 ? Math.round(trip.fuelConsumption * 100 / trip.totalKms) : 0
             } else {
                 trip.fuelConsumption = '-'
                 trip.avgFuelConsumption = '-'