aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-08-30 16:20:10 +1200
committerGitHub <noreply@github.com>2017-08-30 16:20:10 +1200
commitc321abccb465b4ee66c5de087be7bb9223c4d301 (patch)
treed3008e5ae13936a3b91f78a887d3960e800c51ed
parent305d268be14e3eca575f8580018cc31b43e2142c (diff)
parent164f648d107fee4a1fc47cd867096bd603a8d382 (diff)
downloadtrackermap-web-c321abccb465b4ee66c5de087be7bb9223c4d301.tar.gz
trackermap-web-c321abccb465b4ee66c5de087be7bb9223c4d301.tar.bz2
trackermap-web-c321abccb465b4ee66c5de087be7bb9223c4d301.zip
Merge pull request #561 from Abyss777/fix_duration_formatting
Fix duration formatting
-rw-r--r--.gitignore1
-rw-r--r--web/app/AttributeFormatter.js2
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index d395d2ea..ca362d4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
.project
.settings
+.tern-project
.DS_Store
nbproject/
web/app.min.js
diff --git a/web/app/AttributeFormatter.js b/web/app/AttributeFormatter.js
index 957992da..abe0f485 100644
--- a/web/app/AttributeFormatter.js
+++ b/web/app/AttributeFormatter.js
@@ -55,7 +55,7 @@ Ext.define('Traccar.AttributeFormatter', {
durationFormatter: function (value) {
var hours, minutes;
hours = Math.floor(value / 3600000);
- minutes = Math.round(value % 3600000 / 60000);
+ minutes = Math.floor(value % 3600000 / 60000);
return hours + ' ' + Strings.sharedHourAbbreviation + ' ' + minutes + ' ' + Strings.sharedMinuteAbbreviation;
},