From 44806acd0e4fa1618e66ac61f2cc6e0505dc9c92 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Mon, 4 Sep 2017 09:44:54 +0500 Subject: Improve commands --- web/app/store/CommandTypes.js | 19 +--- web/app/store/KnownCommands.js | 234 +++++++++++++++++++++++++++++++++++++++++ web/app/store/TimeUnits.js | 6 +- 3 files changed, 238 insertions(+), 21 deletions(-) create mode 100644 web/app/store/KnownCommands.js (limited to 'web/app/store') diff --git a/web/app/store/CommandTypes.js b/web/app/store/CommandTypes.js index a14dd58..f14cb59 100644 --- a/web/app/store/CommandTypes.js +++ b/web/app/store/CommandTypes.js @@ -18,28 +18,11 @@ Ext.define('Traccar.store.CommandTypes', { extend: 'Ext.data.Store', - fields: ['type', 'name'], + model: 'Traccar.model.KnownCommand', proxy: { type: 'rest', url: 'api/commandtypes', - reader: { - type: 'json', - getData: function (data) { - Ext.each(data, function (entry) { - var nameKey, name; - entry.name = entry.type; - if (typeof entry.type !== 'undefined') { - nameKey = 'command' + entry.type.charAt(0).toUpperCase() + entry.type.slice(1); - name = Strings[nameKey]; - if (typeof name !== 'undefined') { - entry.name = name; - } - } - }); - return data; - } - }, listeners: { 'exception': function (proxy, response) { Traccar.app.showError(response); diff --git a/web/app/store/KnownCommands.js b/web/app/store/KnownCommands.js new file mode 100644 index 0000000..8bf2e24 --- /dev/null +++ b/web/app/store/KnownCommands.js @@ -0,0 +1,234 @@ +/* + * 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 . + */ +Ext.define('Traccar.store.KnownCommands', { + extend: 'Ext.data.Store', + model: 'Traccar.model.KnownCommand', + + data: [{ + type: 'custom', + parameters: [{ + key: 'data', + name: Strings.commandData, + valueType: 'string' + }] + }, { + type: 'positionPeriodic', + parameters: [{ + key: 'frequency', + name: Strings.commandFrequency, + valueType: 'number', + allowDecimals: false, + minValue: 0, + dataType: 'frequency' + }] + }, { + type: 'setTimezone', + parameters: [{ + key: 'timezoneName', + name: Strings.commandTimezone, + valueType: 'string', + dataType: 'timezone' + }] + }, { + type: 'sendSms', + parameters: [{ + key: 'phone', + name: Strings.commandPhone, + valueType: 'string' + }, { + key: 'message', + name: Strings.commandMessage, + valueType: 'string' + }] + }, { + type: 'sendUssd', + parameters: [{ + key: 'phone', + name: Strings.commandPhone, + valueType: 'string' + }] + }, { + type: 'sosNumber', + parameters: [{ + key: 'index', + name: Strings.commandIndex, + valueType: 'number', + allowDecimals: false, + minValue: 0 + }, { + key: 'phone', + name: Strings.commandPhone, + valueType: 'string' + }] + }, { + type: 'silenceTime', + parameters: [{ + key: 'data', + name: Strings.commandData, + valueType: 'string' + }] + }, { + type: 'setPhonebook', + parameters: [{ + key: 'data', + name: Strings.commandData, + valueType: 'string' + }] + }, { + type: 'voiceMessage', + parameters: [{ + key: 'data', + name: Strings.commandData, + valueType: 'string' + }] + }, { + type: 'outputControl', + parameters: [{ + key: 'index', + name: Strings.commandIndex, + valueType: 'number', + allowDecimals: false, + minValue: 0 + }, { + key: 'data', + name: Strings.commandData, + valueType: 'string' + }] + }, { + type: 'voiceMonitoring', + parameters: [{ + key: 'enable', + name: Strings.commandEnable, + valueType: 'boolean' + }] + }, { + type: 'setAgps', + parameters: [{ + key: 'enable', + name: Strings.commandEnable, + valueType: 'boolean' + }] + }, { + type: 'setIndicator', + parameters: [{ + key: 'data', + name: Strings.commandData, + valueType: 'string' + }] + }, { + type: 'configuration', + parameters: [{ + key: 'data', + name: Strings.commandData, + valueType: 'string' + }] + }, { + type: 'setConnection', + parameters: [{ + key: 'server', + name: Strings.commandServer, + valueType: 'string' + }, { + key: 'port', + name: Strings.commandPort, + valueType: 'number', + allowDecimals: false, + minValue: 1, + maxValue: 65535 + }] + }, { + type: 'setOdometer', + parameters: [{ + key: 'data', + name: Strings.commandData, + valueType: 'string' + }] + }, { + type: 'modePowerSaving', + parameters: [{ + key: 'enable', + name: Strings.commandEnable, + valueType: 'boolean' + }] + }, { + type: 'modeDeepSleep', + parameters: [{ + key: 'enable', + name: Strings.commandEnable, + valueType: 'boolean' + }] + }, { + type: 'movementAlarm', + parameters: [{ + key: 'radius', + name: Strings.commandRadius, + valueType: 'number', + allowDecimals: false, + minValue: 0 + }] + }, { + type: 'alarmBattery', + parameters: [{ + key: 'enable', + name: Strings.commandEnable, + valueType: 'boolean' + }] + }, { + type: 'alarmSos', + parameters: [{ + key: 'enable', + name: Strings.commandEnable, + valueType: 'boolean' + }] + }, { + type: 'alarmRemove', + parameters: [{ + key: 'enable', + name: Strings.commandEnable, + valueType: 'boolean' + }] + }, { + type: 'alarmClock', + parameters: [{ + key: 'data', + name: Strings.commandData, + valueType: 'string' + }] + }, { + type: 'alarmSpeed', + parameters: [{ + key: 'data', + name: Strings.commandData, + valueType: 'string' + }] + }, { + type: 'alarmFall', + parameters: [{ + key: 'enable', + name: Strings.commandEnable, + valueType: 'boolean' + }] + }, { + type: 'alarmVibration', + parameters: [{ + key: 'data', + name: Strings.commandData, + valueType: 'string' + }] + }] +}); diff --git a/web/app/store/TimeUnits.js b/web/app/store/TimeUnits.js index efcf1d6..6afeb93 100644 --- a/web/app/store/TimeUnits.js +++ b/web/app/store/TimeUnits.js @@ -20,13 +20,13 @@ Ext.define('Traccar.store.TimeUnits', { fields: ['name', 'factor'], data: [{ - name: Strings.sharedSecond, + name: Strings.sharedSecondAbbreviation, factor: 1 }, { - name: Strings.sharedMinute, + name: Strings.sharedMinuteAbbreviation, factor: 60 }, { - name: Strings.sharedHour, + name: Strings.sharedHourAbbreviation, factor: 3600 }] }); -- cgit v1.2.3 From a9c3d0532db72a635f373f2dce5bc5365aed16dc Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Mon, 4 Sep 2017 16:16:31 +0500 Subject: Improve CustomNumberField --- web/app/store/TimeUnits.js | 18 ++++- web/app/view/CustomNumberField.js | 109 ++++++++++++++++++------------- web/app/view/dialog/CommandController.js | 7 +- 3 files changed, 81 insertions(+), 53 deletions(-) (limited to 'web/app/store') diff --git a/web/app/store/TimeUnits.js b/web/app/store/TimeUnits.js index 6afeb93..0d16c4b 100644 --- a/web/app/store/TimeUnits.js +++ b/web/app/store/TimeUnits.js @@ -1,5 +1,5 @@ /* - * Copyright 2015 Anton Tananaev (anton@traccar.org) + * Copyright 2015 - 2017 Anton Tananaev (anton@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 @@ -17,16 +17,28 @@ Ext.define('Traccar.store.TimeUnits', { extend: 'Ext.data.Store', - fields: ['name', 'factor'], + fields: ['key', 'name', 'factor'], data: [{ + key: 's', name: Strings.sharedSecondAbbreviation, factor: 1 }, { + key: 'm', name: Strings.sharedMinuteAbbreviation, factor: 60 }, { + key: 'h', name: Strings.sharedHourAbbreviation, factor: 3600 - }] + }], + + convertValue: function (value, unit, back) { + var model; + if (!unit) { + unit = 'kn'; + } + model = this.findRecord('key', unit); + return back ? value * model.get('factor') : value / model.get('factor'); + } }); diff --git a/web/app/view/CustomNumberField.js b/web/app/view/CustomNumberField.js index 9144b52..bc07691 100644 --- a/web/app/view/CustomNumberField.js +++ b/web/app/view/CustomNumberField.js @@ -19,63 +19,80 @@ Ext.define('Traccar.view.CustomNumberField', { extend: 'Ext.form.field.Number', xtype: 'customNumberField', - beforeEl: '
', - unitEl: '
', + beforeEl: '
', + unitEl: '
', constructor: function (config) { - var unit; - if (config.dataType === 'speed') { - unit = Traccar.app.getPreference('speedUnit', 'kn'); - config.beforeSubTpl = this.beforeEl; - config.afterSubTpl = this.unitEl + Ext.getStore('SpeedUnits').findRecord('key', unit).get('name') + '
'; - config.rawToValue = function (rawValue) { - return Ext.getStore('SpeedUnits').convertValue(rawValue, Traccar.app.getPreference('speedUnit', 'kn'), true); - }; - config.valueToRaw = function (value) { - return Ext.getStore('SpeedUnits').convertValue(value, Traccar.app.getPreference('speedUnit', 'kn')); - }; - } else if (config.dataType === 'distance') { - config.beforeSubTpl = this.beforeEl; - unit = Traccar.app.getPreference('distanceUnit', 'km'); - config.afterSubTpl = this.unitEl + Ext.getStore('DistanceUnits').findRecord('key', unit).get('name') + '
'; - config.rawToValue = function (rawValue) { - return Ext.getStore('DistanceUnits').convertValue(rawValue, Traccar.app.getPreference('distanceUnit', 'km'), true); - }; - config.valueToRaw = function (value) { - return Ext.getStore('DistanceUnits').convertValue(value, Traccar.app.getPreference('distanceUnit', 'km')); - }; - } else if (config.dataType === 'frequency') { - config.beforeSubTpl = this.beforeEl; - config.afterSubTpl = this.unitEl + ''; - config.listeners = { - afterrender: function (numberField) { - if (!numberField.timeUnits) { - numberField.timeUnits = Ext.create({ - xtype: 'combobox', - renderTo: 'unitEl', - store: 'TimeUnits', - displayField: 'name', - valueField: 'factor', - value: 1, - width: 70 - }); + var unitName = ''; + if (config.dataType) { + config.beforeBodyEl = this.beforeEl; + switch (config.dataType) { + case 'speed': + config.units = {}; + config.units.getStore = function () { + return Ext.getStore('SpeedUnits'); + }; + config.units.getValue = function () { + return Traccar.app.getPreference('speedUnit', 'kn'); + }; + unitName = Ext.getStore('SpeedUnits').findRecord('key', config.units.getValue()).get('name'); + break; + case 'distance': + config.units = {}; + config.units.getStore = function () { + return Ext.getStore('DistanceUnits'); + }; + config.units.getValue = function () { + return Traccar.app.getPreference('distanceUnit', 'km'); + }; + unitName = Ext.getStore('DistanceUnits').findRecord('key', config.units.getValue()).get('name'); + break; + case 'frequency': + if (!config.listeners) { + config.listeners = {}; } - } - }; + config.listeners.afterrender = function () { + if (!this.units) { + this.units = Ext.create({ + xtype: 'combobox', + renderTo: 'numberUnitEl', + store: 'TimeUnits', + displayField: 'name', + valueField: 'key', + editable: false, + numberField: this, + value: 's', + width: '70px', + listeners: { + select: function () { + this.numberField.step = this.getStore().convertValue(1, this.getValue(), true); + } + } + }); + } + }; + break; + default: + break; + } + config.afterBodyEl = this.unitEl + unitName + ''; config.rawToValue = function (rawValue) { - if (this.timeUnits) { - return rawValue * this.timeUnits.getValue(); + if (this.units) { + return this.units.getStore().convertValue(rawValue, this.units.getValue(), true); } else { - return rawValue; + return this.parseValue(rawValue); } }; config.valueToRaw = function (value) { - if (this.timeUnits) { - return value / this.timeUnits.getValue(); + if (this.units) { + return this.units.getStore().convertValue(value, this.units.getValue(), false); } else { - return value; + return this.parseValue(value); } }; + if (config.units) { + config.step = config.units.getStore().convertValue(1, config.units.getValue(), true); + } } this.callParent(arguments); } diff --git a/web/app/view/dialog/CommandController.js b/web/app/view/dialog/CommandController.js index 4ab5184..fc233f3 100644 --- a/web/app/view/dialog/CommandController.js +++ b/web/app/view/dialog/CommandController.js @@ -75,11 +75,10 @@ Ext.define('Traccar.view.dialog.CommandController', { record = form.getRecord(); parameters = this.lookupReference('parameters').items.items; - if (parameters.length > 0) { - for (i = 0; i < parameters.length; i++) { - attributes[parameters[i].key] = parameters[i].getValue(); - } + for (i = 0; i < parameters.length; i++) { + attributes[parameters[i].key] = parameters[i].getValue(); } + record.set('attributes', attributes); Ext.Ajax.request({ -- cgit v1.2.3