Merge pull request #588 from Abyss777/extended_notifications2

Implement Notifications per device

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 00000000..f42ef972
--- /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 3ae13c05..0d479f4f 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'
     }, {