Move Device Distance to Device Menu

2 files changed, 6 insertions, 28 deletions

diff --git a/web/app/view/dialog/DeviceDistance.js b/web/app/view/dialog/DeviceDistance.js
index c6ac9f20..53945885 100644
--- a/web/app/view/dialog/DeviceDistance.js
+++ b/web/app/view/dialog/DeviceDistance.js
@@ -27,17 +27,6 @@ Ext.define('Traccar.view.dialog.DeviceDistance', {
     title: Strings.sharedDeviceDistance,
 
     items: [{
-        xtype: 'combobox',
-        reference: 'deviceId',
-        fieldLabel: Strings.sharedDevice,
-        store: 'AllDevices',
-        displayField: 'name',
-        valueField: 'id',
-        editable: false,
-        listeners: {
-            change: 'onDeviceChange'
-        }
-    }, {
         xtype: 'customNumberField',
         dataType: 'distance',
         reference: 'totalDistance',
@@ -45,7 +34,6 @@ Ext.define('Traccar.view.dialog.DeviceDistance', {
     }],
 
     buttons: [{
-        disabled: true,
         reference: 'setButton',
         glyph: 'xf00c@FontAwesome',
         tooltip: Strings.sharedSet,
diff --git a/web/app/view/dialog/DeviceDistanceController.js b/web/app/view/dialog/DeviceDistanceController.js
index bd9e059d..ae14f33c 100644
--- a/web/app/view/dialog/DeviceDistanceController.js
+++ b/web/app/view/dialog/DeviceDistanceController.js
@@ -20,21 +20,11 @@ Ext.define('Traccar.view.dialog.DeviceDistanceController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.deviceDistance',
 
-    onDeviceChange: function (combobox, newValue) {
-        var position;
-        this.lookupReference('setButton').setDisabled(newValue === null);
-        if (newValue) {
-            position = Ext.getStore('LatestPositions').findRecord('deviceId', newValue, 0, false, false, true);
-            if (position) {
-                this.lookupReference('totalDistance').setValue(position.get('attributes').totalDistance);
-            }
-        }
-    },
-
-    onSetClick: function (button) {
-        var data = {};
-        data.deviceId = this.lookupReference('deviceId').getValue();
-        data.totalDistance = this.lookupReference('totalDistance').getValue();
+    onSetClick: function () {
+        var data = {
+            deviceId: this.getView().deviceId,
+            totalDistance: this.lookupReference('totalDistance').getValue()
+        };
         Ext.Ajax.request({
             scope: this,
             method: 'PUT',
@@ -46,6 +36,6 @@ Ext.define('Traccar.view.dialog.DeviceDistanceController', {
                 }
             }
         });
-        button.up('window').close();
+        this.closeView();
     }
 });