fleetmap-reports 2.0.70 → 2.0.72
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/RapportPerformance.xlsx +0 -0
- package/package.json +1 -1
- package/src/partnerReports/dailyuse-report.js +73 -1
- package/src/partnerReports/delayedstart-report.js +69 -0
- package/src/partnerReports/gpsjump-report.js +4 -5
- package/src/partnerReports/passenger-report.js +46 -0
- package/src/tests/dailyuse.test.js +19 -0
- package/src/tests/fuel.test.js +13 -0
- package/src/tests/gpsjump.test.js +23 -0
- package/src/tests/kms.test.js +19 -0
- package/src/tests/zones.test.js +17 -0
- package/src/trip-report.js +4 -5
|
Binary file
|
package/package.json
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
const traccarHelper = require('../util/traccar')
|
|
2
2
|
const { isInsideTimetable } = require('../util/trips')
|
|
3
|
-
const { convertFromUTCDate } = require('../util/utils')
|
|
3
|
+
const { convertFromUTCDate, getTranslations, convertMS, convertToLocaleTimeString, isClientSide } = require('../util/utils')
|
|
4
4
|
const automaticReports = require('../automaticReports')
|
|
5
|
+
const jsPDF = require('jspdf')
|
|
6
|
+
const { getStyle } = require('../reportStyle')
|
|
7
|
+
const { getUserPartner } = require('fleetmap-partners')
|
|
8
|
+
const { addTable, headerFromUser } = require('../util/pdfDocument')
|
|
5
9
|
|
|
6
10
|
async function createDailyUseReport (from, to, userData, traccar) {
|
|
7
11
|
const reportData = []
|
|
@@ -77,4 +81,72 @@ function processDeviceData (allInOne, d, userData) {
|
|
|
77
81
|
}
|
|
78
82
|
}
|
|
79
83
|
|
|
84
|
+
async function exportDailyUseReportToPDF (userData, reportData) {
|
|
85
|
+
const translations = getTranslations(userData)
|
|
86
|
+
const timezone = userData.user.attributes.timezone
|
|
87
|
+
const lang = userData.user.attributes.lang || (isClientSide() && navigator.language)
|
|
88
|
+
|
|
89
|
+
const headers = [
|
|
90
|
+
translations.report.vehicle,
|
|
91
|
+
'Immatriculation',
|
|
92
|
+
'Groupe',
|
|
93
|
+
'Matin départ',
|
|
94
|
+
'Matin arrêt',
|
|
95
|
+
'Matin temps',
|
|
96
|
+
'Déjeuner',
|
|
97
|
+
'Après-midi départ',
|
|
98
|
+
'Après-midi arrêt',
|
|
99
|
+
'Après-midi temps',
|
|
100
|
+
'Total temps',
|
|
101
|
+
'Total conduit',
|
|
102
|
+
'Total arrêts',
|
|
103
|
+
'Total kms'
|
|
104
|
+
]
|
|
105
|
+
|
|
106
|
+
const data = []
|
|
107
|
+
reportData.forEach(d => {
|
|
108
|
+
const row = [
|
|
109
|
+
d.device,
|
|
110
|
+
d.licensePlate,
|
|
111
|
+
d.group,
|
|
112
|
+
convertToLocaleTimeString(d.morningStart, lang, timezone, userData.user),
|
|
113
|
+
convertToLocaleTimeString(d.morningEnd, lang, timezone, userData.user),
|
|
114
|
+
convertMS(d.morningTime),
|
|
115
|
+
convertMS(d.lunch),
|
|
116
|
+
convertToLocaleTimeString(d.afternoonStart, lang, timezone, userData.user),
|
|
117
|
+
convertToLocaleTimeString(d.afternoonEnd, lang, timezone, userData.user),
|
|
118
|
+
convertMS(d.afternoonTime),
|
|
119
|
+
convertMS(d.totalTime),
|
|
120
|
+
convertMS(d.totalDrivingTime),
|
|
121
|
+
d.totalStops,
|
|
122
|
+
(d.totalDistance / 100).toFixed(1)
|
|
123
|
+
]
|
|
124
|
+
data.push(row)
|
|
125
|
+
})
|
|
126
|
+
|
|
127
|
+
const doc = new jsPDF.jsPDF('l')
|
|
128
|
+
await headerFromUser(doc, 'Rapport de Performance', userData.user)
|
|
129
|
+
const style = getStyle(getUserPartner(userData.user))
|
|
130
|
+
|
|
131
|
+
const footValues = []
|
|
132
|
+
|
|
133
|
+
doc.setFontSize(11)
|
|
134
|
+
doc.text(new Date(userData.from).toLocaleString() + ' - ' + new Date(userData.to).toLocaleString(), 20, 33)
|
|
135
|
+
|
|
136
|
+
style.headerFontSize = 8
|
|
137
|
+
style.bodyFontSize = 7
|
|
138
|
+
const columnStyles = {}
|
|
139
|
+
for (let i = 3; i < 14; i++) {
|
|
140
|
+
columnStyles[i] = { halign: 'right' }
|
|
141
|
+
}
|
|
142
|
+
addTable(doc, headers, data, footValues, style, 40, columnStyles)
|
|
143
|
+
return doc
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
function exportDailyUseReportToExcel (userData, reportData) {
|
|
147
|
+
|
|
148
|
+
}
|
|
149
|
+
|
|
80
150
|
exports.createDailyUseReport = createDailyUseReport
|
|
151
|
+
exports.exportDailyUseReportToPDF = exportDailyUseReportToPDF
|
|
152
|
+
exports.exportDailyUseReportToExcel = exportDailyUseReportToExcel
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
const automaticReports = require('../automaticReports')
|
|
2
|
+
const traccarHelper = require('../util/traccar')
|
|
3
|
+
const { getDates, getTranslations } = require('../util/utils')
|
|
4
|
+
const { getUserPartner } = require('fleetmap-partners')
|
|
5
|
+
const { getDataByDay } = require('../util/trips')
|
|
6
|
+
|
|
7
|
+
async function createDelayedStartReport (from, to, userData, traccar) {
|
|
8
|
+
const reportData = []
|
|
9
|
+
|
|
10
|
+
const devices = userData.devices
|
|
11
|
+
|
|
12
|
+
const sliced = automaticReports.sliceArray(devices, 5)
|
|
13
|
+
let deviceCount = 0
|
|
14
|
+
for (const slice of sliced) {
|
|
15
|
+
const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, false, true, true, false, deviceCount, devices.length)
|
|
16
|
+
|
|
17
|
+
for (const d of slice) {
|
|
18
|
+
const deviceData = await processDeviceData(from, to, allInOne, d, userData, traccar)
|
|
19
|
+
reportData.push(deviceData)
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
deviceCount = deviceCount + slice.length
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
return reportData
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
async function processDeviceData (from, to, allInOne, d, userData, traccar) {
|
|
29
|
+
const group = userData.groups.find(g => g.id === d.groupId)
|
|
30
|
+
const trips = allInOne.trips.filter(t => t.deviceId === d.id)
|
|
31
|
+
const translations = getTranslations(userData)
|
|
32
|
+
|
|
33
|
+
const weekDays = [
|
|
34
|
+
translations.report.sunday,
|
|
35
|
+
translations.report.monday,
|
|
36
|
+
translations.report.tuesday,
|
|
37
|
+
translations.report.wednesday,
|
|
38
|
+
translations.report.thursday,
|
|
39
|
+
translations.report.friday,
|
|
40
|
+
translations.report.saturday
|
|
41
|
+
]
|
|
42
|
+
|
|
43
|
+
const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
|
|
44
|
+
|
|
45
|
+
const deviceData = {
|
|
46
|
+
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
for (const date of dates) {
|
|
50
|
+
const { tripsByDay } = await getDataByDay(d, date, { trips }, userData, traccar)
|
|
51
|
+
|
|
52
|
+
if (tripsByDay.length > 0) {
|
|
53
|
+
const startTime = tripsByDay[0].startTime
|
|
54
|
+
const stopTime = tripsByDay[tripsByDay.length].endTime
|
|
55
|
+
|
|
56
|
+
const deviceDayData = {
|
|
57
|
+
device: d.name,
|
|
58
|
+
licensePlate: d.attributes.license_plate,
|
|
59
|
+
group: group ? group.name : '',
|
|
60
|
+
driver: '',
|
|
61
|
+
weekDay: weekDays[new Date(date).getDay()],
|
|
62
|
+
startDate: '',
|
|
63
|
+
startTime: '',
|
|
64
|
+
delayDescription: '',
|
|
65
|
+
stopTime: ''
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
const automaticReports = require('../automaticReports')
|
|
2
2
|
const traccarHelper = require('../util/traccar')
|
|
3
3
|
const distance = require('@turf/distance')
|
|
4
|
-
const { convertToLocaleString } = require('../util/utils')
|
|
5
4
|
|
|
6
5
|
async function createGPSJumpReport (from, to, userData, traccar, minDistance) {
|
|
7
6
|
let reportData = []
|
|
@@ -19,7 +18,7 @@ async function createGPSJumpReport (from, to, userData, traccar, minDistance) {
|
|
|
19
18
|
})
|
|
20
19
|
|
|
21
20
|
slice.forEach(d => {
|
|
22
|
-
const deviceData = getDeviceData(allInOne, d, userData.user, minDistance)
|
|
21
|
+
const deviceData = getDeviceData(allInOne, d, userData.user, minDistance || userData.minDistance)
|
|
23
22
|
reportData = reportData.concat(deviceData)
|
|
24
23
|
})
|
|
25
24
|
|
|
@@ -40,9 +39,9 @@ function getDeviceData (allInOne, d, user, minDistance) {
|
|
|
40
39
|
if ((minDistance * 1000) < distanceValue) {
|
|
41
40
|
return {
|
|
42
41
|
device: d.name,
|
|
43
|
-
dateA:
|
|
42
|
+
dateA: pA.fixTime,
|
|
44
43
|
addressA: pA.address,
|
|
45
|
-
dateB:
|
|
44
|
+
dateB: pB.fixTime,
|
|
46
45
|
addressB: pB.address,
|
|
47
46
|
distance: distanceValue
|
|
48
47
|
}
|
|
@@ -50,7 +49,7 @@ function getDeviceData (allInOne, d, user, minDistance) {
|
|
|
50
49
|
}
|
|
51
50
|
}
|
|
52
51
|
return undefined
|
|
53
|
-
}).filter(a => a)
|
|
52
|
+
}).filter(a => a).sort((a, b) => (a.device > b.device) ? 1 : -1)
|
|
54
53
|
}
|
|
55
54
|
|
|
56
55
|
async function exportGPSJumpReportToPDF (userData, reportData) {
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
async function createPassengerReport (from, to, userData, traccar) {
|
|
2
|
+
//const allDevices = await traccar.axios.get('/devices').then(d => d.data)
|
|
3
|
+
const devices = userData.devices
|
|
4
|
+
const drivers = await traccar.axios.get('/drivers').then(d => d.data)
|
|
5
|
+
const groups = await traccar.axios.get('/groups').then(d => d.data)
|
|
6
|
+
await Promise.all(groups.map(async g => {
|
|
7
|
+
const driversByGroup = await traccar.axios.get(`/drivers?groupId=${g.id}`).then(d => d.data)
|
|
8
|
+
driversByGroup.forEach(d => {
|
|
9
|
+
const _driver = drivers.find(a => a.id === d.id)
|
|
10
|
+
if (_driver) {
|
|
11
|
+
_driver.groupName = g.name
|
|
12
|
+
}
|
|
13
|
+
})
|
|
14
|
+
}))
|
|
15
|
+
const eventsUrl = `/reports/events?${devices.map(d => 'deviceId=' + d.id).join('&')
|
|
16
|
+
}&from=${from.toISOString()
|
|
17
|
+
}&to=${to.toISOString()
|
|
18
|
+
}`
|
|
19
|
+
const positionsUrl = `/reports/route?${devices.map(d => 'deviceId=' + d.id).join('&')
|
|
20
|
+
}&from=${from.toISOString()
|
|
21
|
+
}&to=${to.toISOString()
|
|
22
|
+
}`
|
|
23
|
+
const events = await traccar.axios.get(eventsUrl).then(d => d.data)
|
|
24
|
+
const positions = await traccar.axios.get(positionsUrl).then(d => d.data)
|
|
25
|
+
events.forEach(e => {
|
|
26
|
+
delete e.attributes
|
|
27
|
+
const driver = getDriver(e, positions, drivers)
|
|
28
|
+
const position = positions.find(p => p.id === e.positionId)
|
|
29
|
+
e.deviceName = devices.find(d => d.id === e.deviceId).name
|
|
30
|
+
e.groupName = driver.groupName || ''
|
|
31
|
+
e.fixtime = position && new Date(position.fixTime)
|
|
32
|
+
e.notes = driver && driver.attributes.notes
|
|
33
|
+
e.driverName = (driver && driver.name) || (position && position.attributes.driverUniqueId)
|
|
34
|
+
})
|
|
35
|
+
return events
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
function getDriver (event, positions, drivers) {
|
|
39
|
+
const p = positions.find(p => p.id === event.positionId)
|
|
40
|
+
if (!p) { return '' }
|
|
41
|
+
const d = drivers.find(d => d.uniqueId === p.attributes.driverUniqueId)
|
|
42
|
+
if (!d) { return '' }
|
|
43
|
+
return d
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
exports.createPassengerReport = createPassengerReport
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
const { getReports } = require('./index')
|
|
2
|
+
const assert = require('assert')
|
|
3
|
+
const { createDailyUseReport } = require('../partnerReports/dailyuse-report')
|
|
4
|
+
|
|
5
|
+
describe('dailyuse', function () {
|
|
6
|
+
// eslint-disable-next-line no-undef
|
|
7
|
+
it('dailyuse report', async () => {
|
|
8
|
+
const report = await getReports()
|
|
9
|
+
const userData = await report.getUserData()
|
|
10
|
+
|
|
11
|
+
const data = await createDailyUseReport(
|
|
12
|
+
new Date(Date.UTC(2023, 10, 1, 0, 0, 0, 0)),
|
|
13
|
+
new Date(Date.UTC(2023, 10, 6, 23, 59, 59, 0)),
|
|
14
|
+
userData,
|
|
15
|
+
report.traccar)
|
|
16
|
+
console.log(data)
|
|
17
|
+
assert.equal(data[0].consumption, 19.799999999999997)
|
|
18
|
+
}, 8000000)
|
|
19
|
+
})
|
package/src/tests/fuel.test.js
CHANGED
|
@@ -18,4 +18,17 @@ describe('Test_Reports', function () {
|
|
|
18
18
|
const device = data[0].devices.find(d => d.device.id === deviceId)
|
|
19
19
|
assert.equal(device.trips.length, 9) // Total Trips
|
|
20
20
|
}, 30000)
|
|
21
|
+
|
|
22
|
+
it('Fuel Consumption 1', async () => {
|
|
23
|
+
console.log('trip by device')
|
|
24
|
+
const report = await getReports('fleetmap.joao.penas5@gmail.com', 'penas46881')
|
|
25
|
+
const userData = await report.getUserData()
|
|
26
|
+
|
|
27
|
+
const data = await report.fuelConsumptionReport(new Date(2024, 2, 15, 0, 0, 0, 0),
|
|
28
|
+
new Date(2024, 2, 15, 23, 59, 59, 0),
|
|
29
|
+
userData)
|
|
30
|
+
|
|
31
|
+
const device = data[0].devices.find(d => d.device.id === 134090)
|
|
32
|
+
assert.equal(device.days[0].spentFuel, 9)
|
|
33
|
+
}, 30000)
|
|
21
34
|
})
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
const { getReports } = require('./index')
|
|
2
|
+
const assert = require('assert')
|
|
3
|
+
const { convertMS } = require('../util/utils')
|
|
4
|
+
const { createGPSJumpReport } = require('../partnerReports/gpsjump-report')
|
|
5
|
+
|
|
6
|
+
// eslint-disable-next-line no-undef
|
|
7
|
+
describe('gpsjump', function () {
|
|
8
|
+
// eslint-disable-next-line no-undef
|
|
9
|
+
it('gpsjump report', async () => {
|
|
10
|
+
const report = await getReports()
|
|
11
|
+
const userData = await report.getUserData()
|
|
12
|
+
userData.devices = userData.devices.filter(d => d.id === 22326)
|
|
13
|
+
const data = await createGPSJumpReport(
|
|
14
|
+
new Date(Date.UTC(2023, 6, 1, 0, 0, 0, 0)),
|
|
15
|
+
new Date(Date.UTC(2023, 6, 17, 23, 59, 59, 0)),
|
|
16
|
+
userData,
|
|
17
|
+
report.traccar)
|
|
18
|
+
console.log(data)
|
|
19
|
+
assert.equal(data[0].consumption, 19.799999999999997)
|
|
20
|
+
assert.equal(data[0].distance, 326.7657)
|
|
21
|
+
assert.equal(convertMS(data[1].time * 1000, false), '08:19')
|
|
22
|
+
}, 8000000)
|
|
23
|
+
})
|
package/src/tests/kms.test.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/* eslint-disable no-undef */
|
|
2
2
|
const { getReports } = require('./index')
|
|
3
3
|
const assert = require('assert')
|
|
4
|
+
const {convertFromUTC, convertFromLocal} = require("../util/utils");
|
|
4
5
|
|
|
5
6
|
describe('Kms_Reports', function () {
|
|
6
7
|
// eslint-disable-next-line no-undef
|
|
@@ -52,4 +53,22 @@ describe('Kms_Reports', function () {
|
|
|
52
53
|
assert.equal(device.days.length, 30) // Total Kms
|
|
53
54
|
assert.equal(device.days[29].kms, 136174.93281451002) // Total Kms
|
|
54
55
|
}, 30000)
|
|
56
|
+
it('KmsReport by driver', async () => {
|
|
57
|
+
const reports = await getReports(process.env.USER_CTM_MOVIFLOTTE, process.env.PASS_CTM_MOVIFLOTTE)
|
|
58
|
+
const userData = await reports.getUserData()
|
|
59
|
+
userData.byDriver = true
|
|
60
|
+
console.log(userData.drivers)
|
|
61
|
+
const data = await reports.kmsReport(new Date(2024, 0, 1, 0, 0, 0), new Date(2024, 0, 31, 23, 59, 59),
|
|
62
|
+
userData)
|
|
63
|
+
assert.equal(data.length, 1)
|
|
64
|
+
}, 3000000)
|
|
65
|
+
it('KmsReport by timezone marrocos', async () => {
|
|
66
|
+
const reports = await getReports(process.env.email, process.env.password)
|
|
67
|
+
const userData = await reports.getUserData()
|
|
68
|
+
userData.groupByDay = true
|
|
69
|
+
const data = await reports.kmsReport(convertFromLocal(new Date(2024, 3, 5, 0, 0, 0), userData.user.attributes.timezone), convertFromLocal(new Date(2024, 3, 5, 23, 59, 59), userData.user.attributes.timezone),
|
|
70
|
+
userData)
|
|
71
|
+
const device = data[0].devices.find(d => d.device.id === 292563)
|
|
72
|
+
assert.equal(device, 1)
|
|
73
|
+
}, 3000000)
|
|
55
74
|
})
|
package/src/tests/zones.test.js
CHANGED
|
@@ -159,4 +159,21 @@ describe('zones', function () {
|
|
|
159
159
|
console.log(first)
|
|
160
160
|
assert.equal(first.days[6].distanceOut, 867.0554430738234)
|
|
161
161
|
}, 4000000)
|
|
162
|
+
|
|
163
|
+
it('works with casais zones in columns 7', async () => {
|
|
164
|
+
const report = await getReports()
|
|
165
|
+
const userData = await report.getUserData()
|
|
166
|
+
userData.zonesByColumn = true
|
|
167
|
+
userData.devices = userData.devices.filter(d => d.id === 81166)
|
|
168
|
+
userData.geofences = userData.geofences.filter(g => g.name === 'baliza 1 - raio verde ' ||
|
|
169
|
+
g.name === 'baliza 2 - raio amarelo')
|
|
170
|
+
userData.onlyWithKmsOut = false
|
|
171
|
+
const result = await report.zoneReport(
|
|
172
|
+
new Date(Date.UTC(2023, 9, 9, 0, 0, 0, 0)),
|
|
173
|
+
new Date(Date.UTC(2023, 9, 31, 23, 59, 59, 0)),
|
|
174
|
+
userData)
|
|
175
|
+
const first = result[0].devices[0]
|
|
176
|
+
console.log(first)
|
|
177
|
+
assert.equal(first.days[17].distanceOut, 720.7985320478997)
|
|
178
|
+
}, 4000000)
|
|
162
179
|
})
|
package/src/trip-report.js
CHANGED
|
@@ -455,9 +455,6 @@ async function exportTripReportToPDF (userData, reportData) {
|
|
|
455
455
|
headers, data, footValues, style,
|
|
456
456
|
space + (userData.allWeek ? 40 : 45),
|
|
457
457
|
{
|
|
458
|
-
0: { halign: 'right' },
|
|
459
|
-
1: { halign: 'right' },
|
|
460
|
-
2: { halign: 'right' },
|
|
461
458
|
4: { halign: 'right' },
|
|
462
459
|
5: { halign: 'right' },
|
|
463
460
|
6: { halign: 'right' },
|
|
@@ -595,8 +592,10 @@ function getTripEnd (user, trip) {
|
|
|
595
592
|
}
|
|
596
593
|
|
|
597
594
|
function getSumTotalKms (user, data) {
|
|
598
|
-
const values = data.map(item =>
|
|
599
|
-
|
|
595
|
+
const values = data.map(item => {
|
|
596
|
+
return item.totalKms ? parseFloat(item.totalKms) : 0
|
|
597
|
+
})
|
|
598
|
+
return Intl.NumberFormat(user.attributes.lang, { maximumFractionDigits: 1 }).format(values.reduce((a, b) => a + b, 0))
|
|
600
599
|
}
|
|
601
600
|
|
|
602
601
|
function getSumAvgSpeed (data) {
|