fleetmap-reports 1.0.274 → 1.0.275

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="fix kms report by group">
+    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="fix convert date to localeString">
+      <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/util/utils.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/utils.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/kms-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/kms-report.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -227,7 +229,11 @@
       <workItem from="1641740608739" duration="1844000" />
       <workItem from="1641775506363" duration="646000" />
       <workItem from="1641819557952" duration="1678000" />
-      <workItem from="1641910746496" duration="1137000" />
+      <workItem from="1641910746496" duration="1819000" />
+      <workItem from="1641921254910" duration="614000" />
+      <workItem from="1641991863387" duration="626000" />
+      <workItem from="1641992769870" duration="96000" />
+      <workItem from="1641992912450" duration="1045000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>
@@ -411,7 +417,14 @@
       <option name="project" value="LOCAL" />
       <updated>1641820626240</updated>
     </task>
-    <option name="localTasksCounter" value="27" />
+    <task id="LOCAL-00027" summary="fix convert date to localeString">
+      <created>1641912050985</created>
+      <option name="number" value="00027" />
+      <option name="presentableId" value="LOCAL-00027" />
+      <option name="project" value="LOCAL" />
+      <updated>1641912050985</updated>
+    </task>
+    <option name="localTasksCounter" value="28" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -441,7 +454,6 @@
     <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Fix getStyle" />
     <MESSAGE value="Fix getStyle in all reports" />
     <MESSAGE value="try catch on pdf addImage" />
     <MESSAGE value="Kms report grouped by day" />
@@ -466,6 +478,7 @@
     <MESSAGE value="check if weekDays parameter is set" />
     <MESSAGE value="fix trip report" />
     <MESSAGE value="fix kms report by group" />
-    <option name="LAST_COMMIT_MESSAGE" value="fix kms report by group" />
+    <MESSAGE value="fix convert date to localeString" />
+    <option name="LAST_COMMIT_MESSAGE" value="fix convert date to localeString" />
   </component>
 </project>

package/package.json

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

package/src/activity-report.js

@@ -9,6 +9,7 @@ const {getStyle} = require("./reportStyle")
 const {getUserPartner} = require("fleetmap-partners")
 const traccar = require("./util/traccar")
 const {createKmsReport} = require("./kms-report");
+const {isInsideTimetable} = require("./util/trips");
 
 let traccarInstance
 let userData
@@ -214,50 +215,19 @@ function processDrivers(from, to, drivers, data) {
             if(userData.groupByDay) {
                 const dates = getDates(from, to)
                 for(const date of dates){
-                    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)
-
-                        const tripsByDay = trips.filter(t => new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay)
-
-                        driverData.summary.push({
-                            date: date,
-                            distance: tripsByDay.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0),
-                            engineHours: tripsByDay.reduce((a, b) => a + b.duration, 0),
-                            maxSpeed: tripsByDay.reduce((a, b) => Math.max(a, b.maxSpeed), 0),
-                            averageSpeed: tripsByDay.length > 0 ? Math.round(tripsByDay.reduce((a, b) => a + b.averageSpeed, 0) / tripsByDay.length) : 0,
-                        })
-                    } else {
-                        if((date.getDay() === 0 && userData.weekDays.sunday) ||
-                            (date.getDay() === 1 && userData.weekDays.monday) ||
-                            (date.getDay() === 2 && userData.weekDays.tuesday) ||
-                            (date.getDay() === 3 && userData.weekDays.wednesday)  ||
-                            (date.getDay() === 4 && userData.weekDays.thursday) ||
-                            (date.getDay() === 5 && userData.weekDays.friday) ||
-                            (date.getDay() === 6 && userData.weekDays.saturday)) {
-
-                            const fromByDay = new Date(new Date(date).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
-                            const toByDay = new Date(new Date(date).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
-
-                            const tripsByDay = trips.filter(t => new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay)
-
-                            driverData.summary.push({
-                                date: date,
-                                distance: tripsByDay.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0),
-                                engineHours: tripsByDay.reduce((a, b) => a + b.duration, 0),
-                                maxSpeed: tripsByDay.reduce((a, b) => Math.max(a, b.maxSpeed), 0),
-                                averageSpeed: tripsByDay.length > 0 ? Math.round(tripsByDay.reduce((a, b) => a + b.averageSpeed, 0) / tripsByDay.length) : 0,
-                            })
-                        }else {
-                            driverData.summary.push({
-                                date: date,
-                                distance: 0,
-                                engineHours: 0,
-                                maxSpeed: 0,
-                                averageSpeed: 0,
-                            })
-                        }
-                    }
+                    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)
+
+                    const tripsByDay = trips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay)
+                    && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData)))
+
+                    driverData.summary.push({
+                        date: date,
+                        distance: tripsByDay.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0),
+                        engineHours: tripsByDay.reduce((a, b) => a + b.duration, 0),
+                        maxSpeed: tripsByDay.reduce((a, b) => Math.max(a, b.maxSpeed), 0),
+                        averageSpeed: tripsByDay.length > 0 ? Math.round(tripsByDay.reduce((a, b) => a + b.averageSpeed, 0) / tripsByDay.length) : 0,
+                    })
                 }
             } else {
                 driverData.summary.push({

package/src/kms-report.js

@@ -8,6 +8,7 @@ const traccar = require("./util/traccar");
 const {getDates} = require("./util/utils");
 const trips = require("./util/trips");
 const drivers = require("./util/driver");
+const {isInsideTimetable} = require("./util/trips");
 
 
 let traccarInstance
@@ -124,41 +125,16 @@ function processDrivers(from, to, drivers, data) {
                 driverData.days = []
                 const dates = getDates(from, to)
                 for(const date of dates){
-                    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)
+                    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)
 
-                        const tripsByDay = trips.filter(t => new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay)
+                    const tripsByDay = trips.filter(t => (new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay)
+                        && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData)))
 
-                        driverData.days.push({
-                            date: date,
-                            kms: tripsByDay.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
-                        })
-                    } else {
-                        if((date.getDay() === 0 && userData.weekDays.sunday) ||
-                            (date.getDay() === 1 && userData.weekDays.monday) ||
-                            (date.getDay() === 2 && userData.weekDays.tuesday) ||
-                            (date.getDay() === 3 && userData.weekDays.wednesday)  ||
-                            (date.getDay() === 4 && userData.weekDays.thursday) ||
-                            (date.getDay() === 5 && userData.weekDays.friday) ||
-                            (date.getDay() === 6 && userData.weekDays.saturday)) {
-
-                            const fromByDay = new Date(new Date(date).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
-                            const toByDay = new Date(new Date(date).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
-
-                            const tripsByDay = trips.filter(t => new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay)
-
-                            driverData.days.push({
-                                date: date,
-                                kms: tripsByDay.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
-                            })
-                        }else {
-                            driverData.days.push({
-                                date: date,
-                                kms: 0
-                            })
-                        }
-                    }
+                    driverData.days.push({
+                        date: date,
+                        kms: tripsByDay.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
+                    })
                 }
             } else {
                 driverData.summary = {