From 8fa931a45755b14f61bcc699296337efefc46160 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Fri, 12 Aug 2016 11:19:34 +0500
Subject: - Fixed casting ignition object to boolean

- Renamed motorHours to engineHours
- Changed engine hours formatter to just hours
- Added previously missed license headers to reports
- Added Andrey Kunitsyn to some license headers
---
 web/app/AttributeFormatter.js    | 18 +++++-------------
 web/app/model/ReportSummary.js   |  2 +-
 web/app/view/ReportController.js |  6 +++---
 web/l10n/en.json                 |  5 +----
 4 files changed, 10 insertions(+), 21 deletions(-)

(limited to 'web')

diff --git a/web/app/AttributeFormatter.js b/web/app/AttributeFormatter.js
index 7d008dc64..2e0edb6d6 100644
--- a/web/app/AttributeFormatter.js
+++ b/web/app/AttributeFormatter.js
@@ -34,17 +34,9 @@ Ext.define('Traccar.AttributeFormatter', {
         return Ext.getStore('DistanceUnits').formatValue(value, Traccar.app.getPreference('distanceUnit'));
     },
 
-    intervalFormatter: function (value) {
-        var days, hours, minutes, seconds;
-        seconds = Math.floor(value / 1000);
-        days = Math.floor(seconds / 86400);
-        hours = ('0' + Math.floor(seconds / 3600) % 24).slice(-2);
-        minutes = ('0' + Math.floor(seconds / 60) % 60).slice(-2);
-        seconds = ('0' + seconds % 60).slice(-2);
-        return (days > 0 ? days + Strings.sharedDayAbbreviation + ' ' : '')
-            + (hours > 0 ? hours + Strings.sharedHourAbbreviation + ' ' : '')
-            + (minutes > 0 ? minutes + Strings.sharedMinuteAbbreviation + ' ' : '')
-            + (seconds > 60 ? seconds : seconds + Strings.sharedSecondAbbreviation);
+    hoursFormatter: function (value) {
+        var hours = value / 3600000;
+        return (hours.toFixed(2) + ' ' + Strings.sharedHourAbbreviation);
     },
 
     defaultFormatter: function (value) {
@@ -71,8 +63,8 @@ Ext.define('Traccar.AttributeFormatter', {
             return this.courseFormatter;
         } else if (key === 'distance' || key === 'odometer') {
             return this.distanceFormatter;
-        } else if (key === 'interval') {
-            return this.intervalFormatter;
+        } 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 2017d164a..39f0c498c 100644
--- a/web/app/model/ReportSummary.js
+++ b/web/app/model/ReportSummary.js
@@ -34,7 +34,7 @@ Ext.define('Traccar.model.ReportSummary', {
         name: 'distance',
         type: 'float'
     }, {
-        name: 'motorHours',
+        name: 'engineHours',
         type: 'int'
     }]
 });
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index 5ac84e8e2..61e278993 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -228,10 +228,10 @@ Ext.define('Traccar.view.ReportController', {
             flex: 1,
             renderer: Traccar.AttributeFormatter.getFormatter('speed')
         }, {
-            text: Strings.reportMotorHours,
-            dataIndex: 'motorHours',
+            text: Strings.reportEngineHours,
+            dataIndex: 'engineHours',
             flex: 1,
-            renderer: Traccar.AttributeFormatter.getFormatter('interval')
+            renderer: Traccar.AttributeFormatter.getFormatter('hours')
         }];
 
         if (newValue === 'route') {
diff --git a/web/l10n/en.json b/web/l10n/en.json
index 11088e9bf..af4f2363e 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -26,10 +26,7 @@
     "sharedMute": "Mute",
     "sharedType": "Type",
     "sharedDistance": "Distance",
-    "sharedDayAbbreviation": "d",
     "sharedHourAbbreviation": "h",
-    "sharedMinuteAbbreviation": "m",
-    "sharedSecondAbbreviation": "s",
     "errorTitle": "Error",
     "errorUnknown": "Unknown error",
     "errorConnection": "Connection error",
@@ -146,5 +143,5 @@
     "reportDeviceName": "Device Name",
     "reportAverageSpeed": "Average Speed",
     "reportMaximumSpeed": "Maximum Speed",
-    "reportMotorHours": "Motor Hours"
+    "reportEngineHours": "Engine Hours"
 }
\ No newline at end of file
-- 
cgit v1.2.3