aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--web/app/store/ReportTypes.js4
-rw-r--r--web/app/view/Report.js2
-rw-r--r--web/app/view/ReportConfigDialog.js2
-rw-r--r--web/app/view/ReportController.js12
-rw-r--r--web/l10n/en.json4
5 files changed, 12 insertions, 12 deletions
diff --git a/web/app/store/ReportTypes.js b/web/app/store/ReportTypes.js
index 3305a10c..26a36279 100644
--- a/web/app/store/ReportTypes.js
+++ b/web/app/store/ReportTypes.js
@@ -32,7 +32,7 @@ Ext.define('Traccar.store.ReportTypes', {
key: 'summary',
name: Strings.reportSummary
}, {
- key: 'charts',
- name: Strings.reportCharts
+ key: 'chart',
+ name: Strings.reportChart
}]
});
diff --git a/web/app/view/Report.js b/web/app/view/Report.js
index 339761e9..61699bf7 100644
--- a/web/app/view/Report.js
+++ b/web/app/view/Report.js
@@ -93,7 +93,7 @@ Ext.define('Traccar.view.Report', {
},
store: 'ReportRoute',
axes: [{
- title: Strings.reportCharts,
+ title: Strings.reportChart,
type: 'numeric',
position: 'left'
}, {
diff --git a/web/app/view/ReportConfigDialog.js b/web/app/view/ReportConfigDialog.js
index 4afa929d..d9cf8471 100644
--- a/web/app/view/ReportConfigDialog.js
+++ b/web/app/view/ReportConfigDialog.js
@@ -56,7 +56,7 @@ Ext.define('Traccar.view.ReportConfigDialog', {
displayField: 'name',
queryMode: 'local'
}, {
- fieldLabel: Strings.reportChartTypes,
+ fieldLabel: Strings.reportChartType,
xtype: 'combobox',
width: Traccar.Style.reportTagfieldWidth,
reference: 'chartTypeField',
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index 65eb698b..383b38bf 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -66,7 +66,7 @@ Ext.define('Traccar.view.ReportController', {
onConfigureClick: function () {
var dialog = Ext.create('Traccar.view.ReportConfigDialog');
dialog.lookupReference('eventTypeField').setHidden(this.lookupReference('reportTypeField').getValue() !== 'events');
- dialog.lookupReference('chartTypeField').setHidden(this.lookupReference('reportTypeField').getValue() !== 'charts');
+ dialog.lookupReference('chartTypeField').setHidden(this.lookupReference('reportTypeField').getValue() !== 'chart');
dialog.callingPanel = this;
dialog.lookupReference('deviceField').setValue(this.deviceId);
dialog.lookupReference('groupField').setValue(this.groupId);
@@ -100,7 +100,7 @@ Ext.define('Traccar.view.ReportController', {
time = this.fromDate && this.fromTime && this.toDate && this.toTime;
disabled = !reportType || !devices || !time;
this.lookupReference('showButton').setDisabled(disabled);
- this.lookupReference('exportButton').setDisabled(reportType === 'charts' || disabled);
+ this.lookupReference('exportButton').setDisabled(reportType === 'chart' || disabled);
},
onReportClick: function (button) {
@@ -118,7 +118,7 @@ Ext.define('Traccar.view.ReportController', {
this.toTime.getHours(), this.toTime.getMinutes(), this.toTime.getSeconds(), this.toTime.getMilliseconds());
if (button.reference === 'showButton') {
- if (reportType === 'charts') {
+ if (reportType === 'chart') {
store = this.getChart().getStore();
this.getChart().setSeries([]);
} else {
@@ -156,7 +156,7 @@ Ext.define('Traccar.view.ReportController', {
if (reportType === 'trips' || reportType === 'events') {
Ext.getStore('ReportRoute').removeAll();
}
- if (reportType === 'charts') {
+ if (reportType === 'chart') {
this.getChart().getStore().removeAll();
}
},
@@ -248,7 +248,7 @@ Ext.define('Traccar.view.ReportController', {
loadRoute: function (store) {
var i, deviceIds, chartSeries, deviceStore;
- if (this.lookupReference('reportTypeField').getValue() === 'charts') {
+ if (this.lookupReference('reportTypeField').getValue() === 'chart') {
this.getChart().getAxes()[0].setTitle(
Ext.getStore('ReportChartTypes').findRecord('key', this.chartType).get('name'));
chartSeries = [];
@@ -362,7 +362,7 @@ Ext.define('Traccar.view.ReportController', {
} else if (newValue === 'trips') {
this.getGrid().reconfigure('ReportTrips', this.tripsColumns);
this.getView().getLayout().setActiveItem('grid');
- } else if (newValue === 'charts') {
+ } else if (newValue === 'chart') {
this.getView().getLayout().setActiveItem('chart');
}
diff --git a/web/l10n/en.json b/web/l10n/en.json
index 5ac13283..7b59e681 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -185,10 +185,10 @@
"reportEvents": "Events",
"reportTrips": "Trips",
"reportSummary": "Summary",
- "reportCharts": "Charts",
+ "reportChart": "Chart",
"reportConfigure": "Configure",
"reportEventTypes": "Event Types",
- "reportChartTypes": "Chart Types",
+ "reportChartType": "Chart Type",
"reportExport": "Export",
"reportDeviceName": "Device Name",
"reportAverageSpeed": "Average Speed",