diff --git a/frontend-js/src/main/js/map/data/Alias.js b/frontend-js/src/main/js/map/data/Alias.js index 6c2ab7e9a3b44d36d3f48d14ab9ba2c48154cc66..a13785067d74eeac59d6bd53d544a883aa56608e 100644 --- a/frontend-js/src/main/js/map/data/Alias.js +++ b/frontend-js/src/main/js/map/data/Alias.js @@ -46,10 +46,11 @@ Alias.prototype.constructor = Alias; */ Alias.prototype.update = function(javaObject) { if (javaObject instanceof Alias) { - if (javaObject.getName()=== undefined) { + if (javaObject.getName() === undefined) { return; } this.setDescription(javaObject.getDescription()); + this.setElementId(javaObject.getElementId()); this.setType(javaObject.getType()); this.setCharge(javaObject.getCharge()); this.setSymbol(javaObject.getSymbol()); @@ -71,6 +72,7 @@ Alias.prototype.update = function(javaObject) { return; } this.setDescription(javaObject.notes); + this.setElementId(javaObject.elementId); this.setType(javaObject.type); this.setCharge(javaObject.charge); this.setSymbol(javaObject.symbol); @@ -122,6 +124,14 @@ Alias.prototype.getY = function() { return this.y; }; +Alias.prototype.setElementId = function(elementId) { + this._elementId = elementId; +}; + +Alias.prototype.getElementId = function() { + return this._elementId; +}; + Alias.prototype.setWidth = function(width) { this.width = width; }; diff --git a/rest-api/src/main/java/lcsb/mapviewer/api/projects/models/bioEntities/elements/ElementsRestImpl.java b/rest-api/src/main/java/lcsb/mapviewer/api/projects/models/bioEntities/elements/ElementsRestImpl.java index a1bcf1f437cad891a13ab860bf6fc2ca75899f86..b13f23f8700f1880ea2672c91dea685b588ce9cd 100644 --- a/rest-api/src/main/java/lcsb/mapviewer/api/projects/models/bioEntities/elements/ElementsRestImpl.java +++ b/rest-api/src/main/java/lcsb/mapviewer/api/projects/models/bioEntities/elements/ElementsRestImpl.java @@ -82,6 +82,8 @@ public class ElementsRestImpl extends BaseRestImpl { value = element.getId(); } else if (column.equals("modelid")) { value = element.getModelData().getId(); + } else if (column.equals("elementid")) { + value = element.getElementId(); } else if (column.equals("name")) { value = element.getName(); } else if (column.equals("type")) { @@ -141,6 +143,7 @@ public class ElementsRestImpl extends BaseRestImpl { Set<String> columnsSet = new HashSet<>(); if (columns.equals("")) { columnsSet.add("id"); + columnsSet.add("elementId"); columnsSet.add("modelId"); columnsSet.add("name"); columnsSet.add("type");