diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js index dbacbccd7ba984ea861364c53264c50436b8bad0..e524ac7ce3095f4d3789db68f92d5af005654bae 100644 --- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js +++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js @@ -413,12 +413,13 @@ function ServerFacade(openbisServer) { // // Sample Others functions // - this.moveSample = function(sampleIdentifier, experimentIdentifier, callbackFunction) { + this.moveSample = function(sampleIdentifier, experimentIdentifier, experimentType, callbackFunction) { this.createReportFromAggregationService(profile.getDefaultDataStoreCode(), { "method" : "moveSample", "sampleIdentifier" : sampleIdentifier, - "experimentIdentifier" : experimentIdentifier + "experimentIdentifier" : experimentIdentifier, + "experimentType" : experimentType }, function(data){ if(data.result.rows[0][0].value == "OK") { diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/widgets/MoveSampleController.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/widgets/MoveSampleController.js index bf5e1b19d0217791bcbc9f64379d286544aac257..6fd34276528995ce58456c11b0043180383e7b2d 100644 --- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/widgets/MoveSampleController.js +++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/widgets/MoveSampleController.js @@ -35,7 +35,8 @@ function MoveSampleController(samplePermId) { mainController.serverFacade.moveSample( this._moveSampleModel.sample.identifier, - this._moveSampleModel.experimentIdentifier, function(isOK) { + this._moveSampleModel.experimentIdentifier, + this._moveSampleModel.experimentType, function(isOK) { if(isOK) { Util.showSuccess("Sample " + _this._moveSampleModel.sample.identifier + " moved to " + _this._moveSampleModel.experimentIdentifier, function() { Util.unblockUI(); }); } else { diff --git a/plasmid/source/core-plugins/eln-lims/1/dss/reporting-plugins/newbrowserapi/script.py b/plasmid/source/core-plugins/eln-lims/1/dss/reporting-plugins/newbrowserapi/script.py index f909c716b5774b9bdcfc68906b1079010cb0bfbf..567baad89ce5389f86c3ac3036d1727f719ec683 100644 --- a/plasmid/source/core-plugins/eln-lims/1/dss/reporting-plugins/newbrowserapi/script.py +++ b/plasmid/source/core-plugins/eln-lims/1/dss/reporting-plugins/newbrowserapi/script.py @@ -459,10 +459,14 @@ def insertUpdateSample(tr, parameters, tableBuilder): def moveSample(tr, parameters, tableBuilder): sampleIdentifier = parameters.get("sampleIdentifier"); #String experimentIdentifier = parameters.get("experimentIdentifier"); #String + experimentType = parameters.get("experimentType"); #String sample = getSampleByIdentifierForUpdate(tr, sampleIdentifier); #Retrieve Sample experiment = tr.getExperiment(experimentIdentifier); #Retrieve Experiment + if experiment is None: + experiment = tr.createNewExperiment(experimentIdentifier, experimentType); + sample.setExperiment(experiment); return True