fleetmap-reports 1.0.263 → 1.0.264

package/.idea/workspace.xml

@@ -1,11 +1,13 @@
 <?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 activity report by driver">
+    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="activity report by driver grouped by day">
       <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/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" />
@@ -219,7 +221,8 @@
       <workItem from="1640866364417" duration="67000" />
       <workItem from="1640866782794" duration="123000" />
       <workItem from="1640866964393" duration="1022000" />
-      <workItem from="1640870147277" duration="6811000" />
+      <workItem from="1640870147277" duration="8236000" />
+      <workItem from="1641321068227" duration="13602000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>
@@ -361,7 +364,14 @@
       <option name="project" value="LOCAL" />
       <updated>1640872780968</updated>
     </task>
-    <option name="localTasksCounter" value="21" />
+    <task id="LOCAL-00021" summary="activity report by driver grouped by day">
+      <created>1640878664617</created>
+      <option name="number" value="00021" />
+      <option name="presentableId" value="LOCAL-00021" />
+      <option name="project" value="LOCAL" />
+      <updated>1640878664617</updated>
+    </task>
+    <option name="localTasksCounter" value="22" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -399,6 +409,7 @@
     <MESSAGE value="timezone - check if it's running on client side" />
     <MESSAGE value="calculate avg speed" />
     <MESSAGE value="fix activity report by driver" />
-    <option name="LAST_COMMIT_MESSAGE" value="fix activity report by driver" />
+    <MESSAGE value="activity report by driver grouped by day" />
+    <option name="LAST_COMMIT_MESSAGE" value="activity report by driver grouped by day" />
   </component>
 </project>

package/package.json

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

package/src/activity-report.js

@@ -87,6 +87,9 @@ async function createActivityReportByDevice(from, to){
     //Get report data from traccar
     devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
+    // use the km report to calculate kms
+    const kmsReport = await createKmsReport(from, to, userData, traccarInstance)
+
     let data = []
     if(userData.groupByDay) {
         const dates = getDates(from, to)
@@ -110,9 +113,33 @@ async function createActivityReportByDevice(from, to){
                     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 summary = await traccar.getSummary(traccarInstance, fromByDay, toByDay, devicesToProcess)
-                    summary.forEach(s => s.date = date)
-                    data = data.concat(summary)
+                    if(fromByDay.getTime() < toByDay.getTime()) {
+                        const summary = await traccar.getSummary(traccarInstance, new Date(fromByDay.toUTCString()), new Date(toByDay.toUTCString()), devicesToProcess)
+                        summary.forEach(s => s.date = date)
+                        data = data.concat(summary)
+                    } else {
+                        const dayStart = new Date(new Date(date).toISOString().split('T')[0] + ' 00:00:00')
+                        const dayEnd = new Date(new Date(date).toISOString().split('T')[0] + ' 23:59:59')
+
+                        const summaryStart = await traccar.getSummary(traccarInstance, new Date(dayStart.toUTCString()), new Date(toByDay.toUTCString()), devicesToProcess)
+                        const summaryEnd = await traccar.getSummary(traccarInstance, new Date(fromByDay.toUTCString()), new Date(dayEnd.toUTCString()), devicesToProcess)
+
+                        const summary = []
+                        summaryStart.forEach(s => {
+                            const sEnd = summaryEnd.find(a => s.deviceId === a.deviceId)
+                            summary.push({
+                                date: date,
+                                deviceId: s.deviceId,
+                                averageSpeed: (s.averageSpeed + sEnd.averageSpeed) / 2,
+                                distance: s.distance + sEnd.distance,
+                                engineHours: s.engineHours + sEnd.engineHours,
+                                maxSpeed: s.maxSpeed > sEnd.maxSpeed ? s.maxSpeed : sEnd.maxSpeed,
+                                endOdometer: 0,
+                                startOdometer: 0
+                            })
+                        })
+                        data = data.concat(summary)
+                    }
                 }else {
                     data = data.concat({date: date})
                 }
@@ -122,9 +149,6 @@ async function createActivityReportByDevice(from, to){
         data = await traccar.getSummary(traccarInstance, from, to, devicesToProcess)
     }
 
-    // use the km report to calculate kms
-    const kmsReport = await createKmsReport(from, to, userData, traccarInstance)
-
     console.log('Summary:' + data.length)
 
     //Process report data

package/src/kms-report.js

@@ -7,6 +7,7 @@ const {getUserPartner} = require("fleetmap-partners");
 const traccar = require("./util/traccar");
 const {getDates} = require("./util/utils");
 const trips = require("./util/trips");
+const drivers = require("./util/driver");
 
 
 let traccarInstance
@@ -39,13 +40,90 @@ async function createKmsReportByDevice(from, to) {
 }
 
 async function createKmsReportByDriver(from, to) {
+    const deviceIds = await drivers.devicesByDriver(traccarInstance, from, to, userData.drivers, userData.devices)
+    console.log(deviceIds.length)
 
+    let tripsData = []
+    if(deviceIds.length > 0) {
+        const response = await traccarInstance.reports.reportsTripsGet(from, to, deviceIds)
+        tripsData = response.data
+    }
+
+    const allData = {
+        drivers: []
+    }
+
+    allData.drivers = processDrivers(from, to, userData.drivers, tripsData)
+
+    return allData
 }
 
 async function createKmsReportByGroup(from, to) {
 
 }
 
+function processDrivers(from, to, drivers, data) {
+    console.log(data)
+    const driversResult = []
+    drivers.forEach(d => {
+        const trips = data.filter(t => t.driverUniqueId === d.uniqueId)
+        if (trips.length > 0) {
+            const driverData = {
+                driver: d
+            }
+            if(userData.groupByDay) {
+                driverData.days = []
+                const dates = getDates(from, to)
+                for(const date of dates){
+                    if(userData.allWeek){
+                        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.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
+                            })
+                        }
+                    }
+                }
+            } else {
+                driverData.summary = {
+                    distance: trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
+                }
+            }
+            driversResult.push(driverData)
+        }
+    })
+
+    return driversResult
+}
+
+
 function processDevices(from, to, devices, route, trips) {
     const devicesResult = []
 

package/src/trip-report.js

@@ -471,7 +471,12 @@ function isInsideTimetable(t, userData){
         console.log(tripStart, startDate, endDate)
 
         //Trips inside time period
-        return tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDate.getTime()
+        if(startDate.getTime() < endDate.getTime()) {
+            return tripStart.getTime() > startDate.getTime() && tripEnd.getTime() < endDate.getTime()
+        } else {
+            return (tripStart.getTime() < endDate.getTime() && tripEnd.getTime() < endDate.getTime()) ||
+                (tripStart.getTime() > startDate.getTime())
+        }
     }
 
     return false