diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-09-20 19:37:14 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-20 19:37:14 +1200 |
commit | adf79e9bc86bc485ea3fa02c4d25b11d8fffee1f (patch) | |
tree | 5879cb06e5b81dcc7570f35754ef443005200cb7 /web/app/store | |
parent | d078ef703795ed9c1fb0b6111ee7d12e09143f82 (diff) | |
parent | cf1c138bca946cd354e97cea0c841af1ad0f3e4e (diff) | |
download | etbsa-traccar-web-adf79e9bc86bc485ea3fa02c4d25b11d8fffee1f.tar.gz etbsa-traccar-web-adf79e9bc86bc485ea3fa02c4d25b11d8fffee1f.tar.bz2 etbsa-traccar-web-adf79e9bc86bc485ea3fa02c4d25b11d8fffee1f.zip |
Merge pull request #588 from Abyss777/extended_notifications2
Implement Notifications per device
Diffstat (limited to 'web/app/store')
-rw-r--r-- | web/app/store/AllNotificationTypes.js | 32 | ||||
-rw-r--r-- | web/app/store/AllNotifications.js | 7 | ||||
-rw-r--r-- | web/app/store/Notifications.js | 10 |
3 files changed, 37 insertions, 12 deletions
diff --git a/web/app/store/AllNotificationTypes.js b/web/app/store/AllNotificationTypes.js new file mode 100644 index 0000000..ded5ef9 --- /dev/null +++ b/web/app/store/AllNotificationTypes.js @@ -0,0 +1,32 @@ +/* + * 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 <http://www.gnu.org/licenses/>. + */ + +Ext.define('Traccar.store.AllNotificationTypes', { + extend: 'Ext.data.Store', + model: 'Traccar.model.KnownNotification', + + proxy: { + type: 'rest', + url: 'api/notifications/types', + listeners: { + 'exception': function (proxy, response) { + Traccar.app.showError(response); + } + } + } +}); diff --git a/web/app/store/AllNotifications.js b/web/app/store/AllNotifications.js index 61aa75a..a3e59e1 100644 --- a/web/app/store/AllNotifications.js +++ b/web/app/store/AllNotifications.js @@ -21,14 +21,9 @@ Ext.define('Traccar.store.AllNotifications', { proxy: { type: 'rest', - url: 'api/users/notifications', + url: 'api/notifications', extraParams: { all: true } - }, - sortOnLoad: true, - sorters: { - property: 'type', - direction: 'ASC' } }); diff --git a/web/app/store/Notifications.js b/web/app/store/Notifications.js index a672fd4..b30505f 100644 --- a/web/app/store/Notifications.js +++ b/web/app/store/Notifications.js @@ -21,11 +21,9 @@ Ext.define('Traccar.store.Notifications', { proxy: { type: 'rest', - url: 'api/users/notifications' - }, - sortOnLoad: true, - sorters: { - property: 'type', - direction: 'ASC' + url: 'api/notifications', + writer: { + writeAllFields: true + } } }); |