Skip to content
Snippets Groups Projects
Commit 07785f60 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

rest API provides info about status and progress of project generation

parent ab21a9c9
No related branches found
No related tags found
2 merge requests!115Resolve "admin panel should use API",!114Resolve "admin panel should use API"
{"version":"0","disease":null,"organism":null,"idObject":18115,"name":"UNKNOWN DISEASE MAP","projectId":"complex_model_with_images","description":"","overviewImageViews":[{"idObject":1261,"filename":"fbdbe43de73fe38f62889b89cb863adb/sub_image.png","width":963,"height":639,"links":[{"idObject":2369,"polygon":[{"x":200.0,"y":200.0},{"x":200.0,"y":400.0},{"x":400.0,"y":400.0},{"x":400.0,"y":200.0}],"zoomLevel":1,"latLng":{"lat":84.89177465079632,"lng":-161.8181818181818},"modelLinkId":19397,"imageLinkId":null,"query":null,"type":"OverviewModelLink"}]},{"idObject":1262,"filename":"fbdbe43de73fe38f62889b89cb863adb/test.png","width":963,"height":639,"links":[{"idObject":2370,"polygon":[{"x":10.0,"y":10.0},{"x":100.0,"y":10.0},{"x":100.0,"y":100.0},{"x":10.0,"y":100.0}],"zoomLevel":null,"latLng":null,"modelLinkId":null,"imageLinkId":1261,"query":null,"type":"OverviewImageLink"},{"idObject":2371,"polygon":[{"x":200.0,"y":200.0},{"x":200.0,"y":400.0},{"x":400.0,"y":400.0},{"x":400.0,"y":200.0}],"zoomLevel":0,"latLng":{"lat":84.89177465079632,"lng":-178.1818181818182},"modelLinkId":19397,"imageLinkId":null,"query":null,"type":"OverviewModelLink"}]}],"topOverviewImage":{"idObject":1262,"filename":"fbdbe43de73fe38f62889b89cb863adb/test.png","width":963,"height":639,"links":[{"idObject":2370,"polygon":[{"x":10.0,"y":10.0},{"x":100.0,"y":10.0},{"x":100.0,"y":100.0},{"x":10.0,"y":100.0}],"zoomLevel":null,"latLng":null,"modelLinkId":null,"imageLinkId":1261,"query":null,"type":"OverviewImageLink"},{"idObject":2371,"polygon":[{"x":200.0,"y":200.0},{"x":200.0,"y":400.0},{"x":400.0,"y":400.0},{"x":400.0,"y":200.0}],"zoomLevel":0,"latLng":{"lat":84.89177465079632,"lng":-178.1818181818182},"modelLinkId":19397,"imageLinkId":null,"query":null,"type":"OverviewModelLink"}]}} {"version":"0","disease":null,"organism":null,"idObject":18115,"status":"Ok","progress":100.0,"name":"UNKNOWN DISEASE MAP","projectId":"complex_model_with_images","overviewImageViews":[{"idObject":1261,"filename":"fbdbe43de73fe38f62889b89cb863adb/sub_image.png","width":963,"height":639,"links":[{"idObject":2369,"polygon":[{"x":200.0,"y":200.0},{"x":200.0,"y":400.0},{"x":400.0,"y":400.0},{"x":400.0,"y":200.0}],"zoomLevel":1,"latLng":{"lat":84.89177465079632,"lng":-161.8181818181818},"modelLinkId":19397,"imageLinkId":null,"query":null,"type":"OverviewModelLink"}]},{"idObject":1262,"filename":"fbdbe43de73fe38f62889b89cb863adb/test.png","width":963,"height":639,"links":[{"idObject":2370,"polygon":[{"x":10.0,"y":10.0},{"x":100.0,"y":10.0},{"x":100.0,"y":100.0},{"x":10.0,"y":100.0}],"zoomLevel":null,"latLng":null,"modelLinkId":null,"imageLinkId":1261,"query":null,"type":"OverviewImageLink"},{"idObject":2371,"polygon":[{"x":200.0,"y":200.0},{"x":200.0,"y":400.0},{"x":400.0,"y":400.0},{"x":400.0,"y":200.0}],"zoomLevel":0,"latLng":{"lat":84.89177465079632,"lng":-178.1818181818182},"modelLinkId":19397,"imageLinkId":null,"query":null,"type":"OverviewModelLink"}]}],"topOverviewImage":{"idObject":1262,"filename":"fbdbe43de73fe38f62889b89cb863adb/test.png","width":963,"height":639,"links":[{"idObject":2370,"polygon":[{"x":10.0,"y":10.0},{"x":100.0,"y":10.0},{"x":100.0,"y":100.0},{"x":10.0,"y":100.0}],"zoomLevel":null,"latLng":null,"modelLinkId":null,"imageLinkId":1261,"query":null,"type":"OverviewImageLink"},{"idObject":2371,"polygon":[{"x":200.0,"y":200.0},{"x":200.0,"y":400.0},{"x":400.0,"y":400.0},{"x":400.0,"y":200.0}],"zoomLevel":0,"latLng":{"lat":84.89177465079632,"lng":-178.1818181818182},"modelLinkId":19397,"imageLinkId":null,"query":null,"type":"OverviewModelLink"}]}}
\ No newline at end of file \ No newline at end of file
{"version":"0","disease":null,"organism":null,"idObject":15763,"name":"UNKNOWN DISEASE MAP","projectId":"complex_model_with_submaps","description":"","overviewImageViews":[],"topOverviewImage":null} {"version":"0","disease":null,"organism":null,"idObject":15763,"status":"Ok","progress":100.0,"name":"UNKNOWN DISEASE MAP","projectId":"complex_model_with_submaps","overviewImageViews":[],"topOverviewImage":null}
\ No newline at end of file \ No newline at end of file
{"version":"0","disease":null,"organism":{"resource":"9606","link":"http://www.ncbi.nlm.nih.gov/Taxonomy/Browser/wwwtax.cgi?mode=Info&id=9606","id":1104514,"type":"TAXONOMY"},"idObject":19186,"name":"UNKNOWN DISEASE MAP","projectId":"drug_target_sample","description":"","overviewImageViews":[],"topOverviewImage":null} {"version":"0","disease":null,"organism":{"resource":"9606","link":"http://www.ncbi.nlm.nih.gov/Taxonomy/Browser/wwwtax.cgi?mode=Info&id=9606","id":1104514,"type":"TAXONOMY"},"idObject":19186,"status":"Ok","progress":100.0,"name":"UNKNOWN DISEASE MAP","projectId":"drug_target_sample","overviewImageViews":[],"topOverviewImage":null}
\ No newline at end of file \ No newline at end of file
{"version":"0","disease":null,"organism":null,"idObject":19187,"name":"UNKNOWN DISEASE MAP","projectId":"empty","description":"","overviewImageViews":[],"topOverviewImage":null} {"version":"0","disease":null,"organism":null,"idObject":19187,"status":"Ok","progress":100.0,"name":"UNKNOWN DISEASE MAP","projectId":"empty","overviewImageViews":[],"topOverviewImage":null}
\ No newline at end of file \ No newline at end of file
{"version":"0","disease":{"resource":"D010300","link":"http://bioportal.bioontology.org/ontologies/1351?p=terms&conceptid=D010300","id":1104479,"type":"MESH_2012"},"organism":{"resource":"1570291","link":"http://www.ncbi.nlm.nih.gov/Taxonomy/Browser/wwwtax.cgi?mode=Info&id=1570291","id":1104480,"type":"TAXONOMY"},"idObject":14898,"name":"UNKNOWN DISEASE MAP","projectId":"sample","description":"","overviewImageViews":[],"topOverviewImage":null} {"version":"0","disease":{"resource":"D010300","link":"http://bioportal.bioontology.org/ontologies/1351?p=terms&conceptid=D010300","id":1104479,"type":"MESH_2012"},"organism":{"resource":"1570291","link":"http://www.ncbi.nlm.nih.gov/Taxonomy/Browser/wwwtax.cgi?mode=Info&id=1570291","id":1104480,"type":"TAXONOMY"},"idObject":14898,"status":"Ok","progress":100.0,"name":"UNKNOWN DISEASE MAP","projectId":"sample","overviewImageViews":[],"topOverviewImage":null}
\ No newline at end of file \ No newline at end of file
...@@ -31,6 +31,8 @@ public class ProjectMetaData implements Serializable { ...@@ -31,6 +31,8 @@ public class ProjectMetaData implements Serializable {
private Map<String, Object> organism; private Map<String, Object> organism;
private Integer idObject; private Integer idObject;
private String status;
private Double progress;
/** /**
* Name of the project. * Name of the project.
...@@ -193,4 +195,37 @@ public class ProjectMetaData implements Serializable { ...@@ -193,4 +195,37 @@ public class ProjectMetaData implements Serializable {
public void setOrganism(Map<String, Object> organism) { public void setOrganism(Map<String, Object> organism) {
this.organism = organism; this.organism = organism;
} }
/**
* @return the status
* @see #status
*/
public String getStatus() {
return status;
}
/**
* @param status
* the status to set
* @see #status
*/
public void setStatus(String status) {
this.status = status;
}
/**
* @return the progress
* @see #progress
*/
public Double getProgress() {
return progress;
}
/**
* @param progress the progress to set
* @see #progress
*/
public void setProgress(Double progress) {
this.progress = progress;
}
} }
...@@ -105,6 +105,10 @@ public class ProjectRestImpl extends BaseRestImpl { ...@@ -105,6 +105,10 @@ public class ProjectRestImpl extends BaseRestImpl {
result.setProjectId(project.getProjectId()); result.setProjectId(project.getProjectId());
result.setIdObject(project.getId()); result.setIdObject(project.getId());
result.setVersion(project.getVersion()); result.setVersion(project.getVersion());
if (project.getStatus() != null) {
result.setStatus(project.getStatus().toString());
}
result.setProgress(project.getProgress());
result.setOverviewImageViews(factory.createList(project.getOverviewImages())); result.setOverviewImageViews(factory.createList(project.getOverviewImages()));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment