From 1613d72c0a33dd27c3201fc1307aa2743d92cd7a Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 20 Oct 2016 15:38:20 +0500 Subject: Edit and show device management info --- web/app/model/Device.js | 12 ++++++++++++ web/app/view/DeviceDialog.js | 12 ++++++++++++ web/app/view/Devices.js | 15 +++++++++++++++ web/l10n/en.json | 3 +++ 4 files changed, 42 insertions(+) diff --git a/web/app/model/Device.js b/web/app/model/Device.js index a625fff3..0e304b64 100644 --- a/web/app/model/Device.js +++ b/web/app/model/Device.js @@ -28,6 +28,18 @@ Ext.define('Traccar.model.Device', { }, { name: 'uniqueId', type: 'string' + }, { + name: 'phone', + type: 'string' + }, { + name: 'model', + type: 'string' + }, { + name: 'contact', + type: 'string' + }, { + name: 'type', + type: 'string' }, { name: 'status', type: 'string' diff --git a/web/app/view/DeviceDialog.js b/web/app/view/DeviceDialog.js index 69f1ceb9..ab602b8d 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 02f92ea5..22030528 100644 --- a/web/app/view/Devices.js +++ b/web/app/view/Devices.js @@ -155,6 +155,21 @@ Ext.define('Traccar.view.Devices', { dataIndex: 'uniqueId', 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', diff --git a/web/l10n/en.json b/web/l10n/en.json index 46fb8582..1b8c9668 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", -- cgit v1.2.3 From c93a38390de2b8a4f1e972ba49a5d73f53543b49 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Fri, 21 Oct 2016 06:13:50 +0500 Subject: Rename type to category --- web/app/model/Device.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/app/model/Device.js b/web/app/model/Device.js index 0e304b64..ecaca0b0 100644 --- a/web/app/model/Device.js +++ b/web/app/model/Device.js @@ -38,7 +38,7 @@ Ext.define('Traccar.model.Device', { name: 'contact', type: 'string' }, { - name: 'type', + name: 'category', type: 'string' }, { name: 'status', -- cgit v1.2.3