aboutsummaryrefslogtreecommitdiff
path: root/web/app/view/Report.js
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-03-13 13:07:30 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2016-03-13 13:07:30 +1300
commit2be68b0e9c1f26f329d5cf1d836cffdf8d506b8e (patch)
tree85b17d225d570d3cc1fdffce274d1beb26926cc3 /web/app/view/Report.js
parent984feba192d0b347b99c550009ec6fd078728ca2 (diff)
downloadtraccar-server-2be68b0e9c1f26f329d5cf1d836cffdf8d506b8e.tar.gz
traccar-server-2be68b0e9c1f26f329d5cf1d836cffdf8d506b8e.tar.bz2
traccar-server-2be68b0e9c1f26f329d5cf1d836cffdf8d506b8e.zip
Support 12 hour format in web
Diffstat (limited to 'web/app/view/Report.js')
-rw-r--r--web/app/view/Report.js9
1 files changed, 4 insertions, 5 deletions
diff --git a/web/app/view/Report.js b/web/app/view/Report.js
index 91ccba917..4261b9040 100644
--- a/web/app/view/Report.js
+++ b/web/app/view/Report.js
@@ -19,7 +19,8 @@ Ext.define('Traccar.view.Report', {
xtype: 'reportView',
requires: [
- 'Traccar.view.ReportController'
+ 'Traccar.view.ReportController',
+ 'Traccar.view.CustomTimeField'
],
controller: 'report',
@@ -48,10 +49,9 @@ Ext.define('Traccar.view.Report', {
format: Traccar.Style.dateFormat,
value: new Date(new Date().getTime() - 30 * 60 * 1000)
}, {
- xtype: 'timefield',
+ xtype: 'customTimeField',
reference: 'fromTimeField',
maxWidth: Traccar.Style.reportTime,
- format: Traccar.Style.timeFormat,
value: new Date(new Date().getTime() - 30 * 60 * 1000)
}, '-', {
xtype: 'tbtext',
@@ -63,10 +63,9 @@ Ext.define('Traccar.view.Report', {
format: Traccar.Style.dateFormat,
value: new Date()
}, {
- xtype: 'timefield',
+ xtype: 'customTimeField',
reference: 'toTimeField',
maxWidth: Traccar.Style.reportTime,
- format: Traccar.Style.timeFormat,
value: new Date()
}, '-', {
text: Strings.reportShow,