aboutsummaryrefslogtreecommitdiff
path: root/web/app/view/ReportController.js
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-08-18 11:52:06 +0500
committerAbyss777 <abyss@fox5.ru>2017-08-18 11:52:06 +0500
commit65116928b2b7a8e5e2b70bf490b3225896cf2c71 (patch)
treeaf24b231822fb045a7ae4d03e533775285d41e47 /web/app/view/ReportController.js
parent01af5f520e24a33d7e22523d8ed11e9f14a19516 (diff)
parentb3d3c720f34e12e7af83e6be3bd87e304931bbe1 (diff)
downloadtrackermap-web-65116928b2b7a8e5e2b70bf490b3225896cf2c71.tar.gz
trackermap-web-65116928b2b7a8e5e2b70bf490b3225896cf2c71.tar.bz2
trackermap-web-65116928b2b7a8e5e2b70bf490b3225896cf2c71.zip
Merge branch 'master' into disable_vehicle_features
Diffstat (limited to 'web/app/view/ReportController.js')
-rw-r--r--web/app/view/ReportController.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index 85af559a..5c052b50 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -134,7 +134,7 @@ Ext.define('Traccar.view.ReportController', {
updateButtons: function () {
var reportType, disabled, devices, time;
reportType = this.lookupReference('reportTypeField').getValue();
- devices = (this.deviceId && this.deviceId.length !== 0) || (this.groupId && this.groupId.length !== 0);
+ devices = this.deviceId && this.deviceId.length !== 0 || this.groupId && this.groupId.length !== 0;
time = this.fromDate && this.fromTime && this.toDate && this.toTime;
disabled = !reportType || !devices || !time;
this.lookupReference('showButton').setDisabled(disabled);
@@ -221,7 +221,7 @@ Ext.define('Traccar.view.ReportController', {
}
},
- selectReport: function (object, center) {
+ selectReport: function (object) {
var positionRelated, reportType = this.lookupReference('reportTypeField').getValue();
if (object instanceof Traccar.model.Position) {
if (reportType === 'route') {
@@ -298,15 +298,15 @@ Ext.define('Traccar.view.ReportController', {
var i, deviceIds, chartSeries, deviceStore;
if (this.lookupReference('reportTypeField').getValue() === 'chart') {
this.getChart().getAxes()[0].setTitle(
- Ext.getStore('ReportChartTypes').findRecord('key', this.chartType).get('name'));
+ Ext.getStore('ReportChartTypes').findRecord('key', this.chartType).get('name'));
chartSeries = [];
deviceIds = store.collect('deviceId');
for (i = 0; i < deviceIds.length; i++) {
- deviceStore = new Ext.create('Ext.data.ChainedStore', {
+ deviceStore = Ext.create('Ext.data.ChainedStore', {
source: 'ReportRoute',
filters: [{
property: 'deviceId',
- value : deviceIds[i]
+ value: deviceIds[i]
}]
});
chartSeries.push({