From 3a5e334b50bf35d11743d937c9fae2fb8c7829ec Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Tue, 19 Sep 2017 09:36:16 +0500 Subject: Implement Notifications per device --- web/app/view/dialog/Notification.js | 66 ++++++++++++++++++++++++++++ web/app/view/dialog/SendCommand.js | 6 --- web/app/view/dialog/SendCommandController.js | 17 ------- 3 files changed, 66 insertions(+), 23 deletions(-) create mode 100644 web/app/view/dialog/Notification.js (limited to 'web/app/view/dialog') diff --git a/web/app/view/dialog/Notification.js b/web/app/view/dialog/Notification.js new file mode 100644 index 0000000..7e7fe45 --- /dev/null +++ b/web/app/view/dialog/Notification.js @@ -0,0 +1,66 @@ +/* + * 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.view.dialog.Notification', { + extend: 'Traccar.view.dialog.BaseEdit', + + title: Strings.sharedNotification, + + items: { + xtype: 'form', + items: [{ + xtype: 'fieldset', + title: Strings.sharedRequired, + items: [{ + xtype: 'combobox', + name: 'type', + fieldLabel: Strings.sharedType, + store: 'AllNotificationTypes', + queryMode: 'local', + displayField: 'name', + valueField: 'type', + editable: false, + allowBlank: false + }, { + xtype: 'checkboxfield', + inputValue: true, + uncheckedValue: false, + name: 'always', + fieldLabel: Strings.notificationAlways + }, { + xtype: 'checkboxfield', + inputValue: true, + uncheckedValue: false, + name: 'web', + fieldLabel: Strings.notificationWeb + }, { + xtype: 'checkboxfield', + inputValue: true, + uncheckedValue: false, + name: 'mail', + fieldLabel: Strings.notificationMail + }, { + xtype: 'checkboxfield', + inputValue: true, + uncheckedValue: false, + name: 'sms', + fieldLabel: Strings.notificationSms + }] + }] + } +}); diff --git a/web/app/view/dialog/SendCommand.js b/web/app/view/dialog/SendCommand.js index f4224be..9e07cbf 100644 --- a/web/app/view/dialog/SendCommand.js +++ b/web/app/view/dialog/SendCommand.js @@ -79,12 +79,6 @@ Ext.define('Traccar.view.dialog.SendCommand', { }], buttons: [{ - glyph: 'xf093@FontAwesome', - text: Strings.sharedSavedCommands, - reference: 'linkButton', - handler: 'onLinkCommands', - hidden: true - }, { xtype: 'tbfill' }, { glyph: 'xf093@FontAwesome', diff --git a/web/app/view/dialog/SendCommandController.js b/web/app/view/dialog/SendCommandController.js index 0e9442a..567be94 100644 --- a/web/app/view/dialog/SendCommandController.js +++ b/web/app/view/dialog/SendCommandController.js @@ -24,10 +24,6 @@ Ext.define('Traccar.view.dialog.SendCommandController', { 'Traccar.view.permissions.SavedCommands' ], - init: function () { - this.lookupReference('linkButton').setHidden(Traccar.app.getPreference('limitCommands', false)); - }, - onSendClick: function (button) { var record; this.fillAttributes(button); @@ -67,19 +63,6 @@ Ext.define('Traccar.view.dialog.SendCommandController', { this.lookupReference('sendButton').setDisabled(command.getId() === 0); }, - onLinkCommands: function () { - Ext.create('Traccar.view.BaseWindow', { - title: Strings.sharedSavedCommands, - items: { - xtype: 'linkSavedCommandsView', - baseObjectName: 'deviceId', - linkObjectName: 'commandId', - storeName: 'Commands', - baseObject: this.getView().deviceId - } - }).show(); - }, - onSendResult: function (options, success, response) { if (success) { this.closeView(); -- cgit v1.2.3