aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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..d555205f 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 = value >= 60000 ? Math.floor(value % 3600000 / 60000) : Math.round(value / 60000);
return hours + ' ' + Strings.sharedHourAbbreviation + ' ' + minutes + ' ' + Strings.sharedMinuteAbbreviation;
},