diff options
| author | Abyss777 <abyss@fox5.ru> | 2017-02-20 14:03:47 +0500 |
|---|---|---|
| committer | Abyss777 <abyss@fox5.ru> | 2017-02-27 10:51:28 +0500 |
| commit | 274b412718b81deba404a1d10ae83d5d3c82238a (patch) | |
| tree | 729c61be0b309cb8e0d0d12e8dbe65df535ad00a | |
| parent | 66171b939e4d20ecae0014bb61862e1880e9c6c5 (diff) | |
| download | trackermap-web-274b412718b81deba404a1d10ae83d5d3c82238a.tar.gz trackermap-web-274b412718b81deba404a1d10ae83d5d3c82238a.tar.bz2 trackermap-web-274b412718b81deba404a1d10ae83d5d3c82238a.zip | |
Add SMS to notifications and phone to user
| -rw-r--r-- | web/app/model/Notification.js | 3 | ||||
| -rw-r--r-- | web/app/model/User.js | 3 | ||||
| -rw-r--r-- | web/app/view/DeviceDialog.js | 2 | ||||
| -rw-r--r-- | web/app/view/Notifications.js | 7 | ||||
| -rw-r--r-- | web/app/view/UserDialog.js | 4 | ||||
| -rw-r--r-- | web/l10n/en.json | 3 |
6 files changed, 20 insertions, 2 deletions
diff --git a/web/app/model/Notification.js b/web/app/model/Notification.js index 54f6674c..3ae13c05 100644 --- a/web/app/model/Notification.js +++ b/web/app/model/Notification.js @@ -36,5 +36,8 @@ Ext.define('Traccar.model.Notification', { }, { name: 'mail', type: 'bool' + }, { + name: 'sms', + type: 'bool' }] }); diff --git a/web/app/model/User.js b/web/app/model/User.js index df346eee..49400a3c 100644 --- a/web/app/model/User.js +++ b/web/app/model/User.js @@ -32,6 +32,9 @@ Ext.define('Traccar.model.User', { name: 'password', type: 'string' }, { + name: 'phone', + type: 'string' + }, { name: 'readonly', type: 'boolean' }, { diff --git a/web/app/view/DeviceDialog.js b/web/app/view/DeviceDialog.js index 960b3f9b..57820695 100644 --- a/web/app/view/DeviceDialog.js +++ b/web/app/view/DeviceDialog.js @@ -43,7 +43,7 @@ Ext.define('Traccar.view.DeviceDialog', { }, { xtype: 'textfield', name: 'phone', - fieldLabel: Strings.devicePhone + fieldLabel: Strings.sharedPhone }, { xtype: 'textfield', name: 'model', diff --git a/web/app/view/Notifications.js b/web/app/view/Notifications.js index 8f6ca484..0f6552a7 100644 --- a/web/app/view/Notifications.js +++ b/web/app/view/Notifications.js @@ -59,6 +59,13 @@ Ext.define('Traccar.view.Notifications', { listeners: { checkChange: 'onCheckChange' } + }, { + text: Strings.notificationSms, + dataIndex: 'sms', + xtype: 'checkcolumn', + listeners: { + checkChange: 'onCheckChange' + } }] } }); diff --git a/web/app/view/UserDialog.js b/web/app/view/UserDialog.js index 34c3b4a1..84103ee2 100644 --- a/web/app/view/UserDialog.js +++ b/web/app/view/UserDialog.js @@ -43,6 +43,10 @@ Ext.define('Traccar.view.UserDialog', { inputType: 'password', allowBlank: false }, { + xtype: 'textfield', + name: 'phone', + fieldLabel: Strings.sharedPhone + }, { xtype: 'checkboxfield', inputValue: true, uncheckedValue: false, diff --git a/web/l10n/en.json b/web/l10n/en.json index 62f8a225..222f388e 100644 --- a/web/l10n/en.json +++ b/web/l10n/en.json @@ -46,6 +46,7 @@ "sharedCalendars": "Calendars", "sharedFile": "File", "sharedSelectFile": "Select File", + "sharedPhone": "Phone", "errorTitle": "Error", "errorUnknown": "Unknown error", "errorConnection": "Connection error", @@ -71,7 +72,6 @@ "devicesAndState": "Devices and State", "deviceTitle": "Devices", "deviceIdentifier": "Identifier", - "devicePhone": "Phone", "deviceModel": "Model", "deviceContact": "Contact", "deviceCategory": "Category", @@ -184,6 +184,7 @@ "notificationType": "Type of Notification", "notificationWeb": "Send via Web", "notificationMail": "Send via Mail", + "notificationSms": "Send via SMS", "reportRoute": "Route", "reportEvents": "Events", "reportTrips": "Trips", |