diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-09-07 23:32:25 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-07 23:32:25 +1200 |
commit | 911863f770557f474138f2b113054d5bb294daf8 (patch) | |
tree | 28eea451b90f96be8b1355a0ea8c7c4e67485a12 /web/app/view/Statistics.js | |
parent | 019fccd1bd4a123fe93228462b33f14889b23394 (diff) | |
parent | e4acd577b0f4d83780d8101c3dc5ba177d649604 (diff) | |
download | etbsa-traccar-web-911863f770557f474138f2b113054d5bb294daf8.tar.gz etbsa-traccar-web-911863f770557f474138f2b113054d5bb294daf8.tar.bz2 etbsa-traccar-web-911863f770557f474138f2b113054d5bb294daf8.zip |
Merge pull request #574 from Abyss777/attributes_types
Save attributes with correct types
Diffstat (limited to 'web/app/view/Statistics.js')
-rw-r--r-- | web/app/view/Statistics.js | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/web/app/view/Statistics.js b/web/app/view/Statistics.js index d5176a3..55e4d50 100644 --- a/web/app/view/Statistics.js +++ b/web/app/view/Statistics.js @@ -25,28 +25,31 @@ Ext.define('Traccar.view.Statistics', { controller: 'statistics', store: 'Statistics', - tbar: [{ - xtype: 'tbtext', - html: Strings.reportFrom - }, { - xtype: 'datefield', - reference: 'fromDateField', - startDay: Traccar.Style.weekStartDay, - format: Traccar.Style.dateFormat, - value: new Date(new Date().getTime() - 24 * 60 * 60 * 1000) - }, '-', { - xtype: 'tbtext', - html: Strings.reportTo - }, { - xtype: 'datefield', - reference: 'toDateField', - startDay: Traccar.Style.weekStartDay, - format: Traccar.Style.dateFormat, - value: new Date() - }, '-', { - text: Strings.reportShow, - handler: 'onShowClick' - }], + tbar: { + scrollable: true, + items: [{ + xtype: 'tbtext', + html: Strings.reportFrom + }, { + xtype: 'datefield', + reference: 'fromDateField', + startDay: Traccar.Style.weekStartDay, + format: Traccar.Style.dateFormat, + value: new Date(new Date().getTime() - 24 * 60 * 60 * 1000) + }, '-', { + xtype: 'tbtext', + html: Strings.reportTo + }, { + xtype: 'datefield', + reference: 'toDateField', + startDay: Traccar.Style.weekStartDay, + format: Traccar.Style.dateFormat, + value: new Date() + }, '-', { + text: Strings.reportShow, + handler: 'onShowClick' + }] + }, columns: { defaults: { |