Skip to content
Snippets Groups Projects
Commit 8ffc72e1 authored by juanf's avatar juanf
Browse files

SSDM-2738 : Adding new API calls (ongoing work).

SVN: 35112
parent 6cf957ca
No related branches found
No related tags found
No related merge requests found
...@@ -130,6 +130,20 @@ function PlateController(sample, isDisabled) { ...@@ -130,6 +130,20 @@ function PlateController(sample, isDisabled) {
} else { } else {
_this._plateModel.sample.featureVectorsCache.featureVectorDatasetsFeatures = {}; _this._plateModel.sample.featureVectorsCache.featureVectorDatasetsFeatures = {};
_this._plateModel.sample.featureVectorsCache.featureVectorDatasetsFeatures[featureVectorDatasetCode] = result.data; _this._plateModel.sample.featureVectorsCache.featureVectorDatasetsFeatures[featureVectorDatasetCode] = result.data;
// TO-DO : Delete when you finish painting the dropdowns
// var featuresCodesFromFeatureVector = [];
// for(code in result.data) {
// featuresCodesFromFeatureVector.push(code);
// }
//
// mainController.serverFacade.customELNApi({
// "method" : "getFeaturesFromFeatureVector",
// "samplePlatePermId" : _this._plateModel.sample.permId,
// "featureVectorDatasetPermId" : featureVectorDatasetCode,
// "featuresCodesFromFeatureVector" : featuresCodesFromFeatureVector
// }, function(error, result){
// var breakPlease = "NOW!";
// });
} }
//Finally paint the view //Finally paint the view
_this._plateView.repaint($container); _this._plateView.repaint($container);
......
...@@ -128,6 +128,9 @@ def process(tr, parameters, tableBuilder): ...@@ -128,6 +128,9 @@ def process(tr, parameters, tableBuilder):
if method == "listAvailableFeatures": if method == "listAvailableFeatures":
result = listAvailableFeatures(tr, parameters, tableBuilder); result = listAvailableFeatures(tr, parameters, tableBuilder);
isOk = True; isOk = True;
if method == "getFeaturesFromFeatureVector":
result = getFeaturesFromFeatureVector(tr, parameters, tableBuilder);
isOk = True;
if isOk: if isOk:
tableBuilder.addHeader("STATUS"); tableBuilder.addHeader("STATUS");
...@@ -189,7 +192,25 @@ def listAvailableFeatures(tr, parameters, tableBuilder): ...@@ -189,7 +192,25 @@ def listAvailableFeatures(tr, parameters, tableBuilder):
features[featureInformation.getCode()] = featureInformation.getLabel(); features[featureInformation.getCode()] = featureInformation.getLabel();
return getJsonForData(features); return getJsonForData(features);
def getFeaturesFromFeatureVector(tr, parameters, tableBuilder):
openBISURL = parameters.get("openBISURL");
sessionToken = parameters.get("sessionToken");
samplePlatePermId = parameters.get("samplePlatePermId");
featureVectorDatasetPermId = parameters.get("featureVectorDatasetPermId");
featuresCodesFromFeatureVector = parameters.get("featuresCodesFromFeatureVector");
featureVectorDataset = None;
featureVectorDatasets = listFeatureVectorDatasets(openBISURL, sessionToken, samplePlatePermId);
for featureVectorDataset in featureVectorDatasets:
if featureVectorDataset.getDatasetCode() == featureVectorDatasetPermId:
featureVectorDataset = featureVectorDataset;
screeningFinder = ServiceFinder("openbis", IScreeningApiServer.SERVICE_URL);
screeningServiceDSS = screeningFinder.createService(IDssServiceRpcScreening, openBISURL);
featuresFromFeatureVector = screeningServiceDSS.loadFeatures(sessionToken, [featureVectorDataset], featuresCodesFromFeatureVector);
return getJsonForData(featuresFromFeatureVector);
def init(tr, parameters, tableBuilder): def init(tr, parameters, tableBuilder):
inventorySpace = tr.getSpace("DEFAULT_LAB_NOTEBOOK"); inventorySpace = tr.getSpace("DEFAULT_LAB_NOTEBOOK");
if inventorySpace == None: if inventorySpace == None:
......
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