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

SSDM-3467 : Making imports context sensitive - eln ui changes - allow any... 

SSDM-3467 : Making imports context sensitive - eln ui changes - allow any registration or updates in object browser

SVN: 38959
parent cd75d884
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableView.js
+ 36
− 29
View file @ dcdd2a0c
...@@ -99,6 +99,8 @@ function SampleTableView(sampleTableController, sampleTableModel) { ...@@ -99,6 +99,8 @@ function SampleTableView(sampleTableController, sampleTableModel) {
} else { } else {
var $allSampleTypes = this._getAllSampleTypesDropdown(); var $allSampleTypes = this._getAllSampleTypesDropdown();
var $options = this._getOptionsMenu();
tableToolbarModel.push({ component : $options, tooltip: null });
tableToolbarModel.push({ component : $allSampleTypes, tooltip: null }); tableToolbarModel.push({ component : $allSampleTypes, tooltip: null });
} }
...@@ -130,11 +132,14 @@ function SampleTableView(sampleTableController, sampleTableModel) { ...@@ -130,11 +132,14 @@ function SampleTableView(sampleTableController, sampleTableModel) {
$dropDownMenu.append($caret); $dropDownMenu.append($caret);
$dropDownMenu.append($list); $dropDownMenu.append($list);
var $createSampleOption = $("<li>", { 'role' : 'presentation' }).append($("<a>", {'title' : 'Create ' + ELNDictionary.Sample + ''}).append('Create ' + ELNDictionary.Sample + '')); if(_this._sampleTableModel.experimentIdentifier) {
$createSampleOption.click(function() { var $createSampleOption = $("<li>", { 'role' : 'presentation' }).append($("<a>", {'title' : 'Create ' + ELNDictionary.Sample + ''}).append('Create ' + ELNDictionary.Sample + ''));
_this.createNewSample(_this._sampleTableModel.experimentIdentifier); $createSampleOption.click(function() {
}); _this.createNewSample(_this._sampleTableModel.experimentIdentifier);
$list.append($createSampleOption); });
$list.append($createSampleOption);
}
var $batchRegisterOption = $("<li>", { 'role' : 'presentation' }).append($("<a>", {'title' : 'Batch Register ' + ELNDictionary.Sample + 's'}).append("Batch Register " + ELNDictionary.Sample + "s")); var $batchRegisterOption = $("<li>", { 'role' : 'presentation' }).append($("<a>", {'title' : 'Batch Register ' + ELNDictionary.Sample + 's'}).append("Batch Register " + ELNDictionary.Sample + "s"));
$batchRegisterOption.click(function() { $batchRegisterOption.click(function() {
...@@ -148,16 +153,18 @@ function SampleTableView(sampleTableController, sampleTableModel) { ...@@ -148,16 +153,18 @@ function SampleTableView(sampleTableController, sampleTableModel) {
}); });
$list.append($batchUpdateOption); $list.append($batchUpdateOption);
var expKindName = ELNDictionary.getExperimentKindName(_this._sampleTableModel.experimentIdentifier, false); if(_this._sampleTableModel.experimentIdentifier) {
var $searchCollectionOption = $("<li>", { 'role' : 'presentation' }).append($("<a>", {'title' : 'Search in ' + expKindName }).append('Search in ' + expKindName)); var expKindName = ELNDictionary.getExperimentKindName(_this._sampleTableModel.experimentIdentifier, false);
$searchCollectionOption.click(function() { var $searchCollectionOption = $("<li>", { 'role' : 'presentation' }).append($("<a>", {'title' : 'Search in ' + expKindName }).append('Search in ' + expKindName));
$searchCollectionOption.click(function() {
var sampleRules = { "UUIDv4" : { type : "Experiment", name : "ATTR.PERM_ID", value : _this._sampleTableModel.experiment.permId } };
var rules = { entityKind : "SAMPLE", logicalOperator : "AND", rules : sampleRules }; var sampleRules = { "UUIDv4" : { type : "Experiment", name : "ATTR.PERM_ID", value : _this._sampleTableModel.experiment.permId } };
var rules = { entityKind : "SAMPLE", logicalOperator : "AND", rules : sampleRules };
mainController.changeView("showAdvancedSearchPage", JSON.stringify(rules));
}); mainController.changeView("showAdvancedSearchPage", JSON.stringify(rules));
$list.append($searchCollectionOption); });
$list.append($searchCollectionOption);
}
return $dropDownMenu; return $dropDownMenu;
} }
...@@ -210,10 +217,11 @@ function SampleTableView(sampleTableController, sampleTableModel) { ...@@ -210,10 +217,11 @@ function SampleTableView(sampleTableController, sampleTableModel) {
var forcedSpace = null; var forcedSpace = null;
if(this._sampleTableModel.sampleTypeCodeToUse) { if(this._sampleTableModel.sampleTypeCodeToUse) {
allowedSampleTypes = [this._sampleTableModel.sampleTypeCodeToUse, "STORAGE_POSITION"]; allowedSampleTypes = [this._sampleTableModel.sampleTypeCodeToUse, "STORAGE_POSITION"];
if(experimentIdentifier) {
forcedSpace = experimentIdentifier.split("/")[1];
}
} }
if(experimentIdentifier) {
forcedSpace = "/" + experimentIdentifier.split("/")[1];
}
var typeAndFileController = new TypeAndFileController('Register ' + ELNDictionary.Samples + '', "REGISTRATION", function(type, file) { var typeAndFileController = new TypeAndFileController('Register ' + ELNDictionary.Samples + '', "REGISTRATION", function(type, file) {
Util.blockUI(); Util.blockUI();
mainController.serverFacade.fileUpload(typeAndFileController.getFile(), function(result) { mainController.serverFacade.fileUpload(typeAndFileController.getFile(), function(result) {
...@@ -235,15 +243,14 @@ function SampleTableView(sampleTableController, sampleTableModel) { ...@@ -235,15 +243,14 @@ function SampleTableView(sampleTableController, sampleTableModel) {
}; };
var experimentIdentifierOrDelete = experimentIdentifier; var experimentIdentifierOrDelete = experimentIdentifier;
if(typeAndFileController.getSampleTypeCode() === "STORAGE_POSITION") { if(experimentIdentifierOrDelete && typeAndFileController.getSampleTypeCode() === "STORAGE_POSITION") {
experimentIdentifierOrDelete = "__DELETE__"; experimentIdentifierOrDelete = "__DELETE__";
forcedSpace = "STORAGE"; forcedSpace = "/STORAGE";
} }
if(infoData.result.identifiersPressent) { //If identifiers are present they should match the space of the experiment if(infoData.result.identifiersPressent) { //If identifiers are present they should match the space of the experiment
mainController.serverFacade.registerSamplesWithSilentOverrides(typeAndFileController.getSampleTypeCode(), '/' + forcedSpace, experimentIdentifierOrDelete, "sample-file-upload", null, finalCallback); mainController.serverFacade.registerSamplesWithSilentOverrides(typeAndFileController.getSampleTypeCode(), forcedSpace, experimentIdentifierOrDelete, "sample-file-upload", null, finalCallback);
} else { // If identifiers are not present the defaultGroup/forcedSpace should be set for auto generation } else { // If identifiers are not present the defaultGroup/forcedSpace should be set for auto generation
mainController.serverFacade.registerSamplesWithSilentOverrides(typeAndFileController.getSampleTypeCode(), '/' + forcedSpace, experimentIdentifierOrDelete, "sample-file-upload", '/' + forcedSpace, finalCallback); mainController.serverFacade.registerSamplesWithSilentOverrides(typeAndFileController.getSampleTypeCode(), forcedSpace, experimentIdentifierOrDelete, "sample-file-upload", forcedSpace, finalCallback);
} }
} }
); );
...@@ -257,9 +264,9 @@ function SampleTableView(sampleTableController, sampleTableModel) { ...@@ -257,9 +264,9 @@ function SampleTableView(sampleTableController, sampleTableModel) {
var forcedSpace = null; var forcedSpace = null;
if(this._sampleTableModel.sampleTypeCodeToUse) { if(this._sampleTableModel.sampleTypeCodeToUse) {
allowedSampleTypes = [this._sampleTableModel.sampleTypeCodeToUse, "STORAGE_POSITION"]; allowedSampleTypes = [this._sampleTableModel.sampleTypeCodeToUse, "STORAGE_POSITION"];
if(experimentIdentifier) { }
forcedSpace = experimentIdentifier.split("/")[1]; if(experimentIdentifier) {
} forcedSpace = "/" + experimentIdentifier.split("/")[1];
} }
var typeAndFileController = new TypeAndFileController('Update ' + ELNDictionary.Samples + '', "UPDATE", function(type, file) { var typeAndFileController = new TypeAndFileController('Update ' + ELNDictionary.Samples + '', "UPDATE", function(type, file) {
Util.blockUI(); Util.blockUI();
...@@ -277,14 +284,14 @@ function SampleTableView(sampleTableController, sampleTableModel) { ...@@ -277,14 +284,14 @@ function SampleTableView(sampleTableController, sampleTableModel) {
}; };
var experimentIdentifierOrDelete = experimentIdentifier; var experimentIdentifierOrDelete = experimentIdentifier;
if(typeAndFileController.getSampleTypeCode() === "STORAGE_POSITION") { if(experimentIdentifierOrDelete && typeAndFileController.getSampleTypeCode() === "STORAGE_POSITION") {
experimentIdentifierOrDelete = "__DELETE__"; experimentIdentifierOrDelete = "__DELETE__";
forcedSpace = "STORAGE"; forcedSpace = "/STORAGE";
} }
mainController.serverFacade.fileUpload(typeAndFileController.getFile(), function(result) { mainController.serverFacade.fileUpload(typeAndFileController.getFile(), function(result) {
//Code After the upload //Code After the upload
mainController.serverFacade.updateSamplesWithSilentOverrides(typeAndFileController.getSampleTypeCode(), '/' + forcedSpace, experimentIdentifierOrDelete, "sample-file-upload", null,finalCallback); mainController.serverFacade.updateSamplesWithSilentOverrides(typeAndFileController.getSampleTypeCode(), forcedSpace, experimentIdentifierOrDelete, "sample-file-upload", null,finalCallback);
}); });
}, allowedSampleTypes); }, allowedSampleTypes);
typeAndFileController.init(); typeAndFileController.init();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment