diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/ELNDictionary.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/ELNDictionary.js
index 47f5aeab13ade79a55889838ec048956d07fe3a1..d6c3adf6c503c0c47c5016e0151e9c997bb337b1 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/ELNDictionary.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/ELNDictionary.js
@@ -2,5 +2,18 @@ var ELNDictionary = {
Sample : "Object",
Samples : "Objects",
sample : "object",
- samples : "objects"
+ samples : "objects",
+ ExperimentELN : "Experiment",
+ ExperimentInventory : "Collection",
+ ExperimentsELN : "Experiments",
+ ExperimentsInventory : "Collections"
+}
+
+ELNDictionary.getExperimentKindName = function(identifier, isPlural) {
+ var space = identifier.split("/")[1];
+ if(profile.isInventorySpace(space)) {
+ return (isPlural)?ELNDictionary.ExperimentsInventory:ELNDictionary.ExperimentInventory;
+ } else {
+ return (isPlural)?ELNDictionary.ExperimentsELN:ELNDictionary.ExperimentELN;
+ }
}
\ No newline at end of file
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
index 0db8a8e57aa1b1709b5de445f95e2bb79fb044be..3dbc0edd97b8a1171a12eff3cb12a48088b9cebd 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
@@ -316,7 +316,8 @@ function MainController(profile) {
var argsMap = JSON.parse(cleanText);
var experimentTypeCode = argsMap["experimentTypeCode"];
var projectIdentifier = argsMap["projectIdentifier"];
- document.title = "Create Experiment " + experimentTypeCode;
+
+ document.title = "Create " + ELNDictionary.getExperimentKindName(projectIdentifier) + " " + experimentTypeCode;
var experiment = {
experimentTypeCode : experimentTypeCode,
identifier : projectIdentifier
@@ -327,7 +328,7 @@ function MainController(profile) {
case "showExperimentPageFromIdentifier":
var _this = this;
this.serverFacade.listExperimentsForIdentifiers([arg], function(data) {
- document.title = "Experiment " + arg;
+ document.title = "" + ELNDictionary.getExperimentKindName(arg) + " " + arg;
_this._showExperimentPage(data.result[0], FormMode.VIEW);
window.scrollTo(0,0);
});
@@ -335,7 +336,7 @@ function MainController(profile) {
case "showEditExperimentPageFromIdentifier":
var _this = this;
this.serverFacade.listExperimentsForIdentifiers([arg], function(data) {
- document.title = "Experiment " + arg;
+ document.title = "" + ELNDictionary.getExperimentKindName(arg) + " " + arg;
_this._showExperimentPage(data.result[0], FormMode.EDIT);
window.scrollTo(0,0);
});
@@ -524,7 +525,7 @@ function MainController(profile) {
if(experimentIdentifier) {
var _this = this;
this.serverFacade.listExperimentsForIdentifiers([experimentIdentifier], function(data) {
- sampleTableController = new SampleTableController(this, "Experiment " + experimentIdentifier, experimentIdentifier, null, null, data.result[0]);
+ sampleTableController = new SampleTableController(this, "" + ELNDictionary.getExperimentKindName(experimentIdentifier) + " " + experimentIdentifier, experimentIdentifier, null, null, data.result[0]);
sampleTableController.init($("#mainContainer"));
_this.currentView = sampleTableController;
});
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
index 032fc39e2afc2ff7f10a22e3991433d44c98d233..0657c57f68bbd24f26771813e60c33d504171583 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
@@ -164,7 +164,8 @@ function AdvancedSearchView(advancedSearchController, advancedSearchModel) {
fieldTypeOptions = [{value : "All", label : "All", selected : true },
{value : "Property", label : "Property"},
{value : "Attribute", label : "Attribute"},
- {value : "Experiment", label : "Experiment"},
+ {value : "Experiment", label : ELNDictionary.ExperimentELN},
+ {value : "Experiment", label : ELNDictionary.ExperimentInventory},
{value : "Parent", label : "Parent"},
{value : "Children", label : "Children"}];
break;
@@ -336,7 +337,8 @@ function AdvancedSearchView(advancedSearchController, advancedSearchModel) {
this._getEntityTypeDropdown = function() {
var _this = this;
var model = [{ value : 'ALL', label : "All", selected : true },
- { value : 'EXPERIMENT', label : "Experiment" },
+ { value : 'EXPERIMENT', label : ELNDictionary.ExperimentELN },
+ { value : 'EXPERIMENT', label : ELNDictionary.ExperimentInventory },
{ value : 'SAMPLE', label : "" + ELNDictionary.Sample + "" },
{ value : 'DATASET', label : "Dataset" }];
this._advancedSearchModel.resetModel('ALL');
@@ -432,7 +434,7 @@ function AdvancedSearchView(advancedSearchController, advancedSearchModel) {
return getLinkOnClick(data.identifier, data);
}
}, {
- label : 'Experiment',
+ label : ELNDictionary.ExperimentELN + '/' + ELNDictionary.ExperimentInventory,
property : 'experiment',
isExportable: false,
sortable : true
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
index 9aead02a892761b79b4d3c7a3eb78ef6955398b5..b179dbe56e9e8cdfb6729747c71f57558b3f633c 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
@@ -67,7 +67,7 @@ var SampleDataGridUtil = new function() {
});
columns.push({
- label : 'Experiment',
+ label : ELNDictionary.ExperimentELN + '/' + ELNDictionary.ExperimentInventory,
property : 'experiment',
isExportable: true,
sortable : true
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormController.js
index 5cf63c2039f316b065044efe96ac2ec593459d57..0ede007b1e5c18cf4e3054f1d14242b6b830f768 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormController.js
@@ -46,7 +46,7 @@ function ExperimentFormController(mainController, mode, experiment) {
if(dataExperiment.error) {
Util.showError(dataExperiment.error.message);
} else {
- Util.showSuccess("Experiment Deleted");
+ Util.showSuccess("" + ELNDictionary.getExperimentKindName(_this._experimentFormModel.experiment.identifier) + " Deleted");
//Delete experiment from UI
mainController.sideMenu.deleteNodeByEntityPermId(_this._experimentFormModel.experiment.permId, true);
@@ -102,9 +102,9 @@ function ExperimentFormController(mainController, mode, experiment) {
var message = "";
if(_this._experimentFormModel.mode === FormMode.CREATE) {
- message = "Experiment Created.";
+ message = "" + ELNDictionary.getExperimentKindName(experimentIdentifier) + " Created.";
} else if(_this._experimentFormModel.mode === FormMode.EDIT) {
- message = "Experiment Updated.";
+ message = "" + ELNDictionary.getExperimentKindName(experimentIdentifier) + " Updated.";
}
var callbackOk = function() {
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js
index d4536271a4989ec64e5a43c6bfb3bae1f0dccf40..cfaa9119ddc9d4d8250adf0833330dc5ef365ee6 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js
@@ -43,7 +43,7 @@ function ExperimentFormView(experimentFormController, experimentFormModel) {
}
var entityPath = null;
- var typeTitle = "Experiment: ";
+ var typeTitle = "" + ELNDictionary.getExperimentKindName(this._experimentFormModel.experiment.identifier) + ": ";
// if(this._experimentFormModel.experiment &&
// this._experimentFormModel.experiment.identifier &&
// profile.isInventorySpace(this._experimentFormModel.experiment.identifier.split("/")[1])
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentTable/ExperimentTableView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentTable/ExperimentTableView.js
index 6607e4db5a552df70698a23fd3ebc16440939e9d..8344be47eb62afbf6dc2d2c8ea4b41929a67abae 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentTable/ExperimentTableView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentTable/ExperimentTableView.js
@@ -51,10 +51,13 @@ function ExperimentTableView(experimentTableController, experimentTableModel) {
this._showExperimentFromOverviewDropdown = function() {
var _this = this;
- var expDropModel = [{value : "OVERVIEW", label : "Show only overview experiments", selected : this._experimentTableModel.showInProjectOverview },
- {value : "ALL", label : "Show all experiments", selected : !this._experimentTableModel.showInProjectOverview }];
+ var expDropModel = [];
+ var projectIdentifier = "/" + this._experimentTableModel.project.spaceCode + "/" + this._experimentTableModel.project.code;
+ expDropModel = [{value : "OVERVIEW", label : "Show only overview " + ELNDictionary.getExperimentKindName(projectIdentifier, true), selected : this._experimentTableModel.showInProjectOverview },
+ {value : "ALL", label : "Show all " + ELNDictionary.getExperimentKindName(projectIdentifier, true), selected : !this._experimentTableModel.showInProjectOverview }];
- var $experimentDropdown = FormUtil.getDropdown(expDropModel, "Select what experiments to show");
+
+ var $experimentDropdown = FormUtil.getDropdown(expDropModel, "Select what " + ELNDictionary.getExperimentKindName(projectIdentifier, true) + " to show");
$experimentDropdown.change(function() {
switch($(this).val()){
@@ -73,7 +76,8 @@ function ExperimentTableView(experimentTableController, experimentTableModel) {
this._getProjectExperimentTypesDropdown = function() {
var _this = this;
var $typesSelector = $('<select>', { class : 'form-control' });
- $typesSelector.append($("<option>").attr('value', '').attr('selected', '').attr('disabled', '').text("Select an experiment type"));
+ var projectIdentifier = "/" + this._experimentTableModel.project.spaceCode + "/" + this._experimentTableModel.project.code;
+ $typesSelector.append($("<option>").attr('value', '').attr('selected', '').attr('disabled', '').text("Select an " + ELNDictionary.getExperimentKindName(projectIdentifier, true) + " type"));
for(typeCode in this._experimentTableModel.types) {
$typesSelector.append($('<option>', { 'value' : typeCode }).text(typeCode));
}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js
index 08acf906e99a0dfbb28b37bf507731cf0f5b8769..f94c19c65cfc6466421f571cd7f41dbd0d5e384e 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormView.js
@@ -68,7 +68,7 @@ function ProjectFormView(projectFormController, projectFormModel) {
if(this._projectFormModel.mode !== FormMode.CREATE) {
var showSelectExperimentType = function() {
var $dropdown = FormUtil.getExperimentTypeDropdown("experimentTypeDropdown", true);
- Util.blockUI("Select the type for the Experiment: <br><br>" + $dropdown[0].outerHTML + "<br> or <a class='btn btn-default' id='experimentTypeDropdownCancel'>Cancel</a>");
+ Util.blockUI("Select the type for the " + ELNDictionary.getExperimentKindName("/" + _this._projectFormModel.project.spaceCode) + ": <br><br>" + $dropdown[0].outerHTML + "<br> or <a class='btn btn-default' id='experimentTypeDropdownCancel'>Cancel</a>");
$("#experimentTypeDropdown").on("change", function(event) {
var experimentTypeCode = $("#experimentTypeDropdown")[0].value;
@@ -93,7 +93,7 @@ function ProjectFormView(projectFormController, projectFormModel) {
_this._projectFormController.createNewExperiment("DEFAULT_EXPERIMENT");
}
});
- toolbarModel.push({ component : $createExpBtn, tooltip: "Create Experiment" });
+ toolbarModel.push({ component : $createExpBtn, tooltip: "Create " + ELNDictionary.getExperimentKindName("/" + _this._projectFormModel.project.spaceCode) });
//Edit
var $editBtn = FormUtil.getButtonWithIcon("glyphicon-edit", function () {
@@ -122,7 +122,7 @@ function ProjectFormView(projectFormController, projectFormModel) {
toolbarModel.push({ component : $export, tooltip: "Export" });
//Operations
- var $operationsMenu = FormUtil.getOperationsMenu([{ label: "Create Experiment", event: function() {
+ var $operationsMenu = FormUtil.getOperationsMenu([{ label: "Create " + ELNDictionary.getExperimentKindName("/" + _this._projectFormModel.project.spaceCode), event: function() {
showSelectExperimentType();
}}]);
toolbarModel.push({ component : $operationsMenu, tooltip: "Extra operations" });
@@ -151,7 +151,7 @@ function ProjectFormView(projectFormController, projectFormModel) {
// Experiment And Samples Table
if(this._projectFormModel.mode !== FormMode.CREATE && !isInventoryProject) {
var $experimentsContainer = $("<div>");
- $formColumn.append($("<legend>").append("Experiments"))
+ $formColumn.append($("<legend>").append(ELNDictionary.getExperimentKindName("/" + _this._projectFormModel.project.spaceCode, true)))
$formColumn.append($experimentsContainer);
var experimentTableController = new ExperimentTableController(this._projectFormController, null, this._projectFormModel.project, true);
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableView.js
index b09da140d850d6e41eb5fe2fadb2fe6a40d04fa9..cef4bf7cafe2ba2745d1d9a798141f43120a06c7 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableView.js
@@ -24,9 +24,10 @@ function SampleTableView(sampleTableController, sampleTableModel) {
$container.empty();
var $title = $("<div>");
if(this._sampleTableModel.title && this._sampleTableModel.experimentIdentifier) {
- var title = "Experiment: " + this._sampleTableModel.experimentIdentifier.substring(this._sampleTableModel.experimentIdentifier.lastIndexOf("/") + 1);
+
+ var title = "" + ELNDictionary.getExperimentKindName(this._sampleTableModel.experimentIdentifier) + ": " + this._sampleTableModel.experimentIdentifier.substring(this._sampleTableModel.experimentIdentifier.lastIndexOf("/") + 1);
if(this._sampleTableModel.experiment && this._sampleTableModel.experiment.properties[profile.propertyReplacingCode]) {
- title = "Experiment: " + this._sampleTableModel.experiment.properties[profile.propertyReplacingCode];
+ title = "" + ELNDictionary.getExperimentKindName(this._sampleTableModel.experimentIdentifier) + ": " + this._sampleTableModel.experiment.properties[profile.propertyReplacingCode];
}
$title
.append($("<h2>").append(title))