Windy/traccar-web
1
0
Fork 0
mirror of https://github.com/traccar/traccar-web.git synced 2025-01-09 04:37:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Update device icon on map after device update

Browse Source 
- Fix devices buttons enabling
This commit is contained in:
Abyss777 2016-11-10 13:20:51 +05:00
parent 185a6e4b35
commit fb76f0118e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/app/view/DevicesController.js
View File

@ -147,6 +147,7 @@ Ext.define('Traccar.view.DevicesController', {
selectDevice: function (device, center) {
this.getView().getSelectionModel().select([device], false, true);
this.updateButtons(this.getView().getSelectionModel());
this.getView().getView().focusRow(device);
},

6
web/app/view/MapController.js
View File

@ -86,12 +86,12 @@ Ext.define('Traccar.view.MapController', {
}
},
changeMarkerColor: function (style, color) {
changeMarkerColor: function (style, color, category) {
var newStyle = new ol.style.Style({
image: Traccar.DeviceImages.getImageIcon(color,
style.getImage().zoom,
style.getImage().angle,
style.getImage().category),
category),
text: style.getText()
});
return newStyle;
@ -111,7 +111,7 @@ Ext.define('Traccar.view.MapController', {
if (deviceId in this.latestMarkers) {
marker = this.latestMarkers[deviceId];
marker.setStyle(
this.changeMarkerColor(marker.getStyle(), this.getDeviceColor(device)));
this.changeMarkerColor(marker.getStyle(), this.getDeviceColor(device), device.get('category')));
}
}
},