fleetmap-reports 1.0.881 → 1.0.883

package/package.json

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

package/src/partnerReports/dailyuse-report.js

@@ -1,25 +1,62 @@
+const traccarHelper = require('../util/traccar')
+const { isInsideTimetable, isPartialInsideTimetable } = require('../util/trips')
 
 async function createDailyUseReport (from, to, userData, traccar) {
   const reportData = []
 
   const devices = userData.devices
 
+  const allInOne = await traccarHelper.getAllInOne(traccar, from, to, devices, true, true, true, true)
+
   for (const d of devices) {
+    const group = userData.groups.find(g => g.id === d.groupId)
+
+    const deviceTrips = allInOne.trips.filter(t => t.deviceId === d.id)
+    const deviceRoute = allInOne.route.filter(t => t.deviceId === d.id)
+    const deviceStops = allInOne.stops.filter(t => t.deviceId === d.id)
+
+    userData.weekDays = {
+      sunday: true,
+      monday: true,
+      tuesday: true,
+      wednesday: true,
+      thursday: true,
+      friday: true,
+      saturday: true
+    }
+    userData.dayHours = {
+      startTime: '00:00',
+      endTime: '12:00'
+    }
+
+    const morningTrips = deviceTrips.filter(t => isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
+    const morningStart = morningTrips.length && new Date(morningTrips[0].startTime)
+    const morningEnd = morningTrips.length && new Date(morningTrips[morningTrips.length - 1].endTime)
+
+    userData.dayHours = {
+      startTime: '12:00',
+      endTime: '23:59'
+    }
+
+    const afternoonTrips = deviceTrips.filter(t => isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
+    const afternoonStart = afternoonTrips.length && new Date(afternoonTrips[0].startTime)
+    const afternoonEnd = afternoonTrips.length && new Date(afternoonTrips[afternoonTrips.length - 1].endTime)
+
     reportData.push({
       device: d.name,
       licensePlate: d.attributes.license_plate,
-      group: 'group',
-      morningStart: new Date(),
-      morningEnd: new Date(),
-      morningTime: 5000 * 60,
-      lunch: 6000 * 60,
-      afternoonStart: new Date(),
-      afternoonEnd: new Date(),
-      afternoonTime: 5000 * 60,
-      totalTime: 10000 * 60,
-      totalDrivingTime: 3000 * 60,
-      totalStops: 10,
-      totalDistance: 60000
+      group: group ? group.name : '',
+      morningStart,
+      morningEnd,
+      morningTime: morningStart && morningEnd ? morningEnd.getTime() - morningStart.getTime() : 0,
+      lunch: morningEnd && afternoonStart ? afternoonStart.getTime() - morningEnd.getTime() : 0,
+      afternoonStart,
+      afternoonEnd,
+      afternoonTime: afternoonStart && afternoonEnd ? afternoonEnd.getTime() - afternoonStart.getTime() : 0,
+      totalTime: morningStart && afternoonEnd ? afternoonEnd.getTime() - morningStart.getTime() : 0,
+      totalDrivingTime: deviceTrips.reduce((a, b) => a + b.duration, 0),
+      totalStops: deviceStops.length,
+      totalDistance: deviceTrips.reduce((a, b) => a + b.distance, 0)
     })
   }
 

package/src/tests/performance.test.js

@@ -2,6 +2,7 @@ const { getReports } = require('./index')
 const { createPerformanceReport } = require('../partnerReports/performance-report')
 const assert = require('assert')
 const { convertMS } = require('../util/utils')
+const {createDailyUseReport} = require("../partnerReports/dailyuse-report");
 // eslint-disable-next-line no-undef
 describe('performance', function () {
   // eslint-disable-next-line no-undef
@@ -33,4 +34,15 @@ describe('performance', function () {
     console.log(data)
     assert.equal(data[0].consumption, 168.51989999999998)
   }, 8000000)
+
+  it('dailyuse report inofleet', async () => {
+    const report = await getReports()
+    const userData = await report.getUserData()
+    const data = await createDailyUseReport(
+        new Date(Date.UTC(2023, 9, 1, 0, 0, 0, 0)),
+        new Date(Date.UTC(2023, 9, 1, 23, 59, 59, 0)),
+        userData,
+        report.traccar)
+    console.log(data)
+  }, 8000000)
 })