Implement computed attributes

8 files changed, 167 insertions, 0 deletions

diff --git a/web/app/view/edit/ComputedAttributes.js b/web/app/view/edit/ComputedAttributes.js
new file mode 100644
index 00000000..87d3b8da
--- /dev/null
+++ b/web/app/view/edit/ComputedAttributes.js
@@ -0,0 +1,58 @@
+/*
+ * 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.view.edit.ComputedAttributes', {
+    extend: 'Ext.grid.Panel',
+    xtype: 'computedAttributesView',
+
+    requires: [
+        'Traccar.view.edit.ComputedAttributesController',
+        'Traccar.view.edit.Toolbar'
+    ],
+
+    controller: 'computedAttributes',
+    store: 'ComputedAttributes',
+
+    tbar: {
+        xtype: 'editToolbar'
+    },
+
+    listeners: {
+        selectionchange: 'onSelectionChange'
+    },
+
+    columns: {
+        defaults: {
+            flex: 1,
+            minWidth: Traccar.Style.columnWidthNormal
+        },
+        items: [{
+            text: Strings.sharedDescription,
+            dataIndex: 'description'
+        }, {
+            text: Strings.sharedAttribute,
+            dataIndex: 'attribute'
+        }, {
+            text: Strings.sharedExpression,
+            dataIndex: 'expression'
+        }, {
+            text: Strings.sharedType,
+            dataIndex: 'type'
+        }]
+    }
+});
diff --git a/web/app/view/edit/ComputedAttributesController.js b/web/app/view/edit/ComputedAttributesController.js
new file mode 100644
index 00000000..6ae14102
--- /dev/null
+++ b/web/app/view/edit/ComputedAttributesController.js
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 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.view.edit.ComputedAttributesController', {
+    extend: 'Traccar.view.edit.ToolbarController',
+    alias: 'controller.computedAttributes',
+
+    requires: [
+        'Traccar.view.dialog.ComputedAttribute',
+        'Traccar.model.ComputedAttribute'
+    ],
+
+    objectModel: 'Traccar.model.ComputedAttribute',
+    objectDialog: 'Traccar.view.dialog.ComputedAttribute',
+    removeTitle: Strings.sharedComputedAttribute
+});
diff --git a/web/app/view/edit/Devices.js b/web/app/view/edit/Devices.js
index b5b6badd..fe3de42c 100644
--- a/web/app/view/edit/Devices.js
+++ b/web/app/view/edit/Devices.js
@@ -75,6 +75,14 @@ Ext.define('Traccar.view.edit.Devices', {
             tooltip: Strings.sharedGeofences,
             tooltipType: 'title'
         }, {
+            xtype: 'button',
+            disabled: true,
+            handler: 'onAttributesClick',
+            reference: 'toolbarAttributesButton',
+            glyph: 'xf0ae@FontAwesome',
+            tooltip: Strings.sharedComputedAttributes,
+            tooltipType: 'title'
+        }, {
             disabled: true,
             handler: 'onCommandClick',
             reference: 'deviceCommandButton',
diff --git a/web/app/view/edit/DevicesController.js b/web/app/view/edit/DevicesController.js
index 0d18c186..2457d5cb 100644
--- a/web/app/view/edit/DevicesController.js
+++ b/web/app/view/edit/DevicesController.js
@@ -23,6 +23,7 @@ Ext.define('Traccar.view.edit.DevicesController', {
         'Traccar.view.dialog.Command',
         'Traccar.view.dialog.Device',
         'Traccar.view.permissions.DeviceGeofences',
+        'Traccar.view.permissions.DeviceAttributes',
         'Traccar.view.BaseWindow',
         'Traccar.model.Device',
         'Traccar.model.Command'
@@ -77,6 +78,21 @@ Ext.define('Traccar.view.edit.DevicesController', {
         }).show();
     },
 
+    onAttributesClick: function () {
+        var device = this.getView().getSelectionModel().getSelection()[0];
+        Ext.create('Traccar.view.BaseWindow', {
+            title: Strings.sharedComputedAttributes,
+            items: {
+                xtype: 'deviceAttributesView',
+                baseObjectName: 'deviceId',
+                linkObjectName: 'attributeId',
+                storeName: 'ComputedAttributes',
+                urlApi: 'api/devices/attributes',
+                baseObject: device.getId()
+            }
+        }).show();
+    },
+
     onCommandClick: function () {
         var device, deviceId, command, dialog, typesStore, online;
         device = this.getView().getSelectionModel().getSelection()[0];
@@ -105,6 +121,7 @@ Ext.define('Traccar.view.edit.DevicesController', {
         this.lookupReference('toolbarEditButton').setDisabled(empty || readonly || deviceReadonly);
         this.lookupReference('toolbarRemoveButton').setDisabled(empty || readonly || deviceReadonly);
         this.lookupReference('toolbarGeofencesButton').setDisabled(empty || readonly);
+        this.lookupReference('toolbarAttributesButton').setDisabled(empty || readonly);
         this.lookupReference('deviceCommandButton').setDisabled(empty || readonly);
     },
 
diff --git a/web/app/view/edit/Groups.js b/web/app/view/edit/Groups.js
index 43ae8774..88bbd7ba 100644
--- a/web/app/view/edit/Groups.js
+++ b/web/app/view/edit/Groups.js
@@ -37,6 +37,14 @@ Ext.define('Traccar.view.edit.Groups', {
             glyph: 'xf21d@FontAwesome',
             tooltip: Strings.sharedGeofences,
             tooltipType: 'title'
+        }, {
+            xtype: 'button',
+            disabled: true,
+            handler: 'onAttributesClick',
+            reference: 'toolbarAttributesButton',
+            glyph: 'xf0ae@FontAwesome',
+            tooltip: Strings.sharedComputedAttributes,
+            tooltipType: 'title'
         }]
     },
 
diff --git a/web/app/view/edit/GroupsController.js b/web/app/view/edit/GroupsController.js
index 36154b4e..602bb095 100644
--- a/web/app/view/edit/GroupsController.js
+++ b/web/app/view/edit/GroupsController.js
@@ -22,6 +22,7 @@ Ext.define('Traccar.view.edit.GroupsController', {
     requires: [
         'Traccar.view.dialog.Group',
         'Traccar.view.permissions.GroupGeofences',
+        'Traccar.view.permissions.GroupAttributes',
         'Traccar.view.BaseWindow',
         'Traccar.model.Group'
     ],
@@ -47,9 +48,27 @@ Ext.define('Traccar.view.edit.GroupsController', {
         }).show();
     },
 
+    onAttributesClick: function () {
+        var admin, group;
+        admin = Traccar.app.getUser().get('admin');
+        group = this.getView().getSelectionModel().getSelection()[0];
+        Ext.create('Traccar.view.BaseWindow', {
+            title: Strings.sharedComputedAttributes,
+            items: {
+                xtype: 'groupAttributesView',
+                baseObjectName: 'groupId',
+                linkObjectName: 'attributeId',
+                storeName: admin ? 'AllComputedAttributes' : 'ComputedAttributes',
+                urlApi: 'api/groups/attributes',
+                baseObject: group.getId()
+            }
+        }).show();
+    },
+
     onSelectionChange: function (selected) {
         var disabled = selected.length > 0;
         this.lookupReference('toolbarGeofencesButton').setDisabled(disabled);
+        this.lookupReference('toolbarAttributesButton').setDisabled(disabled);
         this.callParent(arguments);
     }
 });
diff --git a/web/app/view/edit/Users.js b/web/app/view/edit/Users.js
index 312ebe24..4356b166 100644
--- a/web/app/view/edit/Users.js
+++ b/web/app/view/edit/Users.js
@@ -75,6 +75,13 @@ Ext.define('Traccar.view.edit.Users', {
             glyph: 'xf073@FontAwesome',
             tooltip: Strings.sharedCalendars,
             tooltipType: 'title'
+        }, {
+            disabled: true,
+            handler: 'onAttributesClick',
+            reference: 'userAttributesButton',
+            glyph: 'xf0ae@FontAwesome',
+            tooltip: Strings.sharedComputedAttributes,
+            tooltipType: 'title'
         }]
     },
 
diff --git a/web/app/view/edit/UsersController.js b/web/app/view/edit/UsersController.js
index 88f39fbf..f4ef4012 100644
--- a/web/app/view/edit/UsersController.js
+++ b/web/app/view/edit/UsersController.js
@@ -27,6 +27,7 @@ Ext.define('Traccar.view.edit.UsersController', {
         'Traccar.view.permissions.UserGeofences',
         'Traccar.view.permissions.UserCalendars',
         'Traccar.view.permissions.UserUsers',
+        'Traccar.view.permissions.UserAttributes',
         'Traccar.view.Notifications',
         'Traccar.view.BaseWindow',
         'Traccar.model.User'
@@ -155,6 +156,23 @@ Ext.define('Traccar.view.edit.UsersController', {
         }).show();
     },
 
+    onAttributesClick: function () {
+        var user = this.getView().getSelectionModel().getSelection()[0];
+        Ext.create('Traccar.view.BaseWindow', {
+            title: Strings.sharedCalendars,
+            items: {
+                xtype: 'userAttributesView',
+                baseObjectName: 'userId',
+                linkObjectName: 'attributeId',
+                storeName: 'AllComputedAttributes',
+                linkStoreName: 'ComputedAttributes',
+                urlApi: 'api/permissions/attributes',
+                baseObject: user.getId()
+            }
+        }).show();
+    },
+
+
     onSelectionChange: function (selection, selected) {
         var disabled = selected.length === 0;
         this.lookupReference('userDevicesButton').setDisabled(disabled);
@@ -162,6 +180,7 @@ Ext.define('Traccar.view.edit.UsersController', {
         this.lookupReference('userGeofencesButton').setDisabled(disabled);
         this.lookupReference('userNotificationsButton').setDisabled(disabled);
         this.lookupReference('userCalendarsButton').setDisabled(disabled);
+        this.lookupReference('userAttributesButton').setDisabled(disabled);
         this.lookupReference('userUsersButton').setDisabled(disabled || selected[0].get('userLimit') === 0);
         this.callParent(arguments);
     }