diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-10-21 14:17:32 +1300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-21 14:17:32 +1300 |
commit | e3de74167439ffdcad30ba1c5a716839b0df289c (patch) | |
tree | ed3973d317ddd5bc056202db952807542f905cc0 /web | |
parent | 524c64e5bac499a27b2ae9551e579f22b5dadb53 (diff) | |
parent | c93a38390de2b8a4f1e972ba49a5d73f53543b49 (diff) | |
download | etbsa-traccar-web-e3de74167439ffdcad30ba1c5a716839b0df289c.tar.gz etbsa-traccar-web-e3de74167439ffdcad30ba1c5a716839b0df289c.tar.bz2 etbsa-traccar-web-e3de74167439ffdcad30ba1c5a716839b0df289c.zip |
Merge pull request #304 from Abyss777/device_management_info
Edit and show device management info
Diffstat (limited to 'web')
-rw-r--r-- | web/app/model/Device.js | 12 | ||||
-rw-r--r-- | web/app/view/DeviceDialog.js | 12 | ||||
-rw-r--r-- | web/app/view/Devices.js | 15 | ||||
-rw-r--r-- | web/l10n/en.json | 3 |
4 files changed, 42 insertions, 0 deletions
diff --git a/web/app/model/Device.js b/web/app/model/Device.js index a625fff..ecaca0b 100644 --- a/web/app/model/Device.js +++ b/web/app/model/Device.js @@ -29,6 +29,18 @@ Ext.define('Traccar.model.Device', { name: 'uniqueId', type: 'string' }, { + name: 'phone', + type: 'string' + }, { + name: 'model', + type: 'string' + }, { + name: 'contact', + type: 'string' + }, { + name: 'category', + type: 'string' + }, { name: 'status', type: 'string' }, { diff --git a/web/app/view/DeviceDialog.js b/web/app/view/DeviceDialog.js index 69f1ceb..ab602b8 100644 --- a/web/app/view/DeviceDialog.js +++ b/web/app/view/DeviceDialog.js @@ -45,6 +45,18 @@ Ext.define('Traccar.view.DeviceDialog', { queryMode: 'local', displayField: 'name', valueField: 'id' + }, { + xtype: 'textfield', + name: 'phone', + fieldLabel: Strings.devicePhone + }, { + xtype: 'textfield', + name: 'model', + fieldLabel: Strings.deviceModel + }, { + xtype: 'textfield', + name: 'contact', + fieldLabel: Strings.deviceContact }] } }); diff --git a/web/app/view/Devices.js b/web/app/view/Devices.js index 02f92ea..2203052 100644 --- a/web/app/view/Devices.js +++ b/web/app/view/Devices.js @@ -156,6 +156,21 @@ Ext.define('Traccar.view.Devices', { hidden: true, flex: 1 }, { + text: Strings.devicePhone, + dataIndex: 'phone', + hidden: true, + flex: 1 + }, { + text: Strings.deviceModel, + dataIndex: 'model', + hidden: true, + flex: 1 + }, { + text: Strings.deviceContact, + dataIndex: 'contact', + hidden: true, + flex: 1 + }, { text: Strings.deviceLastUpdate, dataIndex: 'lastUpdate', flex: 1, diff --git a/web/l10n/en.json b/web/l10n/en.json index 46fb858..1b8c966 100644 --- a/web/l10n/en.json +++ b/web/l10n/en.json @@ -54,6 +54,9 @@ "deviceDialog": "Device", "deviceTitle": "Devices", "deviceIdentifier": "Identifier", + "devicePhone": "Phone", + "deviceModel": "Model", + "deviceContact": "Contact", "deviceLastUpdate": "Last Update", "deviceCommand": "Command", "deviceFollow": "Follow", |