diff options
Diffstat (limited to 'web/app/view/dialog')
-rw-r--r-- | web/app/view/dialog/DeviceAccumulators.js (renamed from web/app/view/dialog/DeviceDistance.js) | 13 | ||||
-rw-r--r-- | web/app/view/dialog/DeviceAccumulatorsController.js (renamed from web/app/view/dialog/DeviceDistanceController.js) | 23 |
2 files changed, 24 insertions, 12 deletions
diff --git a/web/app/view/dialog/DeviceDistance.js b/web/app/view/dialog/DeviceAccumulators.js index 53945885..eaa4e9f5 100644 --- a/web/app/view/dialog/DeviceDistance.js +++ b/web/app/view/dialog/DeviceAccumulators.js @@ -16,21 +16,26 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -Ext.define('Traccar.view.dialog.DeviceDistance', { +Ext.define('Traccar.view.dialog.DeviceAccumulators', { extend: 'Traccar.view.dialog.Base', requires: [ - 'Traccar.view.dialog.DeviceDistanceController' + 'Traccar.view.dialog.DeviceAccumulatorsController' ], - controller: 'deviceDistance', - title: Strings.sharedDeviceDistance, + controller: 'deviceAccumulators', + title: Strings.sharedDeviceAccumulators, items: [{ xtype: 'customNumberField', dataType: 'distance', reference: 'totalDistance', fieldLabel: Strings.deviceTotalDistance + }, { + xtype: 'customNumberField', + dataType: 'hours', + reference: 'hours', + fieldLabel: Strings.positionHours }], buttons: [{ diff --git a/web/app/view/dialog/DeviceDistanceController.js b/web/app/view/dialog/DeviceAccumulatorsController.js index ae14f33c..2fdae6c5 100644 --- a/web/app/view/dialog/DeviceDistanceController.js +++ b/web/app/view/dialog/DeviceAccumulatorsController.js @@ -1,6 +1,6 @@ /* - * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org) - * Copyright 2016 - 2017 Andrey Kunitsyn (andrey@traccar.org) + * Copyright 2016 - 2018 Anton Tananaev (anton@traccar.org) + * Copyright 2016 - 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 @@ -16,19 +16,26 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -Ext.define('Traccar.view.dialog.DeviceDistanceController', { +Ext.define('Traccar.view.dialog.DeviceAccumulatorsController', { extend: 'Ext.app.ViewController', - alias: 'controller.deviceDistance', + alias: 'controller.deviceAccumulators', onSetClick: function () { - var data = { - deviceId: this.getView().deviceId, - totalDistance: this.lookupReference('totalDistance').getValue() + var totalDistance, hours, data = { + deviceId: this.getView().deviceId }; + totalDistance = this.lookupReference('totalDistance'); + if (!isNaN(totalDistance.getRawValue())) { + data.totalDistance = totalDistance.getValue(); + } + hours = this.lookupReference('hours'); + if (!isNaN(hours.getRawValue())) { + data.hours = hours.getValue(); + } Ext.Ajax.request({ scope: this, method: 'PUT', - url: 'api/devices/' + data.deviceId + '/distance', + url: 'api/devices/' + data.deviceId + '/accumulators', jsonData: Ext.util.JSON.encode(data), callback: function (options, success, response) { if (!success) { |