fleetmap-reports 2.0.86 → 2.0.87
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/passenger-report.js +46 -0
- package/src/tests/dailyuse.test.js +19 -0
- package/src/tests/gpsjump.test.js +23 -0
- package/src/tests/kms.test.js +1 -0
- package/src/tests/zones.test.js +17 -0
- package/src/util/utils.js +3 -1
|
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
|
+
}
|
|
@@ -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
|
+
})
|
|
@@ -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
|
@@ -65,6 +65,7 @@ describe('Kms_Reports', function () {
|
|
|
65
65
|
it('KmsReport by timezone marrocos', async () => {
|
|
66
66
|
const reports = await getReports(process.env.email, process.env.password)
|
|
67
67
|
const userData = await reports.getUserData()
|
|
68
|
+
userData.groupByDay = true
|
|
68
69
|
userData.devices = userData.devices.filter(d => d.id === 93497)
|
|
69
70
|
const data = await reports.kmsReport(convertFromLocal(new Date(2024, 2, 18, 0, 0, 0), userData.user.attributes.timezone), convertFromLocal(new Date(2024, 2, 18, 23, 59, 59), userData.user.attributes.timezone),
|
|
70
71
|
userData)
|
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/util/utils.js
CHANGED
|
@@ -233,6 +233,7 @@ function weekDaySelected (date, weekDays) {
|
|
|
233
233
|
async function executeServerSide (type, sliced, from, to, userData, totalItems, { axios }, maxRequests = 10) {
|
|
234
234
|
let itemsCount = 0
|
|
235
235
|
console.log('PROGRESS_PERC:1')
|
|
236
|
+
const cookie = await axios.get('/pinmeapi/cookie/get', { withCredentials: true }).then(d => d.data)
|
|
236
237
|
const reportData = []
|
|
237
238
|
for (let i = 0; i < sliced.length; i += maxRequests) {
|
|
238
239
|
const _sliced = sliced.slice(i, i + maxRequests)
|
|
@@ -252,7 +253,8 @@ async function executeServerSide (type, sliced, from, to, userData, totalItems,
|
|
|
252
253
|
...userData,
|
|
253
254
|
devices: items,
|
|
254
255
|
geofences: []
|
|
255
|
-
}
|
|
256
|
+
},
|
|
257
|
+
cookie
|
|
256
258
|
}, { withCredentials: true }).then(d => {
|
|
257
259
|
reportData.push(...(userData.byDriver ? d.data[0].drivers : d.data[0].devices))
|
|
258
260
|
})
|