diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2019-02-27 12:34:24 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-27 12:34:24 -0800 |
commit | ecde88443393ac77b133d2682fef3885f859818e (patch) | |
tree | 9edb97a56389614132a645b03220ecdc8b5fa6b4 /web/app/view/ReportController.js | |
parent | 05b555c6c8539f35c1caf3b1f4e252146f1e7d38 (diff) | |
parent | 6dd4cb71561be3d41da3d10b810fb078f10e79b3 (diff) | |
download | trackermap-web-ecde88443393ac77b133d2682fef3885f859818e.tar.gz trackermap-web-ecde88443393ac77b133d2682fef3885f859818e.tar.bz2 trackermap-web-ecde88443393ac77b133d2682fef3885f859818e.zip |
Merge pull request #730 from iEvgeny/event2pos
Add connection between event and its state
Diffstat (limited to 'web/app/view/ReportController.js')
-rw-r--r-- | web/app/view/ReportController.js | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js index 5d43007a..2f10cde1 100644 --- a/web/app/view/ReportController.js +++ b/web/app/view/ReportController.js @@ -32,12 +32,13 @@ Ext.define('Traccar.view.ReportController', { listen: { controller: { '*': { - selectdevice: 'selectDevice', - showsingleevent: 'showSingleEvent', - deselectfeature: 'deselectFeature' + selectdevice: 'deselectReport', + selectevent: 'deselectReport', + showsingleevent: 'showSingleEvent' }, 'map': { - selectreport: 'selectReport' + selectreport: 'selectReport', + deselectfeature: 'deselectFeature' } }, global: { @@ -231,12 +232,6 @@ Ext.define('Traccar.view.ReportController', { } }, - selectDevice: function (device) { - if (device) { - this.getGrid().getSelectionModel().deselectAll(); - } - }, - selectReport: function (object) { var positionRelated, reportType = this.lookupReference('reportTypeField').getValue(); if (object instanceof Traccar.model.Position) { @@ -251,6 +246,12 @@ Ext.define('Traccar.view.ReportController', { } }, + deselectReport: function (object) { + if (object) { + this.deselectFeature(); + } + }, + deselectFeature: function () { if (this.lookupReference('reportTypeField').getValue() !== 'trips') { this.getGrid().getSelectionModel().deselectAll(); |