diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-12-30 22:31:24 +1300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-30 22:31:24 +1300 |
commit | 37001649c81ab0d9eb31b517fc0def473440fb21 (patch) | |
tree | 63cbceb8bc3e4eaf783f53342a6d7cc0c9c3fcb7 /web/app/view/ReportController.js | |
parent | f5030b90ecde5a50e05cd81ed8d08b6387b8dead (diff) | |
parent | c142bc62a8f004630efac97cf15eb9ba604c3981 (diff) | |
download | trackermap-web-37001649c81ab0d9eb31b517fc0def473440fb21.tar.gz trackermap-web-37001649c81ab0d9eb31b517fc0def473440fb21.tar.bz2 trackermap-web-37001649c81ab0d9eb31b517fc0def473440fb21.zip |
Merge pull request #378 from Abyss777/not_show_markers
Add an option to not show report markers
Diffstat (limited to 'web/app/view/ReportController.js')
-rw-r--r-- | web/app/view/ReportController.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js index 0064c5b8..d53abed7 100644 --- a/web/app/view/ReportController.js +++ b/web/app/view/ReportController.js @@ -79,6 +79,9 @@ Ext.define('Traccar.view.ReportController', { if (this.chartType !== undefined) { dialog.lookupReference('chartTypeField').setValue(this.chartType); } + if (this.showMarkers !== undefined) { + dialog.lookupReference('showMarkersField').setValue(this.showMarkers); + } if (this.fromDate !== undefined) { dialog.lookupReference('fromDateField').setValue(this.fromDate); } @@ -125,6 +128,7 @@ Ext.define('Traccar.view.ReportController', { } else { store = this.getGrid().getStore(); } + store.showMarkers = this.showMarkers; store.load({ params: { deviceId: this.deviceId, @@ -207,6 +211,7 @@ Ext.define('Traccar.view.ReportController', { from = new Date(trip.get('startTime')); to = new Date(trip.get('endTime')); Ext.getStore('ReportRoute').removeAll(); + Ext.getStore('ReportRoute').showMarkers = this.showMarkers; Ext.getStore('ReportRoute').load({ params: { deviceId: trip.get('deviceId'), @@ -243,6 +248,7 @@ Ext.define('Traccar.view.ReportController', { scope: this, callback: function (records, operation, success) { if (success) { + Ext.getStore('ReportRoute').showMarkers = this.showMarkers; Ext.getStore('ReportRoute').add(records); if (records.length === 1) { this.fireEvent('selectreport', records[0], false); |