From 8fa931a45755b14f61bcc699296337efefc46160 Mon Sep 17 00:00:00 2001 From: Abyss777 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 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'web/app/AttributeFormatter.js') 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; } -- cgit v1.2.3