aboutsummaryrefslogtreecommitdiff
path: root/web/app/store
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-09-06 13:28:48 +0500
committerAbyss777 <abyss@fox5.ru>2017-09-06 14:59:08 +0500
commit1edfec60e54b26f3cd7970075b58bb69920b37f7 (patch)
treed7ecca927798e16c469868fc609c954fe3d1016c /web/app/store
parentae9de5a7b9cf43ad488022675d243a4b7a863aa4 (diff)
downloadtrackermap-web-1edfec60e54b26f3cd7970075b58bb69920b37f7.tar.gz
trackermap-web-1edfec60e54b26f3cd7970075b58bb69920b37f7.tar.bz2
trackermap-web-1edfec60e54b26f3cd7970075b58bb69920b37f7.zip
Move units to attributes and add volume units
Diffstat (limited to 'web/app/store')
-rw-r--r--web/app/store/CommonUserAttributes.js20
-rw-r--r--web/app/store/VolumeUnits.js57
2 files changed, 77 insertions, 0 deletions
diff --git a/web/app/store/CommonUserAttributes.js b/web/app/store/CommonUserAttributes.js
index d07d955d..d000909d 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.sharedDistance,
+ valueType: 'string',
+ dataType: 'distanceUnit'
+ }, {
+ key: 'speedUnit',
+ name: Strings.settingsSpeedUnit,
+ valueType: 'string',
+ dataType: 'speedUnit'
+ }, {
+ key: 'volumeUnit',
+ name: Strings.sharedVolumeUnit,
+ 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 00000000..2bdf6684
--- /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');
+ }
+});