fleetmap-reports 1.0.908 → 1.0.910

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.908",
+  "version": "1.0.910",
   "description": "",
   "main": "src/index.js",
   "scripts": {

package/src/kms-report.js

@@ -175,6 +175,8 @@ function processDevices (from, to, devices, data, userData) {
 
         devicesResult.push({
           device: d,
+          startOdometer: trips.length ? trips[0].startOdometer : 0,
+          endOdometer: trips.length ? trips[trips.length - 1].endOdometer : 0,
           days
         })
       }
@@ -182,6 +184,8 @@ function processDevices (from, to, devices, data, userData) {
       devicesResult.push({
         device: d,
         summary: {
+          startOdometer: trips.length ? trips[0].startOdometer : 0,
+          endOdometer: trips.length ? trips[trips.length - 1].endOdometer : 0,
           distance: trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0)
         }
       })
@@ -321,14 +325,16 @@ function exportKmsReportToExcel (userData, reportData) {
     headers.push(
       { label: translations.report.vehicle, value: 'name' },
       { label: translations.settings.vehicle_licenseplate, value: 'licenseplate' },
-      { label: translations.report.group, value: 'group' })
+      { label: translations.report.group, value: 'group' },
+      { label: translations.report.startOdometer, value: 'startOdometer' })
 
     const days = info[0].days
     days.forEach((day, index) => {
       headers.push({ label: new Date(day.date).toLocaleDateString(), value: 'day' + index })
     })
 
-    headers.push({ label: translations.report.total, value: 'total' })
+    headers.push({ label: translations.report.total, value: 'total' },
+      { label: translations.report.endOdometer, value: 'endOdometer' })
   } else if (userData.byDriver) {
     headers.push(
       { label: translations.report.driver, value: 'name' },
@@ -354,7 +360,9 @@ function exportKmsReportToExcel (userData, reportData) {
         const vehicle = {
           name: d.device.name,
           group: group ? group.name : '',
-          licenseplate: d.device.attributes.license_plate
+          licenseplate: d.device.attributes.license_plate,
+          startOdometer: Number((d.startOdometer / 1000).toFixed(1)),
+          endOdometer: Number((d.endOdometer / 1000).toFixed(1))
         }
 
         d.days.forEach((day, index) => {

package/src/partnerReports/performance-report.js

@@ -29,7 +29,7 @@ async function createPerformanceReport (from, to, userData, traccar) {
     const device = userData.devices[0]
 
     const {
-      drivingTime, idleTime, cruiseControlTime, economicTime, highEngineRPM, hardBreaking, hardAcceleration,
+      drivingTime, idleTime, cruiseControlTime, economicTime, highEngineRPM, hardBraking, hardAcceleration, hardCornering,
       drivingConsumption, idleConsumption, cruiseControlConsumption, economicConsumption, drivingDistance, cruiseControlDistance,
       economicDistance
     } = getDeviceData(allInOne, device)
@@ -43,8 +43,9 @@ async function createPerformanceReport (from, to, userData, traccar) {
     const economicIndicator = (totalTime > 0 ? economicTime * 100 / totalTime : 0).toFixed(1) + ' %'
     const cruiseControlIndicator = (totalTime > 0 ? cruiseControlTime * 100 / totalTime : 0).toFixed(1) + ' %'
     const highEngineRPMIndicator = (totalTime > 0 ? highEngineRPM * 100 / totalTime : 0).toFixed(1) + ' %'
-    const hardBreakingIndicator = (drivingDistance > 0 ? hardBreaking * 100 / drivingDistance : 0).toFixed(0) + ' Freinage/100 Km'
+    const hardBrakingIndicator = (drivingDistance > 0 ? hardBraking * 100 / drivingDistance : 0).toFixed(0) + ' Freinage/100 Km'
     const hardAccelerationIndicator = (drivingDistance > 0 ? hardAcceleration * 100 / drivingDistance : 0).toFixed(0) + ' Accélération/100 Km'
+    const hardCorneringIndicator = (drivingDistance > 0 ? hardCornering * 100 / drivingDistance : 0).toFixed(0) + ' Virages/100 Km'
 
     const drivingUse = Math.round(totalTime > 0 ? drivingTime * 100 / totalTime : 0)
     const idleUse = Math.round(totalTime > 0 ? idleTime * 100 / totalTime : 0)
@@ -62,8 +63,9 @@ async function createPerformanceReport (from, to, userData, traccar) {
     const economicData = getRowData(4, device, 'Économique', economicTime, economicConsumption, economicDistance, economicIndicator, 0, engineEconomicRPM, 0)
     const cruiseControlData = getRowData(5, device, 'Cruise Control', cruiseControlTime, cruiseControlConsumption, cruiseControlDistance, cruiseControlIndicator, 0, 0, cruiseControlOn)
     const highEngineRPMData = getRowData(6, device, 'Tour moteur élevé', highEngineRPM, '', '', highEngineRPMIndicator, 0, engineHighRPM, 0)
-    const hardBreakingData = getRowData(7, device, 'Freinage brusque', hardBreaking, '', '', hardBreakingIndicator, 0, 0, 0)
+    const hardBrakingData = getRowData(7, device, 'Freinage brusque', hardBraking, '', '', hardBrakingIndicator, 0, 0, 0)
     const hardAccelerationData = getRowData(8, device, 'Accéleration brusque', hardAcceleration, '', '', hardAccelerationIndicator, 0, 0, 0)
+    const hardCorneringData = getRowData(9, device, 'Virages brusque', hardCornering, '', '', hardCorneringIndicator, 0, 0, 0)
 
     reportData.push(totalData)
     reportData.push(drivingData)
@@ -71,8 +73,9 @@ async function createPerformanceReport (from, to, userData, traccar) {
     reportData.push(economicData)
     reportData.push(cruiseControlData)
     reportData.push(highEngineRPMData)
-    reportData.push(hardBreakingData)
+    reportData.push(hardBrakingData)
     reportData.push(hardAccelerationData)
+    reportData.push(hardCorneringData)
   }
   return reportData
 }
@@ -96,8 +99,9 @@ function getDeviceData (allInOne, d) {
     const cruiseControlTime = endTripData.length > 1 ? endTripData[endTripData.length - 1].totalTimeWithCruiseControl - endTripData[0].totalTimeWithCruiseControl : 0
     const economicTime = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalTimeInEcoRange - canDriverStyle[0].totalTimeInEcoRange : 0
     const highEngineRPM = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalTimeWithHighRpmAndTorque - canDriverStyle[0].totalTimeWithHighRpmAndTorque : 0
-    const hardBreaking = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalNumberOfHarshBrakes - canDriverStyle[0].totalNumberOfHarshBrakes : 0
+    const hardBraking = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalNumberOfHarshBrakes - canDriverStyle[0].totalNumberOfHarshBrakes : 0
     const hardAcceleration = canDriverStyle.length > 1 ? canDriverStyle[canDriverStyle.length - 1].totalNumberOfHarshAccelerations - canDriverStyle[0].totalNumberOfHarshAccelerations : 0
+    const hardCornering = 0
 
     const drivingConsumption = endTripData.length > 1 ? (endTripData[endTripData.length - 1].totalFuelConsumptionDriving - endTripData[0].totalFuelConsumptionDriving) * 0.1 : 0
     const idleConsumption = endTripData.length > 1 ? (endTripData[endTripData.length - 1].totalFuelConsumptionInIdle - endTripData[0].totalFuelConsumptionInIdle) * 0.1 : 0
@@ -114,8 +118,9 @@ function getDeviceData (allInOne, d) {
       cruiseControlTime,
       economicTime,
       highEngineRPM,
-      hardBreaking,
+      hardBraking,
       hardAcceleration,
+      hardCornering,
       drivingConsumption,
       idleConsumption,
       cruiseControlConsumption,
@@ -150,8 +155,9 @@ function getDeviceData (allInOne, d) {
       ? a[a.length - 1].attributes.fuelUsed - a[0].attributes.fuelUsed
       : 0).reduce((a, b) => a + (b || 0), 0)
 
-    const hardBreaking = deviceRoute.filter(p => p.attributes.alarm === 'hardBreaking').length
+    const hardBraking = deviceRoute.filter(p => p.attributes.alarm === 'hardBraking').length
     const hardAcceleration = deviceRoute.filter(p => p.attributes.alarm === 'hardAcceleration').length
+    const hardCornering = deviceRoute.filter(p => p.attributes.alarm === 'hardCornering').length
 
     return {
       drivingTime: drivingTime / 1000,
@@ -159,8 +165,9 @@ function getDeviceData (allInOne, d) {
       cruiseControlTime: 0,
       economicTime: economicTime / 1000,
       highEngineRPM: highEngineRPM / 1000,
-      hardBreaking,
+      hardBraking,
       hardAcceleration,
+      hardCornering,
       drivingConsumption,
       idleConsumption,
       cruiseControlConsumption: 0,