fleetmap-reports 1.0.909 → 1.0.910

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fleetmap-reports",
3
- "version": "1.0.909",
3
+ "version": "1.0.910",
4
4
  "description": "",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -29,7 +29,7 @@ async function createPerformanceReport (from, to, userData, traccar) {
29
29
  const device = userData.devices[0]
30
30
 
31
31
  const {
32
- drivingTime, idleTime, cruiseControlTime, economicTime, highEngineRPM, hardBreaking, hardAcceleration,
32
+ drivingTime, idleTime, cruiseControlTime, economicTime, highEngineRPM, hardBraking, hardAcceleration, hardCornering,
33
33
  drivingConsumption, idleConsumption, cruiseControlConsumption, economicConsumption, drivingDistance, cruiseControlDistance,
34
34
  economicDistance
35
35
  } = getDeviceData(allInOne, device)
@@ -43,8 +43,9 @@ async function createPerformanceReport (from, to, userData, traccar) {
43
43
  const economicIndicator = (totalTime > 0 ? economicTime * 100 / totalTime : 0).toFixed(1) + ' %'
44
44
  const cruiseControlIndicator = (totalTime > 0 ? cruiseControlTime * 100 / totalTime : 0).toFixed(1) + ' %'
45
45
  const highEngineRPMIndicator = (totalTime > 0 ? highEngineRPM * 100 / totalTime : 0).toFixed(1) + ' %'
46
- const hardBreakingIndicator = (drivingDistance > 0 ? hardBreaking * 100 / drivingDistance : 0).toFixed(0) + ' Freinage/100 Km'
46
+ const hardBrakingIndicator = (drivingDistance > 0 ? hardBraking * 100 / drivingDistance : 0).toFixed(0) + ' Freinage/100 Km'
47
47
  const hardAccelerationIndicator = (drivingDistance > 0 ? hardAcceleration * 100 / drivingDistance : 0).toFixed(0) + ' Accélération/100 Km'
48
+ const hardCorneringIndicator = (drivingDistance > 0 ? hardCornering * 100 / drivingDistance : 0).toFixed(0) + ' Virages/100 Km'
48
49
 
49
50
  const drivingUse = Math.round(totalTime > 0 ? drivingTime * 100 / totalTime : 0)
50
51
  const idleUse = Math.round(totalTime > 0 ? idleTime * 100 / totalTime : 0)
@@ -62,8 +63,9 @@ async function createPerformanceReport (from, to, userData, traccar) {
62
63
  const economicData = getRowData(4, device, 'Économique', economicTime, economicConsumption, economicDistance, economicIndicator, 0, engineEconomicRPM, 0)
63
64
  const cruiseControlData = getRowData(5, device, 'Cruise Control', cruiseControlTime, cruiseControlConsumption, cruiseControlDistance, cruiseControlIndicator, 0, 0, cruiseControlOn)
64
65
  const highEngineRPMData = getRowData(6, device, 'Tour moteur élevé', highEngineRPM, '', '', highEngineRPMIndicator, 0, engineHighRPM, 0)
65
- const hardBreakingData = getRowData(7, device, 'Freinage brusque', hardBreaking, '', '', hardBreakingIndicator, 0, 0, 0)
66
+ const hardBrakingData = getRowData(7, device, 'Freinage brusque', hardBraking, '', '', hardBrakingIndicator, 0, 0, 0)
66
67
  const hardAccelerationData = getRowData(8, device, 'Accéleration brusque', hardAcceleration, '', '', hardAccelerationIndicator, 0, 0, 0)
68
+ const hardCorneringData = getRowData(9, device, 'Virages brusque', hardCornering, '', '', hardCorneringIndicator, 0, 0, 0)
67
69
 
68
70
  reportData.push(totalData)
69
71
  reportData.push(drivingData)
@@ -71,8 +73,9 @@ async function createPerformanceReport (from, to, userData, traccar) {
71
73
  reportData.push(economicData)
72
74
  reportData.push(cruiseControlData)
73
75
  reportData.push(highEngineRPMData)
74
- reportData.push(hardBreakingData)
76
+ reportData.push(hardBrakingData)
75
77
  reportData.push(hardAccelerationData)
78
+ reportData.push(hardCorneringData)
76
79
  }
77
80
  return reportData
78
81
  }
@@ -96,8 +99,9 @@ function getDeviceData (allInOne, d) {
96
99
  const cruiseControlTime = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalTimeWithCruiseControl - endTripData[0].totalTimeWithCruiseControl : 0
97
100
  const economicTime = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalTimeInEcoRange - canDriverStyle[0].totalTimeInEcoRange : 0
98
101
  const highEngineRPM = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalTimeWithHighRpmAndTorque - canDriverStyle[0].totalTimeWithHighRpmAndTorque : 0
99
- const hardBreaking = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalNumberOfHarshBrakes - canDriverStyle[0].totalNumberOfHarshBrakes : 0
102
+ const hardBraking = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalNumberOfHarshBrakes - canDriverStyle[0].totalNumberOfHarshBrakes : 0
100
103
  const hardAcceleration = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalNumberOfHarshAccelerations - canDriverStyle[0].totalNumberOfHarshAccelerations : 0
104
+ const hardCornering = 0
101
105
 
102
106
  const drivingConsumption = endTripData.length > 1 ? (endTripData[endTripData.length - 1].totalFuelConsumptionDriving - endTripData[0].totalFuelConsumptionDriving) * 0.1 : 0
103
107
  const idleConsumption = endTripData.length > 1 ? (endTripData[endTripData.length - 1].totalFuelConsumptionInIdle - endTripData[0].totalFuelConsumptionInIdle) * 0.1 : 0
@@ -114,8 +118,9 @@ function getDeviceData (allInOne, d) {
114
118
  cruiseControlTime,
115
119
  economicTime,
116
120
  highEngineRPM,
117
- hardBreaking,
121
+ hardBraking,
118
122
  hardAcceleration,
123
+ hardCornering,
119
124
  drivingConsumption,
120
125
  idleConsumption,
121
126
  cruiseControlConsumption,
@@ -150,8 +155,9 @@ function getDeviceData (allInOne, d) {
150
155
  ? a[a.length - 1].attributes.fuelUsed - a[0].attributes.fuelUsed
151
156
  : 0).reduce((a, b) => a + (b || 0), 0)
152
157
 
153
- const hardBreaking = deviceRoute.filter(p => p.attributes.alarm === 'hardBreaking').length
158
+ const hardBraking = deviceRoute.filter(p => p.attributes.alarm === 'hardBraking').length
154
159
  const hardAcceleration = deviceRoute.filter(p => p.attributes.alarm === 'hardAcceleration').length
160
+ const hardCornering = deviceRoute.filter(p => p.attributes.alarm === 'hardCornering').length
155
161
 
156
162
  return {
157
163
  drivingTime: drivingTime / 1000,
@@ -159,8 +165,9 @@ function getDeviceData (allInOne, d) {
159
165
  cruiseControlTime: 0,
160
166
  economicTime: economicTime / 1000,
161
167
  highEngineRPM: highEngineRPM / 1000,
162
- hardBreaking,
168
+ hardBraking,
163
169
  hardAcceleration,
170
+ hardCornering,
164
171
  drivingConsumption,
165
172
  idleConsumption,
166
173
  cruiseControlConsumption: 0,