aboutsummaryrefslogtreecommitdiff
path: root/web/app/view/ReportController.js
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-11-30 09:59:14 +0500
committerAbyss777 <abyss@fox5.ru>2016-11-30 09:59:14 +0500
commit8ead897ea6b562567aceedee85a6c5c4f9088a5d (patch)
tree03af9ef555b29f11257bdb44ce901243e8ac4fcd /web/app/view/ReportController.js
parentd10d51eb9def4e9ce77d053503ba3eccd3ad23aa (diff)
downloadtrackermap-web-8ead897ea6b562567aceedee85a6c5c4f9088a5d.tar.gz
trackermap-web-8ead897ea6b562567aceedee85a6c5c4f9088a5d.tar.bz2
trackermap-web-8ead897ea6b562567aceedee85a6c5c4f9088a5d.zip
Show events on map
Diffstat (limited to 'web/app/view/ReportController.js')
-rw-r--r--web/app/view/ReportController.js59
1 files changed, 54 insertions, 5 deletions
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index 8f8cf741..a9c98a96 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -37,6 +37,11 @@ Ext.define('Traccar.view.ReportController', {
'map': {
selectreport: 'selectReport'
}
+ },
+ store: {
+ '#ReportEvents': {
+ load: 'loadEvents'
+ }
}
}
},
@@ -126,7 +131,7 @@ Ext.define('Traccar.view.ReportController', {
clearReport: function (reportType) {
this.getView().getStore().removeAll();
- if (reportType === 'trips') {
+ if (reportType === 'trips' || reportType === 'events') {
Ext.getStore('ReportRoute').removeAll();
}
},
@@ -139,6 +144,9 @@ Ext.define('Traccar.view.ReportController', {
if (report instanceof Traccar.model.ReportTrip) {
this.selectTrip(report);
}
+ if (report instanceof Traccar.model.Event) {
+ this.selectEvent(report);
+ }
}
},
@@ -149,10 +157,16 @@ Ext.define('Traccar.view.ReportController', {
},
selectReport: function (object, center) {
- var reportType = this.lookupReference('reportTypeField').getValue();
- if (object instanceof Traccar.model.Position && reportType === 'route') {
- this.getView().getSelectionModel().select([object], false, true);
- this.getView().getView().focusRow(object);
+ var positionEvent, reportType = this.lookupReference('reportTypeField').getValue();
+ if (object instanceof Traccar.model.Position) {
+ if (reportType === 'route') {
+ this.getView().getSelectionModel().select([object], false, true);
+ this.getView().getView().focusRow(object);
+ } else if (reportType === 'events') {
+ positionEvent = this.getView().getStore().findRecord('positionId', object.get('id'), 0, false, true, true);
+ this.getView().getSelectionModel().select([positionEvent], false, true);
+ this.getView().getView().focusRow(positionEvent);
+ }
}
},
@@ -170,6 +184,41 @@ Ext.define('Traccar.view.ReportController', {
});
},
+ selectEvent: function (event) {
+ var position;
+ if (event.get('positionId')) {
+ position = Ext.getStore('ReportRoute').getById(event.get('positionId'));
+ if (position) {
+ this.fireEvent('selectreport', position, true);
+ }
+ }
+ },
+
+ loadEvents: function (store, data) {
+ var i, eventObject, positionIds = {};
+ Ext.getStore('ReportRoute').removeAll();
+ if (data.length > 0) {
+ for (i = 0; i < data.length; i++) {
+ eventObject = data[i];
+ if (eventObject.get('positionId')) {
+ positionIds[eventObject.get('positionId')] = true;
+ }
+ }
+ }
+ if (Object.keys(positionIds).length > 0) {
+ Ext.getStore('Positions').load({
+ params: {
+ positionId: Object.keys(positionIds)
+ },
+ callback: function (records, operation, success) {
+ if (success) {
+ Ext.getStore('ReportRoute').add(records);
+ }
+ }
+ });
+ }
+ },
+
downloadFile: function (requestUrl, requestParams) {
Ext.Ajax.request({
url: requestUrl,