diff options
Diffstat (limited to 'web/app/store')
-rw-r--r-- | web/app/store/DistanceUnits.js | 4 | ||||
-rw-r--r-- | web/app/store/PositionAttributes.js | 2 | ||||
-rw-r--r-- | web/app/store/ReportChartTypes.js | 12 | ||||
-rw-r--r-- | web/app/store/SpeedUnits.js | 4 |
4 files changed, 8 insertions, 14 deletions
diff --git a/web/app/store/DistanceUnits.js b/web/app/store/DistanceUnits.js index 514a051..e64ce23 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 985c558..7215429 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 889db50..8ca074f 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 ce97695..a36be92 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'); } }); |