Merge tananaev/master

1 files changed, 23 insertions, 6 deletions

diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js
index 79827b8a6..733055cdf 100644
--- a/web/app/controller/Root.js
+++ b/web/app/controller/Root.js
@@ -40,6 +40,7 @@ Ext.define('Traccar.controller.Root', {
 
     onServerReturn: function (options, success, response) {
         var result;
+        Ext.get('spinner').remove();
         if (Traccar.ErrorManager.check(success, response)) {
             result = Ext.decode(response.responseText);
             if (result.success) {
@@ -96,19 +97,35 @@ Ext.define('Traccar.controller.Root', {
                 first: first
             },
             callback: Traccar.app.getErrorHandler(this, function (options, success, response) {
-                var i, store, data, position;
+                var i, deviceStore, positionStore, data, devices, positions, device, position;
                 if (success) {
-                    store = Ext.getStore('LatestPositions');
+                    deviceStore = Ext.getStore('Devices');
+                    positionStore = Ext.getStore('LatestPositions');
                     data = Ext.decode(response.responseText).data;
+                    devices = data.devices;
+                    positions = data.positions;
 
-                    for (i = 0; i < data.length; i++) {
-                        position = store.findRecord('deviceId', data[i].deviceId, 0, false, false, true);
+                    for (i = 0; i < devices.length; i++) {
+                        device = deviceStore.findRecord('id', devices[i].id, 0, false, false, true);
+                        if (device) {
+                            device.set({
+                                status: devices[i].status,
+                                lastUpdate: devices[i].lastUpdate
+                            }, {
+                                dirty: false
+                            });
+                        }
+                    }
+
+                    for (i = 0; i < positions.length; i++) {
+                        position = positionStore.findRecord('deviceId', positions[i].deviceId, 0, false, false, true);
                         if (position) {
-                            position.set(data[i]);
+                            position.set(positions[i]);
                         } else {
-                            store.add(Ext.create('Traccar.model.Position', data[i]));
+                            positionStore.add(Ext.create('Traccar.model.Position', positions[i]));
                         }
                     }
+
                     this.asyncUpdate(false);
                 }
             })