Implement testing computedAttribute

6 files changed, 136 insertions, 4 deletions

diff --git a/web/app/Application.js b/web/app/Application.js
index d73378c5..0125cd0f 100644
--- a/web/app/Application.js
+++ b/web/app/Application.js
@@ -164,15 +164,24 @@ Ext.define('Traccar.Application', {
         }
     },
 
-    showError: function (error) {
+    showError: function (error, success) {
+        var title, general;
+        if (success) {
+            title = Strings.infoTitle;
+            general = Strings.infoGeneral;
+        } else {
+            title = Strings.errorTitle;
+            general = Strings.errorGeneral;
+        }
+
         if (Ext.isString(error)) {
-            Ext.Msg.alert(Strings.errorTitle, error);
+            Ext.Msg.alert(title, error);
         } else if (error.responseText) {
-            Ext.Msg.alert(Strings.errorTitle, Strings.errorGeneral +
+            Ext.Msg.alert(title, general +
                     '<br><br><textarea readonly rows="5" style="resize: none; width: 100%;">' +
                     error.responseText + '</textarea>');
         } else if (error.statusText) {
-            Ext.Msg.alert(Strings.errorTitle, error.statusText);
+            Ext.Msg.alert(title, error.statusText);
         } else {
             Ext.Msg.alert(Strings.errorTitle, Strings.errorConnection);
         }
diff --git a/web/app/view/dialog/ComputedAttribute.js b/web/app/view/dialog/ComputedAttribute.js
index 90234b57..ef6269be 100644
--- a/web/app/view/dialog/ComputedAttribute.js
+++ b/web/app/view/dialog/ComputedAttribute.js
@@ -60,6 +60,12 @@ Ext.define('Traccar.view.dialog.ComputedAttribute', {
     },
 
     buttons: [{
+        glyph: 'xf128@FontAwesome',
+        tooltip: Strings.sharedCheckComputedAttribute,
+        tooltipType: 'title',
+        minWidth: 0,
+        handler: 'onCheckClick'
+    }, {
         glyph: 'xf00c@FontAwesome',
         tooltip: Strings.sharedSave,
         tooltipType: 'title',
diff --git a/web/app/view/dialog/ComputedAttributeController.js b/web/app/view/dialog/ComputedAttributeController.js
index 807653a6..f680b1b5 100644
--- a/web/app/view/dialog/ComputedAttributeController.js
+++ b/web/app/view/dialog/ComputedAttributeController.js
@@ -20,6 +20,10 @@ Ext.define('Traccar.view.dialog.ComputedAttributeController', {
     extend: 'Traccar.view.dialog.BaseEditController',
     alias: 'controller.computedAttribute',
 
+    requires: [
+        'Traccar.view.dialog.SelectDevice'
+    ],
+
     onAttributeChange: function (combobox, newValue) {
         var attribute = Ext.getStore('PositionAttributes').getById(newValue);
         if (attribute) {
@@ -28,5 +32,14 @@ Ext.define('Traccar.view.dialog.ComputedAttributeController', {
         } else {
             this.getView().lookupReference('typeComboField').setReadOnly(false);
         }
+    },
+
+    onCheckClick: function (button) {
+        var dialog, form;
+        dialog = Ext.create('Traccar.view.dialog.SelectDevice');
+        form = button.up('window').down('form');
+        form.updateRecord();
+        dialog.record = form.getRecord();
+        dialog.show();
     }
 });
diff --git a/web/app/view/dialog/SelectDevice.js b/web/app/view/dialog/SelectDevice.js
new file mode 100644
index 00000000..8037453e
--- /dev/null
+++ b/web/app/view/dialog/SelectDevice.js
@@ -0,0 +1,59 @@
+/*
+ * 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.dialog.SelectDevice', {
+    extend: 'Traccar.view.dialog.Base',
+
+    requires: [
+        'Traccar.view.dialog.SelectDeviceController'
+    ],
+
+    controller: 'selectDevice',
+    title: Strings.sharedSelectDevice,
+
+    items: {
+        xtype: 'form',
+        items: [{
+            xtype: 'combobox',
+            reference: 'deviceField',
+            store: 'Devices',
+            queryMode: 'local',
+            displayField: 'name',
+            valueField: 'id',
+            editable: false,
+            listeners: {
+                change: 'onDeviceChange'
+            }
+        }]
+    },
+
+    buttons: [{
+        glyph: 'xf00c@FontAwesome',
+        reference: 'saveButton',
+        tooltip: Strings.sharedSave,
+        tooltipType: 'title',
+        minWidth: 0,
+        handler: 'onSaveClick',
+        disabled: true
+    }, {
+        glyph: 'xf00d@FontAwesome',
+        tooltip: Strings.sharedCancel,
+        tooltipType: 'title',
+        minWidth: 0,
+        handler: 'closeView'
+    }]
+});
diff --git a/web/app/view/dialog/SelectDeviceController.js b/web/app/view/dialog/SelectDeviceController.js
new file mode 100644
index 00000000..4336c48b
--- /dev/null
+++ b/web/app/view/dialog/SelectDeviceController.js
@@ -0,0 +1,41 @@
+/*
+ * 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.dialog.SelectDeviceController', {
+    extend: 'Ext.app.ViewController',
+    alias: 'controller.selectDevice',
+
+    onSaveClick: function (button) {
+        var deviceId, record;
+        deviceId = this.lookupReference('deviceField').getValue();
+        record = this.getView().record.data;
+        Ext.Ajax.request({
+            url: 'api/attributes/computed?deviceId=' + deviceId,
+            method: 'POST',
+            jsonData: Ext.util.JSON.encode(record),
+            callback: function (options, success, response) {
+                Traccar.app.showError(response, success);
+            }
+        });
+        button.up('window').close();
+    },
+
+    onDeviceChange: function (combobox, newValue) {
+        this.lookupReference('saveButton').setDisabled(newValue === null);
+    }
+});
diff --git a/web/l10n/en.json b/web/l10n/en.json
index 171fddb5..6e78e5c7 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -46,9 +46,11 @@
     "sharedAlias": "Alias",
     "sharedComputedAttribute": "Computed Attribute",
     "sharedComputedAttributes": "Computed Attributes",
+    "sharedCheckComputedAttribute": "Check Computed Attribute",
     "sharedExpression": "Expression",
     "sharedDeviceDistance": "Device Distance",
     "sharedDevice": "Device",
+    "sharedSelectDevice": "Select Device",
     "sharedTestNotification": "Send Test Notification",
     "sharedCalendar": "Calendar",
     "sharedCalendars": "Calendars",
@@ -87,6 +89,8 @@
     "errorGeneral": "Invalid parameters or constraints violation",
     "errorConnection": "Connection error",
     "errorSocket": "Web socket connection error",
+    "infoTitle": "Info",
+    "infoGeneral": "Responce",
     "userEmail": "Email",
     "userPassword": "Password",
     "userAdmin": "Admin",