aboutsummaryrefslogtreecommitdiff
path: root/web/app/store
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-06-07 08:21:06 -0700
committerGitHub <noreply@github.com>2017-06-07 08:21:06 -0700
commita330ae09293c62aae381cb2c7f36cfa76b86e813 (patch)
tree26478c08fc6f7136ec8355d13af2a1bbf97207dc /web/app/store
parentb6f2faab0d35d54189fefd7567b6310023c3ad7b (diff)
parente04a02921ea015d4f4fe69c1c3f1813a07be9cf4 (diff)
downloadtrackermap-web-a330ae09293c62aae381cb2c7f36cfa76b86e813.tar.gz
trackermap-web-a330ae09293c62aae381cb2c7f36cfa76b86e813.tar.bz2
trackermap-web-a330ae09293c62aae381cb2c7f36cfa76b86e813.zip
Merge pull request #501 from Abyss777/position_attributes_reports
Known position attributes for reports and charts
Diffstat (limited to 'web/app/store')
-rw-r--r--web/app/store/DistanceUnits.js4
-rw-r--r--web/app/store/PositionAttributes.js2
-rw-r--r--web/app/store/ReportChartTypes.js12
-rw-r--r--web/app/store/SpeedUnits.js4
4 files changed, 8 insertions, 14 deletions
diff --git a/web/app/store/DistanceUnits.js b/web/app/store/DistanceUnits.js
index 514a051e..e64ce234 100644
--- a/web/app/store/DistanceUnits.js
+++ b/web/app/store/DistanceUnits.js
@@ -42,12 +42,12 @@ Ext.define('Traccar.store.DistanceUnits', {
return back ? value / model.get('factor') : value * model.get('factor');
},
- formatValue: function (value, unit) {
+ formatValue: function (value, unit, convert) {
var model;
if (!unit) {
unit = 'km';
}
model = this.findRecord('key', unit);
- return this.convertValue(value, unit).toFixed(2) + ' ' + model.get('name');
+ return (convert ? this.convertValue(value, unit) : value).toFixed(2) + ' ' + model.get('name');
}
});
diff --git a/web/app/store/PositionAttributes.js b/web/app/store/PositionAttributes.js
index 985c558e..72154297 100644
--- a/web/app/store/PositionAttributes.js
+++ b/web/app/store/PositionAttributes.js
@@ -62,7 +62,7 @@ Ext.define('Traccar.store.PositionAttributes', {
valueType: 'string'
}, {
key: 'alarm',
- name: Strings.alarm,
+ name: Strings.positionAlarm,
valueType: 'string'
}, {
key: 'status',
diff --git a/web/app/store/ReportChartTypes.js b/web/app/store/ReportChartTypes.js
index 889db50d..8ca074f3 100644
--- a/web/app/store/ReportChartTypes.js
+++ b/web/app/store/ReportChartTypes.js
@@ -21,16 +21,10 @@ Ext.define('Traccar.store.ReportChartTypes', {
fields: ['key', 'name'],
data: [{
- key: 'speedConverted',
+ key: 'speed',
name: Strings.positionSpeed
}, {
- key: 'distanceConverted',
- name: Strings.positionDistance
- }, {
- key: 'rpm',
- name: Strings.positionRpm
- }, {
- key: 'fuel',
- name: Strings.positionFuel
+ key: 'accuracy',
+ name: Strings.positionAccuracy
}]
});
diff --git a/web/app/store/SpeedUnits.js b/web/app/store/SpeedUnits.js
index ce976952..a36be928 100644
--- a/web/app/store/SpeedUnits.js
+++ b/web/app/store/SpeedUnits.js
@@ -42,12 +42,12 @@ Ext.define('Traccar.store.SpeedUnits', {
return back ? value / model.get('factor') : value * model.get('factor');
},
- formatValue: function (value, unit) {
+ formatValue: function (value, unit, convert) {
var model;
if (!unit) {
unit = 'kn';
}
model = this.findRecord('key', unit);
- return this.convertValue(value, unit).toFixed(1) + ' ' + model.get('name');
+ return (convert ? this.convertValue(value, unit) : value).toFixed(1) + ' ' + model.get('name');
}
});