From 17157262fef1c046d116b2270f4e1d335fe9da1b Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Tue, 26 Jun 2018 12:00:15 +0500 Subject: Implement refactored notifications --- web/app/model/KnownNotificator.js | 32 ++++++++++++++++++++++++++++++++ web/app/model/Notification.js | 10 ++-------- 2 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 web/app/model/KnownNotificator.js (limited to 'web/app/model') diff --git a/web/app/model/KnownNotificator.js b/web/app/model/KnownNotificator.js new file mode 100644 index 0000000..7855a12 --- /dev/null +++ b/web/app/model/KnownNotificator.js @@ -0,0 +1,32 @@ +/* + * Copyright 2018 Anton Tananaev (anton@traccar.org) + * Copyright 2018 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.model.KnownNotificator', { + extend: 'Ext.data.Model', + idProperty: 'type', + + fields: [{ + name: 'type', + type: 'string' + }, { + name: 'name', + convert: function (v, rec) { + return Traccar.app.getNotificatorString(rec.get('type')); + }, + depends: ['type'] + }] +}); diff --git a/web/app/model/Notification.js b/web/app/model/Notification.js index 6ccaeca..fc9d84d 100644 --- a/web/app/model/Notification.js +++ b/web/app/model/Notification.js @@ -31,14 +31,8 @@ Ext.define('Traccar.model.Notification', { }, { name: 'attributes' }, { - name: 'web', - type: 'bool' - }, { - name: 'mail', - type: 'bool' - }, { - name: 'sms', - type: 'bool' + name: 'notificators', + type: 'string' }, { name: 'calendarId', type: 'int' -- cgit v1.2.3