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/model | |
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/model')
-rw-r--r-- | web/app/model/KnownNotification.js | 32 | ||||
-rw-r--r-- | web/app/model/Notification.js | 6 |
2 files changed, 35 insertions, 3 deletions
diff --git a/web/app/model/KnownNotification.js b/web/app/model/KnownNotification.js new file mode 100644 index 0000000..f42ef97 --- /dev/null +++ b/web/app/model/KnownNotification.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.model.KnownNotification', { + extend: 'Ext.data.Model', + idProperty: 'type', + + fields: [{ + name: 'type', + type: 'string' + }, { + name: 'name', + convert: function (v, rec) { + return Traccar.app.getEventString(rec.get('type')); + }, + depends: ['type'] + }] +}); diff --git a/web/app/model/Notification.js b/web/app/model/Notification.js index 3ae13c0..0d479f4 100644 --- a/web/app/model/Notification.js +++ b/web/app/model/Notification.js @@ -17,7 +17,7 @@ Ext.define('Traccar.model.Notification', { extend: 'Ext.data.Model', - idProperty: 'type', + identifier: 'negative', fields: [{ name: 'id', @@ -26,8 +26,8 @@ Ext.define('Traccar.model.Notification', { name: 'type', type: 'string' }, { - name: 'userId', - type: 'int' + name: 'always', + type: 'bool' }, { name: 'attributes' }, { |