From 74639a742405b9e60c07f04e00138b9b6159d1c3 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 15 Jun 2017 09:29:27 +0500 Subject: Use 'duration' formatter for 'engineHours' --- web/app/AttributeFormatter.js | 7 ------- web/app/view/ReportController.js | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/web/app/AttributeFormatter.js b/web/app/AttributeFormatter.js index 3f7c127..aecbd8a 100644 --- a/web/app/AttributeFormatter.js +++ b/web/app/AttributeFormatter.js @@ -51,11 +51,6 @@ Ext.define('Traccar.AttributeFormatter', { return Ext.getStore('DistanceUnits').convertValue(value, Traccar.app.getPreference('distanceUnit')); }, - hoursFormatter: function (value) { - var hours = Math.round(value / 3600000); - return (hours + ' ' + Strings.sharedHourAbbreviation); - }, - durationFormatter: function (value) { var hours, minutes; hours = Math.floor(value / 3600000); @@ -114,8 +109,6 @@ Ext.define('Traccar.AttributeFormatter', { return this.courseFormatter; } else if (key === 'distance' || key === 'accuracy') { return this.distanceFormatter; - } else if (key === 'hours') { - return this.hoursFormatter; } else if (key === 'duration') { return this.durationFormatter; } else if (key === 'deviceId') { diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js index 36eceb0..e048c06 100644 --- a/web/app/view/ReportController.js +++ b/web/app/view/ReportController.js @@ -482,7 +482,7 @@ Ext.define('Traccar.view.ReportController', { }, { text: Strings.reportEngineHours, dataIndex: 'engineHours', - renderer: Traccar.AttributeFormatter.getFormatter('hours') + renderer: Traccar.AttributeFormatter.getFormatter('duration') }, { text: Strings.reportSpentFuel, dataIndex: 'spentFuel', -- cgit v1.2.3