Merge pull request #2206 from Abyss777/ignition

Ignition and Motor Hours

3 files changed, 15 insertions, 0 deletions

diff --git a/web/app/AttributeFormatter.js b/web/app/AttributeFormatter.js
index 3432ca1e0..274b8d028 100644
--- a/web/app/AttributeFormatter.js
+++ b/web/app/AttributeFormatter.js
@@ -34,6 +34,11 @@ Ext.define('Traccar.AttributeFormatter', {
         return Ext.getStore('DistanceUnits').formatValue(value, Traccar.app.getPreference('distanceUnit'));
     },
 
+    hoursFormatter: function (value) {
+        var hours = Math.round(value / 3600000);
+        return (hours + ' ' + Strings.sharedHourAbbreviation);
+    },
+
     defaultFormatter: function (value) {
         if (typeof value === 'number') {
             return Number(value.toFixed(Traccar.Style.numberPrecision));
@@ -58,6 +63,8 @@ Ext.define('Traccar.AttributeFormatter', {
             return this.courseFormatter;
         } else if (key === 'distance' || key === 'odometer') {
             return this.distanceFormatter;
+        } else if (key === 'hours') {
+            return this.hoursFormatter;
         } else {
             return this.defaultFormatter;
         }
diff --git a/web/app/model/ReportSummary.js b/web/app/model/ReportSummary.js
index 7821e1c00..39f0c498c 100644
--- a/web/app/model/ReportSummary.js
+++ b/web/app/model/ReportSummary.js
@@ -33,5 +33,8 @@ Ext.define('Traccar.model.ReportSummary', {
     }, {
         name: 'distance',
         type: 'float'
+    }, {
+        name: 'engineHours',
+        type: 'int'
     }]
 });
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index ecc7b0f91..61e278993 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -227,6 +227,11 @@ Ext.define('Traccar.view.ReportController', {
             dataIndex: 'maxSpeed',
             flex: 1,
             renderer: Traccar.AttributeFormatter.getFormatter('speed')
+        }, {
+            text: Strings.reportEngineHours,
+            dataIndex: 'engineHours',
+            flex: 1,
+            renderer: Traccar.AttributeFormatter.getFormatter('hours')
         }];
 
         if (newValue === 'route') {