diff --git a/model/src/main/java/lcsb/mapviewer/model/map/kinetics/SbmlUnitType.java b/model/src/main/java/lcsb/mapviewer/model/map/kinetics/SbmlUnitType.java index 9cee1416c9dc32b4885204612b81ebdee52c375e..f25f03401cb872090becabcb20ea857d782941bc 100644 --- a/model/src/main/java/lcsb/mapviewer/model/map/kinetics/SbmlUnitType.java +++ b/model/src/main/java/lcsb/mapviewer/model/map/kinetics/SbmlUnitType.java @@ -32,5 +32,9 @@ public enum SbmlUnitType { TESLA, VOLT, WATT, - WEBER, + WEBER,; + + public String getCommonName() { + return this.name().toLowerCase(); + } } diff --git a/rest-api/src/main/java/lcsb/mapviewer/api/configuration/ConfigurationController.java b/rest-api/src/main/java/lcsb/mapviewer/api/configuration/ConfigurationController.java index 7c3fb78b35f430aec80d882ca8bc462714cd5225..b036c514cb74d0fbbf3ab9dea0a3f9d43f1f86a5 100644 --- a/rest-api/src/main/java/lcsb/mapviewer/api/configuration/ConfigurationController.java +++ b/rest-api/src/main/java/lcsb/mapviewer/api/configuration/ConfigurationController.java @@ -9,7 +9,6 @@ import javax.servlet.ServletContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; -import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.CookieValue; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; @@ -53,6 +52,7 @@ public class ConfigurationController extends BaseController { result.put("reactionTypes", configurationController.getReactionTypes(token)); result.put("miriamTypes", configurationController.getMiriamTypes(token)); result.put("mapTypes", configurationController.getMapTypes(token)); + result.put("unitTypes", configurationController.getUnitTypes(token)); result.put("modificationStateTypes", configurationController.getModificationStateTypes(token)); result.put("privilegeTypes", configurationController.getPrivilegeTypes(token)); result.put("version", configurationService.getSystemSvnVersion(context.getRealPath("/"))); diff --git a/rest-api/src/main/java/lcsb/mapviewer/api/configuration/ConfigurationRestImpl.java b/rest-api/src/main/java/lcsb/mapviewer/api/configuration/ConfigurationRestImpl.java index 7c41b7d650bc7cb03e5ab3900416896800514879..30d3f171394460448fddba61fe189ddb92177ec2 100644 --- a/rest-api/src/main/java/lcsb/mapviewer/api/configuration/ConfigurationRestImpl.java +++ b/rest-api/src/main/java/lcsb/mapviewer/api/configuration/ConfigurationRestImpl.java @@ -22,6 +22,7 @@ import lcsb.mapviewer.converter.IConverter; import lcsb.mapviewer.converter.graphics.AbstractImageGenerator; import lcsb.mapviewer.converter.graphics.ImageGenerators; import lcsb.mapviewer.model.map.MiriamType; +import lcsb.mapviewer.model.map.kinetics.SbmlUnitType; import lcsb.mapviewer.model.map.model.SubmodelType; import lcsb.mapviewer.model.map.reaction.Reaction; import lcsb.mapviewer.model.map.species.Element; @@ -291,4 +292,15 @@ public class ConfigurationRestImpl extends BaseRestImpl { return result; } + public List<Map<String, Object>> getUnitTypes(String token) { + List<Map<String, Object>> result = new ArrayList<>(); + for (SbmlUnitType type : SbmlUnitType.values()) { + Map<String, Object> row = new HashMap<>(); + row.put("id", type.name()); + row.put("name", type.getCommonName()); + result.add(row); + } + return result; + } + }