fleetmap-reports 1.0.912 → 1.0.915

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.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/tests/zones.test.js +8 -7
  3. package/src/zone-report.js +3 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fleetmap-reports",
3
- "version": "1.0.912",
3
+ "version": "1.0.915",
4
4
  "description": "",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/tests/zones.test.js CHANGED
@@ -45,18 +45,19 @@ describe('zones', function () {
45
45
 
46
46
  // eslint-disable-next-line no-undef
47
47
  it('works with casais zones in columns', async () => {
48
- const report = await getReports(process.env.USER_CASAIS, process.env.PASS_CASAIS)
48
+ const report = await getReports('fleetmap.joao.penas2@gmail.com', 'penas46881')
49
49
  const userData = await report.getUserData()
50
50
  userData.zonesByColumn = true
51
- userData.devices = userData.devices.filter(d => d.name === 'G-1101-E Clio')
52
- userData.geofences = userData.geofences.filter(g => g.name === 'baliza 1 - raio verde ')
51
+ userData.devices = userData.devices.filter(d => d.name === 'G-5983-E Clio')
52
+ userData.geofences = userData.geofences.filter(g => g.name === 'baliza 1 - raio verde ' ||
53
+ g.name === 'baliza 2 - raio amarelo')
53
54
  userData.onlyWithKmsOut = true
54
55
  const result = await report.zoneReport(
55
- new Date(Date.UTC(2023, 0, 1, 0, 0, 0, 0)),
56
- new Date(Date.UTC(2023, 0, 31, 23, 59, 59, 0)),
56
+ new Date(Date.UTC(2023, 8, 1, 0, 0, 0, 0)),
57
+ new Date(Date.UTC(2023, 8, 30, 23, 59, 59, 0)),
57
58
  userData)
58
- const first = result[0].devices[0].days[0]
59
+ const first = result[0].devices[0]
59
60
  console.log(first)
60
- assert.equal(first.distanceOut, 35.52274536571346)
61
+ assert.equal(first.distanceOut, 0)
61
62
  }, 4000000)
62
63
  })
package/src/zone-report.js CHANGED
@@ -289,8 +289,9 @@ function calculateDistanceIn (zoneInOutDayData, deviceRoute, dayRoute, fromByDay
289
289
 
290
290
  function calculateDistanceOut (zoneInOutDayData, dayRoute, fromByDay, toByDay, field, device) {
291
291
  if (zoneInOutDayData.length) {
292
- let distanceOut = zoneInOutDayData.reduce((a, b) => a + (b[field] || 0), 0) -
293
- (zoneInOutDayData[zoneInOutDayData.length - 1][field] || 0)
292
+ const dataInsideDay = zoneInOutDayData.filter(z => (z.inTime && new Date(z.inTime.fixTime) > fromByDay) && (z.outTime && new Date(z.outTime.fixTime) > toByDay))
293
+ let distanceOut = dataInsideDay.reduce((a, b) => a + (b[field] || 0), 0) -
294
+ (dataInsideDay.length ? (dataInsideDay[dataInsideDay.length - 1][field] || 0) : 0)
294
295
 
295
296
  if (zoneInOutDayData[0].inTime && new Date(zoneInOutDayData[0].inTime.fixTime) > fromByDay) {
296
297
  // Add distanceOut before the first entry