diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-09-06 23:56:08 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-06 23:56:08 +1200 |
commit | 019fccd1bd4a123fe93228462b33f14889b23394 (patch) | |
tree | 5323e6bed0fcf18caa4847b47a2acecc9b060198 /web/app/store | |
parent | f819f04cc8fbc85c299ca647707364a2436d8987 (diff) | |
parent | ae877a48698f28beae82753feae9b4a8e0993ca2 (diff) | |
download | etbsa-traccar-web-019fccd1bd4a123fe93228462b33f14889b23394.tar.gz etbsa-traccar-web-019fccd1bd4a123fe93228462b33f14889b23394.tar.bz2 etbsa-traccar-web-019fccd1bd4a123fe93228462b33f14889b23394.zip |
Merge pull request #573 from Abyss777/units_attributes
Move units to attributes and add volume units
Diffstat (limited to 'web/app/store')
-rw-r--r-- | web/app/store/CommonUserAttributes.js | 20 | ||||
-rw-r--r-- | web/app/store/VolumeUnits.js | 57 |
2 files changed, 77 insertions, 0 deletions
diff --git a/web/app/store/CommonUserAttributes.js b/web/app/store/CommonUserAttributes.js index d07d955..1ba223f 100644 --- a/web/app/store/CommonUserAttributes.js +++ b/web/app/store/CommonUserAttributes.js @@ -58,5 +58,25 @@ Ext.define('Traccar.store.CommonUserAttributes', { key: 'ui.disableCalendars', name: Strings.attributeUiDisableCalendars, valueType: 'boolean' + }, { + key: 'distanceUnit', + name: Strings.settingsDistanceUnit, + valueType: 'string', + dataType: 'distanceUnit' + }, { + key: 'speedUnit', + name: Strings.settingsSpeedUnit, + valueType: 'string', + dataType: 'speedUnit' + }, { + key: 'volumeUnit', + name: Strings.settingsVolumeUnit, + valueType: 'string', + dataType: 'volumeUnit' + }, { + key: 'timezone', + name: Strings.sharedTimezone, + valueType: 'string', + dataType: 'timezone' }] }); diff --git a/web/app/store/VolumeUnits.js b/web/app/store/VolumeUnits.js new file mode 100644 index 0000000..2bdf668 --- /dev/null +++ b/web/app/store/VolumeUnits.js @@ -0,0 +1,57 @@ +/* + * Copyright 2017 Anton Tananaev (anton@traccar.org) + * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +Ext.define('Traccar.store.VolumeUnits', { + extend: 'Ext.data.Store', + fields: ['key', 'name', 'fullName', 'factor'], + + data: [{ + key: 'ltr', + name: Strings.sharedLiterAbbreviation, + fullName: Strings.sharedLiter, + factor: 1 + }, { + key: 'impGal', + name: Strings.sharedGallonAbbreviation, + fullName: Strings.sharedImpGallon, + factor: 4.546 + }, { + key: 'usGal', + name: Strings.sharedGallonAbbreviation, + fullName: Strings.sharedUsGallon, + factor: 3.785 + }], + + convertValue: function (value, unit, back) { + var model; + if (!unit) { + unit = 'ltr'; + } + model = this.findRecord('key', unit); + return back ? value * model.get('factor') : value / model.get('factor'); + }, + + formatValue: function (value, unit, convert) { + var model; + if (!unit) { + unit = 'ltr'; + } + model = this.findRecord('key', unit); + return (convert ? this.convertValue(value, unit) : value).toFixed(1) + ' ' + model.get('name'); + } +}); |