fleetmap-reports 1.0.265 → 1.0.266

package/.idea/workspace.xml

@@ -1,17 +1,9 @@
 <?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="fix kms-report by driver and fix activity report with time period">
+    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="Refactor trip and speeding reports">
       <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/speeding-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/speeding-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/driver.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/driver.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/util/traccar.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/traccar.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" />
@@ -229,6 +221,7 @@
       <workItem from="1641321068227" duration="14805000" />
       <workItem from="1641387675790" duration="32947000" />
       <workItem from="1641509412324" duration="41000" />
+      <workItem from="1641510744190" duration="1404000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>
@@ -384,7 +377,14 @@
       <option name="project" value="LOCAL" />
       <updated>1641348028566</updated>
     </task>
-    <option name="localTasksCounter" value="23" />
+    <task id="LOCAL-00023" summary="Refactor trip and speeding reports">
+      <created>1641511586537</created>
+      <option name="number" value="00023" />
+      <option name="presentableId" value="LOCAL-00023" />
+      <option name="project" value="LOCAL" />
+      <updated>1641511586537</updated>
+    </task>
+    <option name="localTasksCounter" value="24" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -424,6 +424,7 @@
     <MESSAGE value="fix activity report by driver" />
     <MESSAGE value="activity report by driver grouped by day" />
     <MESSAGE value="fix kms-report by driver and fix activity report with time period" />
-    <option name="LAST_COMMIT_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" />
   </component>
 </project>

package/package.json

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

package/src/activity-report.js

@@ -214,7 +214,7 @@ function processDrivers(from, to, drivers, data) {
             if(userData.groupByDay) {
                 const dates = getDates(from, to)
                 for(const date of dates){
-                    if(userData.allWeek){
+                    if(userData.allWeek || !userData.weekDays){
                         const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
                         const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
 
@@ -409,7 +409,7 @@ function exportActivityReportToPDF_Vehicle_GroupByDay(doc, translations, reportD
         doc.text(group ? translations.report.group + ': ' + group.name : '', 150, space + 20)
         doc.text(new Date(reportData.from).toLocaleString() + ' - ' + new Date(reportData.to).toLocaleString(), 20, space + 25)
 
-        if (!userData.allWeek) {
+        if (!userData.allWeek && userData.weekDays) {
             doc.text((userData.weekDays.monday ? ' ' + translations.report.monday + ',' : '')
                 + (userData.weekDays.tuesday ? ' ' + translations.report.tuesday + ',' : '')
                 + (userData.weekDays.wednesday ? ' ' + translations.report.wednesday + ',' : '')
@@ -536,7 +536,7 @@ function exportActivityReportToPDF_Driver_GroupByDay(doc, translations, reportDa
         doc.text(group ? translations.report.group + ': ' + group.name : '', 150, space + 20)
         doc.text(new Date(reportData.from).toLocaleString() + ' - ' + new Date(reportData.to).toLocaleString(), 20, space + 25)
 
-        if (!userData.allWeek) {
+        if (!userData.allWeek && userData.weekDays) {
             doc.text((userData.weekDays.monday ? ' ' + translations.report.monday + ',' : '')
                 + (userData.weekDays.tuesday ? ' ' + translations.report.tuesday + ',' : '')
                 + (userData.weekDays.wednesday ? ' ' + translations.report.wednesday + ',' : '')

package/src/kms-report.js

@@ -153,7 +153,7 @@ function processDevices(from, to, devices, route, trips) {
                         kms: 0
                     }
 
-                    if(userData.allWeek){
+                    if(userData.allWeek || !userData.weekDays){
                         day.kms = dayTrips.reduce((a, b) => a + b.distance, 0) || 0
                     } else {
                         if((currentDate.getDay() === 0 && userData.weekDays.sunday) ||
@@ -302,7 +302,7 @@ async function exportKmsReportToPDF(userData, reportData) {
                 doc.text(group ? translations.report.group + ': ' + group.name : '', 150, space + 20)
                 doc.text(new Date(reportData.from).toLocaleString() + ' - ' + new Date(reportData.to).toLocaleString(), 20, space + 25)
 
-                if(!userData.allWeek) {
+                if(!userData.allWeek && userData.weekDays) {
                     doc.text((userData.weekDays.monday ? ' ' + translations.report.monday + ',' : '')
                         + (userData.weekDays.tuesday ? ' ' + translations.report.tuesday + ',' : '')
                         + (userData.weekDays.wednesday ? ' ' + translations.report.wednesday + ',' : '')

package/src/speeding-report.js

@@ -365,7 +365,7 @@ async function exportSpeedingReportToPDF(userData, reportData) {
         doc.text(group ? translations.report.group + ': ' + group.name : '', 150, space+20 )
         doc.text(convertToLocaleString(d.from, lang, timezone) + ' - ' + convertToLocaleString(d.to, lang, timezone), 20, space+25 )
         if (d.alerts[0] && !userData.byDriver) {
-          doc.text(translations.report.speedLimit + ": " + (userData.useVehicleSpeedLimit ? Math.round(d.alerts[0].attributes.speedLimit * 1.85200) : userData.customSpeed) + ' Km/h', 20, space + 30)
+          doc.text(translations.report.speedLimit + ": " + ((userData.useVehicleSpeedLimit || !userData.customSpeed) ? Math.round(d.alerts[0].attributes.speedLimit * 1.85200) : userData.customSpeed) + ' Km/h', 20, space + 30)
         }
         d.alerts.map(a => {
           const temp = [

package/src/trip-report.js

@@ -247,7 +247,7 @@ async function exportTripReportToPDF(userData, reportData) {
             doc.setFontSize(11)
             doc.text(group ? translations.report.group + ': ' + group.name : '', 200, space+20 )
             doc.text(convertToLocaleString(d.from, lang, timezone) + ' - ' + convertToLocaleString(d.to, lang, timezone), 20, space+25 )
-            if(!userData.allWeek) {
+            if(!userData.allWeek && userData.weekDays) {
                 doc.text((userData.weekDays.monday ? ' ' + translations.report.monday + ',' : '')
                     + (userData.weekDays.tuesday ? ' ' + translations.report.tuesday + ',' : '')
                     + (userData.weekDays.wednesday ? ' ' + translations.report.wednesday + ',' : '')