fleetmap-reports 2.0.383 → 2.0.385
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/lang/enGB.js +5 -0
- package/lang/esCL.js +5 -0
- package/lang/frFR.json +6 -1
- package/lang/ptBR.js +5 -0
- package/lang/ptPT.js +5 -0
- package/package.json +1 -1
- package/src/index.js +10 -0
- package/src/rpm-report.js +194 -0
- package/src/sensor-report.js +4 -4
- package/src/tests/rpm.test.js +33 -0
package/lang/enGB.js
CHANGED
|
@@ -195,6 +195,11 @@ module.exports = {
|
|
|
195
195
|
titleStopReport: 'Stop Report',
|
|
196
196
|
titleDriverRankingReport: 'Driver Ranking Report',
|
|
197
197
|
titleSensorReport: 'Sensor Report',
|
|
198
|
+
titleRPMReport: 'RPM Report',
|
|
199
|
+
rpmThreshold: 'RPM Threshold',
|
|
200
|
+
timeAboveRPM: 'Time above threshold',
|
|
201
|
+
sensor: 'Sensor',
|
|
202
|
+
status: 'Status',
|
|
198
203
|
rank: 'Rank',
|
|
199
204
|
grade: 'Grade',
|
|
200
205
|
safetyScore: 'Safety',
|
package/lang/esCL.js
CHANGED
|
@@ -185,6 +185,11 @@ module.exports = {
|
|
|
185
185
|
titleStopReport: 'Informe de Paradas',
|
|
186
186
|
titleDriverRankingReport: 'Informe de Ranking de Conductores',
|
|
187
187
|
titleSensorReport: 'Informe de Sensores',
|
|
188
|
+
titleRPMReport: 'Informe de RPM',
|
|
189
|
+
rpmThreshold: 'Umbral de RPM',
|
|
190
|
+
timeAboveRPM: 'Tiempo sobre el umbral',
|
|
191
|
+
sensor: 'Sensor',
|
|
192
|
+
status: 'Estado',
|
|
188
193
|
rank: 'Posición',
|
|
189
194
|
grade: 'Calificación',
|
|
190
195
|
safetyScore: 'Seguridad',
|
package/lang/frFR.json
CHANGED
|
@@ -195,7 +195,12 @@
|
|
|
195
195
|
"titleStopReport": "Arrêter le rapport",
|
|
196
196
|
"titleDelayedStartReport": "Rapport de Departs Tardifs",
|
|
197
197
|
"titleDriverRankingReport": "Rapport d'conducteur",
|
|
198
|
-
"titleSensorReport": "
|
|
198
|
+
"titleSensorReport": "Rapport de capteurs",
|
|
199
|
+
"titleRPMReport": "Rapport de RPM",
|
|
200
|
+
"rpmThreshold": "Seuil de RPM",
|
|
201
|
+
"timeAboveRPM": "Temps au-dessus du seuil",
|
|
202
|
+
"sensor": "Capteur",
|
|
203
|
+
"status": "État",
|
|
199
204
|
"from": "Dans",
|
|
200
205
|
"to": "Le",
|
|
201
206
|
"headerStartAddress": "lieu de départ",
|
package/lang/ptBR.js
CHANGED
|
@@ -187,6 +187,11 @@ module.exports = {
|
|
|
187
187
|
titleStopReport: 'Relatório de Paragens',
|
|
188
188
|
titleDriverRankingReport: 'Relatório de Ranking de Motoristas',
|
|
189
189
|
titleSensorReport: 'Relatório de Sensores',
|
|
190
|
+
titleRPMReport: 'Relatório de RPM',
|
|
191
|
+
rpmThreshold: 'Limite de RPM',
|
|
192
|
+
timeAboveRPM: 'Tempo acima do limite',
|
|
193
|
+
sensor: 'Sensor',
|
|
194
|
+
status: 'Estado',
|
|
190
195
|
rank: 'Posição',
|
|
191
196
|
grade: 'Nota',
|
|
192
197
|
safetyScore: 'Segurança',
|
package/lang/ptPT.js
CHANGED
|
@@ -193,6 +193,11 @@ module.exports = {
|
|
|
193
193
|
titleStopReport: 'Relatório de Paragens',
|
|
194
194
|
titleDriverRankingReport: 'Relatório de Ranking de Condutores',
|
|
195
195
|
titleSensorReport: 'Relatório de Sensores',
|
|
196
|
+
titleRPMReport: 'Relatório de RPM',
|
|
197
|
+
rpmThreshold: 'Limite de RPM',
|
|
198
|
+
timeAboveRPM: 'Tempo acima do limite',
|
|
199
|
+
sensor: 'Sensor',
|
|
200
|
+
status: 'Estado',
|
|
196
201
|
rank: 'Posição',
|
|
197
202
|
grade: 'Nota',
|
|
198
203
|
safetyScore: 'Segurança',
|
package/package.json
CHANGED
package/src/index.js
CHANGED
|
@@ -240,5 +240,15 @@ function Reports (config, axios) {
|
|
|
240
240
|
this.sensorReportToPDF = (userData, reportData) => {
|
|
241
241
|
return require('./sensor-report').exportToPDF(userData, reportData)
|
|
242
242
|
}
|
|
243
|
+
|
|
244
|
+
this.rpmReport = (from, to, userData) => {
|
|
245
|
+
return require('./rpm-report').createRPMReport(from, to, userData, this.traccar)
|
|
246
|
+
}
|
|
247
|
+
this.rpmReportToPDF = (userData, reportData) => {
|
|
248
|
+
return require('./rpm-report').exportRPMReportToPDF(userData, reportData)
|
|
249
|
+
}
|
|
250
|
+
this.rpmReportToExcel = (userData, reportData) => {
|
|
251
|
+
return require('./rpm-report').exportRPMReportToExcel(userData, reportData)
|
|
252
|
+
}
|
|
243
253
|
}
|
|
244
254
|
module.exports = Reports
|
|
@@ -0,0 +1,194 @@
|
|
|
1
|
+
const jsPDF = require('jspdf')
|
|
2
|
+
require('jspdf-autotable')
|
|
3
|
+
const { getStyle } = require('./reportStyle')
|
|
4
|
+
const { headerFromUser, addTable, pdfPageByDay } = require('./util/pdfDocument')
|
|
5
|
+
const { getUserPartner } = require('fleetmap-partners')
|
|
6
|
+
const traccar = require('./util/traccar')
|
|
7
|
+
const { getDates, getTranslations, convertMS } = require('./util/utils')
|
|
8
|
+
const { devicesToProcess } = require('./util/device')
|
|
9
|
+
const automaticReports = require('./automaticReports')
|
|
10
|
+
const { calculateRPMSections } = require('./partnerReports/performance-report')
|
|
11
|
+
|
|
12
|
+
const fileName = 'RPMReport'
|
|
13
|
+
const defaultThreshold = 2500
|
|
14
|
+
|
|
15
|
+
async function createRPMReport (from, to, userData, traccarInstance) {
|
|
16
|
+
console.log('Create RPMReport', from, to)
|
|
17
|
+
const allDevices = devicesToProcess(userData)
|
|
18
|
+
|
|
19
|
+
const allData = {
|
|
20
|
+
devices: [],
|
|
21
|
+
from,
|
|
22
|
+
to
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
const dates = getDates(from, to, userData.user.attributes.timezone || getUserPartner(userData.user).timezone)
|
|
26
|
+
|
|
27
|
+
let deviceCount = 0
|
|
28
|
+
const sliced = automaticReports.sliceArray(allDevices, 20)
|
|
29
|
+
for (const devices of sliced) {
|
|
30
|
+
const { route } = await traccar.getAllInOne(traccarInstance, from, to, devices, true, false, false, false, deviceCount, allDevices.length, 10, 1)
|
|
31
|
+
for (const d of devices) {
|
|
32
|
+
const deviceRoute = route.filter(p => p.deviceId === d.id && p.attributes.rpm !== undefined)
|
|
33
|
+
if (deviceRoute.length) {
|
|
34
|
+
allData.devices.push(processDevice(d, deviceRoute, dates))
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
deviceCount += devices.length
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
return [allData]
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
function getThreshold (device) {
|
|
44
|
+
return Number(device.attributes.highRPM) || defaultThreshold
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
function dayKey (date) {
|
|
48
|
+
return date.getFullYear() + '-' + date.getMonth() + '-' + date.getDate()
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
// time between consecutive positions that are both above the threshold, attributed to the day of the first one
|
|
52
|
+
function processDevice (device, deviceRoute, dates) {
|
|
53
|
+
const threshold = getThreshold(device)
|
|
54
|
+
const days = dates.map(date => ({ date, time: 0 }))
|
|
55
|
+
calculateRPMSections(deviceRoute, threshold).forEach(section => {
|
|
56
|
+
for (let i = 1; i < section.length; i++) {
|
|
57
|
+
const start = new Date(section[i - 1].fixTime)
|
|
58
|
+
const duration = new Date(section[i].fixTime).getTime() - start.getTime()
|
|
59
|
+
const day = days.find(a => dayKey(a.date) === dayKey(start))
|
|
60
|
+
if (day) {
|
|
61
|
+
day.time += duration
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
})
|
|
65
|
+
return {
|
|
66
|
+
device,
|
|
67
|
+
threshold,
|
|
68
|
+
time: days.reduce((a, b) => a + b.time, 0),
|
|
69
|
+
days
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
async function exportRPMReportToPDF (userData, reportData) {
|
|
74
|
+
const translations = getTranslations(userData)
|
|
75
|
+
const weekDays = getWeekDays(translations)
|
|
76
|
+
const style = getStyle(getUserPartner(userData.user))
|
|
77
|
+
|
|
78
|
+
const orientation = userData.groupByDay ? 'p' : 'l'
|
|
79
|
+
// eslint-disable-next-line new-cap
|
|
80
|
+
const doc = new jsPDF.jsPDF(orientation)
|
|
81
|
+
await headerFromUser(doc, translations.report.titleRPMReport, userData.user, orientation)
|
|
82
|
+
|
|
83
|
+
if (userData.groupByDay) {
|
|
84
|
+
const headers = [translations.report.date, translations.report.timeAboveRPM]
|
|
85
|
+
reportData.devices.forEach((d, index) => {
|
|
86
|
+
pdfPageByDay(userData, d, index, doc, translations, reportData)
|
|
87
|
+
const data = d.days.map(day => [
|
|
88
|
+
new Date(day.date).toLocaleDateString() + ' - ' + weekDays[new Date(day.date).getDay()],
|
|
89
|
+
convertMS(day.time)
|
|
90
|
+
])
|
|
91
|
+
const footValues = [translations.report.rpmThreshold + ': ' + d.threshold, convertMS(d.time)]
|
|
92
|
+
addTable(doc, headers, data, footValues, style, 40, { 1: { halign: 'right' } })
|
|
93
|
+
})
|
|
94
|
+
} else {
|
|
95
|
+
doc.setFontSize(11)
|
|
96
|
+
doc.text(new Date(reportData.from).toLocaleString() + ' - ' + new Date(reportData.to).toLocaleString(), 20, 33)
|
|
97
|
+
const headers = [
|
|
98
|
+
translations.report.vehicle,
|
|
99
|
+
translations.settings.vehicle_licenseplate,
|
|
100
|
+
translations.report.group,
|
|
101
|
+
translations.report.rpmThreshold,
|
|
102
|
+
translations.report.timeAboveRPM
|
|
103
|
+
]
|
|
104
|
+
const data = reportData.devices.map(d => {
|
|
105
|
+
const group = userData.groups.find(g => d.device.groupId === g.id)
|
|
106
|
+
return [
|
|
107
|
+
d.device.name,
|
|
108
|
+
d.device.attributes.license_plate || '',
|
|
109
|
+
group ? group.name : '',
|
|
110
|
+
d.threshold,
|
|
111
|
+
convertMS(d.time)
|
|
112
|
+
]
|
|
113
|
+
})
|
|
114
|
+
const footValues = [
|
|
115
|
+
'Total:' + reportData.devices.length,
|
|
116
|
+
'',
|
|
117
|
+
'',
|
|
118
|
+
'',
|
|
119
|
+
convertMS(reportData.devices.reduce((a, b) => a + b.time, 0))
|
|
120
|
+
]
|
|
121
|
+
addTable(doc, headers, data, footValues, style, 35, { 3: { halign: 'right' }, 4: { halign: 'right' } })
|
|
122
|
+
}
|
|
123
|
+
return doc
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
function exportRPMReportToExcel (userData, reportData) {
|
|
127
|
+
const translations = getTranslations(userData)
|
|
128
|
+
const weekDays = getWeekDays(translations)
|
|
129
|
+
|
|
130
|
+
const settings = {
|
|
131
|
+
sheetName: translations.report.titleRPMReport.substring(0, 31),
|
|
132
|
+
fileName
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
const headers = [
|
|
136
|
+
{ label: translations.report.vehicle, value: 'name' },
|
|
137
|
+
{ label: translations.settings.vehicle_licenseplate, value: 'licenseplate' },
|
|
138
|
+
{ label: translations.report.group, value: 'group' },
|
|
139
|
+
{ label: translations.report.rpmThreshold, value: 'threshold' }
|
|
140
|
+
]
|
|
141
|
+
if (userData.groupByDay) {
|
|
142
|
+
headers.push(
|
|
143
|
+
{ label: translations.report.date, value: 'date' },
|
|
144
|
+
{ label: translations.report.weekDay, value: 'weekday' })
|
|
145
|
+
}
|
|
146
|
+
headers.push({ label: translations.report.timeAboveRPM, value: 'time' })
|
|
147
|
+
|
|
148
|
+
const data = []
|
|
149
|
+
reportData.devices.forEach(d => {
|
|
150
|
+
const group = userData.groups.find(g => d.device.groupId === g.id)
|
|
151
|
+
const row = {
|
|
152
|
+
name: d.device.name,
|
|
153
|
+
licenseplate: d.device.attributes.license_plate,
|
|
154
|
+
group: group ? group.name : '',
|
|
155
|
+
threshold: d.threshold
|
|
156
|
+
}
|
|
157
|
+
if (userData.groupByDay) {
|
|
158
|
+
data.push(...d.days.map(day => ({
|
|
159
|
+
...row,
|
|
160
|
+
date: new Date(day.date).toLocaleDateString(),
|
|
161
|
+
weekday: weekDays[new Date(day.date).getDay()],
|
|
162
|
+
time: convertMS(day.time)
|
|
163
|
+
})))
|
|
164
|
+
} else {
|
|
165
|
+
data.push({ ...row, time: convertMS(d.time) })
|
|
166
|
+
}
|
|
167
|
+
})
|
|
168
|
+
|
|
169
|
+
return {
|
|
170
|
+
headers,
|
|
171
|
+
data,
|
|
172
|
+
settings
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
function getWeekDays (translations) {
|
|
177
|
+
return [
|
|
178
|
+
translations.report.sunday,
|
|
179
|
+
translations.report.monday,
|
|
180
|
+
translations.report.tuesday,
|
|
181
|
+
translations.report.wednesday,
|
|
182
|
+
translations.report.thursday,
|
|
183
|
+
translations.report.friday,
|
|
184
|
+
translations.report.saturday
|
|
185
|
+
]
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
exports.processDevice = processDevice
|
|
189
|
+
exports.createRPMReport = createRPMReport
|
|
190
|
+
exports.exportRPMReportToPDF = exportRPMReportToPDF
|
|
191
|
+
exports.exportRPMReportToExcel = exportRPMReportToExcel
|
|
192
|
+
exports.create = createRPMReport
|
|
193
|
+
exports.exportToPDF = exportRPMReportToPDF
|
|
194
|
+
exports.exportToExcel = exportRPMReportToExcel
|
package/src/sensor-report.js
CHANGED
|
@@ -343,16 +343,16 @@ async function exportToPDF (userData, reportData) {
|
|
|
343
343
|
: (userData.groupByDay
|
|
344
344
|
? [
|
|
345
345
|
translations.report.date,
|
|
346
|
-
|
|
346
|
+
translations.report.sensor,
|
|
347
347
|
translations.report.start,
|
|
348
348
|
translations.report.end,
|
|
349
349
|
translations.report.duration
|
|
350
350
|
]
|
|
351
351
|
: [
|
|
352
|
-
|
|
352
|
+
translations.report.sensor,
|
|
353
353
|
translations.report.start,
|
|
354
354
|
translations.report.end,
|
|
355
|
-
|
|
355
|
+
translations.report.status,
|
|
356
356
|
translations.report.duration,
|
|
357
357
|
translations.report.endAddress
|
|
358
358
|
])
|
|
@@ -360,7 +360,7 @@ async function exportToPDF (userData, reportData) {
|
|
|
360
360
|
if (reportDataRows) {
|
|
361
361
|
// eslint-disable-next-line new-cap
|
|
362
362
|
const doc = new jsPDF.jsPDF('l')
|
|
363
|
-
await headerFromUser(doc,
|
|
363
|
+
await headerFromUser(doc, translations.report.titleSensorReport, userData.user)
|
|
364
364
|
|
|
365
365
|
let index = 0
|
|
366
366
|
reportDataRows.forEach(function (d) {
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
/* eslint-disable no-undef */
|
|
2
|
+
const assert = require('assert')
|
|
3
|
+
const { processDevice } = require('../rpm-report')
|
|
4
|
+
|
|
5
|
+
function position (fixTime, rpm) {
|
|
6
|
+
return { fixTime: new Date(fixTime).toISOString(), attributes: { rpm } }
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
describe('RPM_Report', function () {
|
|
10
|
+
const dates = [new Date(2026, 9, 1, 12), new Date(2026, 9, 2, 12)]
|
|
11
|
+
const route = [
|
|
12
|
+
position(new Date(2026, 9, 1, 10, 0), 2000),
|
|
13
|
+
position(new Date(2026, 9, 1, 10, 1), 2600),
|
|
14
|
+
position(new Date(2026, 9, 1, 10, 2), 2700),
|
|
15
|
+
position(new Date(2026, 9, 1, 10, 4), 3000),
|
|
16
|
+
position(new Date(2026, 9, 1, 10, 5), 1500),
|
|
17
|
+
position(new Date(2026, 9, 2, 9, 0), 2600),
|
|
18
|
+
position(new Date(2026, 9, 2, 9, 0, 30), 2600)
|
|
19
|
+
]
|
|
20
|
+
it('sums time above the default threshold per day', () => {
|
|
21
|
+
const result = processDevice({ id: 1, attributes: {} }, route, dates)
|
|
22
|
+
assert.equal(result.threshold, 2500)
|
|
23
|
+
assert.equal(result.days[0].time, 3 * 60 * 1000)
|
|
24
|
+
assert.equal(result.days[1].time, 30 * 1000)
|
|
25
|
+
assert.equal(result.time, 3 * 60 * 1000 + 30 * 1000)
|
|
26
|
+
})
|
|
27
|
+
it('uses the device highRPM attribute as threshold', () => {
|
|
28
|
+
const result = processDevice({ id: 1, attributes: { highRPM: 2650 } }, route, dates)
|
|
29
|
+
assert.equal(result.threshold, 2650)
|
|
30
|
+
assert.equal(result.days[0].time, 2 * 60 * 1000)
|
|
31
|
+
assert.equal(result.days[1].time, 0)
|
|
32
|
+
})
|
|
33
|
+
})
|