From c09d3ee5ce5ea25516738e3e58ac35715f7dda70 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Tue, 9 Aug 2016 12:49:22 +0000
Subject: [PATCH] SSDM-3888: Renaming samples
SVN: 36886
---
.../eln-lims/1/as/webapps/eln-lims/html/index.html | 1 +
.../eln-lims/html/js/config/ELNDictionary.js | 6 ++++++
.../eln-lims/html/js/controllers/MainController.js | 12 ++++++------
.../1/as/webapps/eln-lims/html/js/util/FormUtil.js | 2 +-
.../js/views/AdvancedSearch/AdvancedSearchView.js | 8 ++++----
.../html/js/views/ProjectForm/ProjectFormView.js | 2 +-
.../js/views/SampleForm/SampleFormController.js | 8 ++++----
.../html/js/views/SampleForm/SampleFormView.js | 8 ++++----
.../SampleHierarchyTableView.js | 6 +++---
.../js/views/SampleTable/SampleTableController.js | 4 ++--
.../html/js/views/SampleTable/SampleTableView.js | 14 +++++++-------
.../SampleTable/widgets/MoveSampleController.js | 4 ++--
.../js/views/SampleTable/widgets/MoveSampleView.js | 2 +-
.../html/js/views/SideMenu/SideMenuWidgetView.js | 2 +-
.../StorageManager/StorageManagerController.js | 6 +++---
.../html/js/views/TrashManager/TrashManagerView.js | 2 +-
16 files changed, 47 insertions(+), 40 deletions(-)
create mode 100644 openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/ELNDictionary.js
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/index.html b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/index.html
index f77b5f760d9..ec6b3a3f15b 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/index.html
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/index.html
@@ -77,6 +77,7 @@
<!-- ELN UI -->
<script type="text/javascript" src="./js/controllers/MainController.js"></script>
+ <script type="text/javascript" src="./js/config/ELNDictionary.js"></script>
<script type="text/javascript" src="./js/config/Profile.js"></script>
<script type="text/javascript" src="./js/config/StandardProfile.js"></script>
<script type="text/javascript" src="./js/server/ServerFacade.js"></script>
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
new file mode 100644
index 00000000000..47f5aeab13a
--- /dev/null
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/ELNDictionary.js
@@ -0,0 +1,6 @@
+var ELNDictionary = {
+ Sample : "Object",
+ Samples : "Objects",
+ sample : "object",
+ samples : "objects"
+}
\ 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 abd1cb4e8c2..0db8a8e57aa 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
@@ -345,12 +345,12 @@ function MainController(profile) {
var argsMap = JSON.parse(cleanText);
var sampleTypeCode = argsMap["sampleTypeCode"];
var experimentIdentifier = argsMap["experimentIdentifier"];
- document.title = "Create Sample " + arg;
+ document.title = "Create " + ELNDictionary.Sample + " " + arg;
this._showCreateSubExperimentPage(sampleTypeCode, experimentIdentifier);
window.scrollTo(0,0);
break;
case "showSamplesPage":
- document.title = "Sample Browser";
+ document.title = "" + ELNDictionary.Sample + " Browser";
this._showSamplesPage(arg);
window.scrollTo(0,0);
break;
@@ -370,7 +370,7 @@ function MainController(profile) {
if(!data[0]) {
window.alert("The item is no longer available, refresh the page, if the problem persists tell your admin that the Lucene index is probably corrupted.");
} else {
- document.title = "Sample " + data[0].code;
+ document.title = "" + ELNDictionary.Sample + " " + data[0].code;
var isELNSubExperiment = $.inArray(data[0].spaceCode, _this.profile.inventorySpaces) === -1 && _this.profile.inventorySpaces.length > 0;
_this._showEditSamplePage(data[0], isELNSubExperiment);
window.scrollTo(0,0);
@@ -383,7 +383,7 @@ function MainController(profile) {
if(!data[0]) {
window.alert("The item is no longer available, refresh the page, if the problem persists tell your admin that the Lucene index is probably corrupted.");
} else {
- document.title = "Sample " + data[0].code;
+ document.title = "" + ELNDictionary.Sample + " " + data[0].code;
var isELNSubExperiment = $.inArray(data[0].spaceCode, _this.profile.inventorySpaces) === -1&& _this.profile.inventorySpaces.length > 0;
_this._showViewSamplePage(data[0], isELNSubExperiment);
window.scrollTo(0,0);
@@ -529,7 +529,7 @@ function MainController(profile) {
_this.currentView = sampleTableController;
});
} else {
- sampleTableController = new SampleTableController(this, "Sample Browser", null);
+ sampleTableController = new SampleTableController(this, "" + ELNDictionary.Sample + " Browser", null);
sampleTableController.init($("#mainContainer"));
this.currentView = sampleTableController;
}
@@ -787,7 +787,7 @@ function MainController(profile) {
}
if(resultLocation.entityKind === "DATA_SET") {
- code += "<br> Sample: " + getSampleIdentifierForDataSetCode(resultLocation.code);
+ code += "<br> " + ELNDictionary.Sample + ": " + getSampleIdentifierForDataSetCode(resultLocation.code);
}
dataList.push({
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
index 8d6ba2f02dd..f8c2d2efaff 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
@@ -224,7 +224,7 @@ var FormUtil = new function() {
$component.attr('required', '');
}
- $component.append($("<option>").attr('value', '').attr('selected', '').attr('disabled', '').text("Select a sample type"));
+ $component.append($("<option>").attr('value', '').attr('selected', '').attr('disabled', '').text("Select a " + ELNDictionary.sample + " type"));
for(var i = 0; i < sampleTypes.length; i++) {
var sampleType = sampleTypes[i];
if(profile.isSampleTypeHidden(sampleType.code)) {
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 c3cfab955d3..032fc39e2af 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
@@ -177,7 +177,7 @@ function AdvancedSearchView(advancedSearchController, advancedSearchModel) {
fieldTypeOptions = [{value : "All", label : "All", selected : true },
{value : "Property", label : "Property"},
{value : "Attribute", label : "Attribute"},
- {value : "Sample", label : "Sample"},
+ {value : "" + ELNDictionary.Sample + "", label : "" + ELNDictionary.Sample + ""},
// ELN-UI don't support this yet
// {value : "Parent", label : "Parent"},
// {value : "Children", label : "Children"}
@@ -207,7 +207,7 @@ function AdvancedSearchView(advancedSearchController, advancedSearchModel) {
case "Attribute":
$newFieldNameContainer.append(_this._getNewAttributeDropdown(_this._advancedSearchModel.criteria.entityKind));
break;
- case "Sample":
+ case "" + ELNDictionary.Sample + "":
$newFieldNameContainer.append(_this._getNewMergedDropdown(_this._advancedSearchModel.criteria.entityKind, "SAMPLE"));
break;
case "Experiment":
@@ -315,7 +315,7 @@ function AdvancedSearchView(advancedSearchController, advancedSearchModel) {
break;
case "SAMPLE":
model = [{ value : "ATTR.CODE", label: "Code" },
- { value : "ATTR.SAMPLE_TYPE", label: "Sample Type" },
+ { value : "ATTR.SAMPLE_TYPE", label: "" + ELNDictionary.Sample + " Type" },
{ value : "ATTR.PERM_ID", label: "Perm Id" },
{ value : "ATTR.SPACE", label: "Space" },
// { value : "ATTR.METAPROJECT", label: "Tag" }, TO-DO Not supported by ELN yet
@@ -337,7 +337,7 @@ function AdvancedSearchView(advancedSearchController, advancedSearchModel) {
var _this = this;
var model = [{ value : 'ALL', label : "All", selected : true },
{ value : 'EXPERIMENT', label : "Experiment" },
- { value : 'SAMPLE', label : "Sample" },
+ { value : 'SAMPLE', label : "" + ELNDictionary.Sample + "" },
{ value : 'DATASET', label : "Dataset" }];
this._advancedSearchModel.resetModel('ALL');
var $dropdown = FormUtil.getDropdown(model, 'Select Entity Type to search for');
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 0abb2f67bf7..08acf906e99 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
@@ -158,7 +158,7 @@ function ProjectFormView(projectFormController, projectFormModel) {
experimentTableController.init($experimentsContainer);
var $samplesContainer = $("<div>");
- $formColumn.append($("<legend>").append("Samples"))
+ $formColumn.append($("<legend>").append("" + ELNDictionary.Samples + ""))
$formColumn.append($samplesContainer);
var sampleTableController = new SampleTableController(this._projectFormController, null, null, this._projectFormModel.project.permId, true);
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js
index 154e0a413ff..65e8966e98c 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js
@@ -94,7 +94,7 @@ function SampleFormController(mainController, mode, sample) {
if(data.error) {
Util.showError(data.error.message);
} else {
- Util.showSuccess("Sample Deleted");
+ Util.showSuccess("" + ELNDictionary.Sample + " Deleted");
if(_this._sampleFormModel.isELNSample) {
mainController.sideMenu.deleteNodeByEntityPermId(_this._sampleFormModel.sample.permId, true);
} else {
@@ -310,11 +310,11 @@ function SampleFormController(mainController, mode, sample) {
var message = "";
if(isCopyWithNewCode) {
- message = "Sample copied with new code: " + isCopyWithNewCode + ".";
+ message = "" + ELNDictionary.Sample + " copied with new code: " + isCopyWithNewCode + ".";
} else if(_this._sampleFormModel.mode === FormMode.CREATE) {
- message = "Sample Created.";
+ message = "" + ELNDictionary.Sample + " Created.";
} else if(_this._sampleFormModel.mode === FormMode.EDIT) {
- message = "Sample Updated.";
+ message = "" + ELNDictionary.Sample + " Updated.";
}
var callbackOk = function() {
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
index b4ce49e4aa8..3b202b0ab3d 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
@@ -108,13 +108,13 @@ function SampleFormView(sampleFormController, sampleFormModel) {
switch(this._sampleFormModel.mode) {
case FormMode.CREATE:
- title = "Create Sample " + this._sampleFormModel.sample.sampleTypeCode;
+ title = "Create " + ELNDictionary.Sample + " " + Util.getDisplayNameFromCode(this._sampleFormModel.sample.sampleTypeCode);
break;
case FormMode.EDIT:
- title = "Update Sample: " + nameLabel;
+ title = "Update " + ELNDictionary.Sample + ": " + nameLabel;
break;
case FormMode.VIEW:
- title = "Sample: " + nameLabel;
+ title = "" + ELNDictionary.Sample + ": " + nameLabel;
break;
}
@@ -160,7 +160,7 @@ function SampleFormView(sampleFormController, sampleFormModel) {
}
}
if(this._sampleFormModel.datasets.length > 0) {
- warningText += "\n\nThe sample has " + this._sampleFormModel.datasets.length + " datasets, these will be deleted with the sample:\n";
+ warningText += "\n\nThe " + ELNDictionary.sample + " has " + this._sampleFormModel.datasets.length + " datasets, these will be deleted with the " + ELNDictionary.sample + ":\n";
var numDatasetsToShow = this._sampleFormModel.datasets.length;
if(numDatasetsToShow > 10) {
numDatasetsToShow = 10;
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleHierarchyTable/SampleHierarchyTableView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleHierarchyTable/SampleHierarchyTableView.js
index 1e596827dc4..5939c97f633 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleHierarchyTable/SampleHierarchyTableView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleHierarchyTable/SampleHierarchyTableView.js
@@ -32,7 +32,7 @@ function SampleHierarchyTableView(controller, model) {
});
$container.append($containerColumn);
- $containerColumn.append($("<h1>").append("Sample Hierarchy Table for " + this._model.sample.identifier));
+ $containerColumn.append($("<h1>").append("" + ELNDictionary.Sample + " Hierarchy Table for " + this._model.sample.identifier));
this._hierarchyFilterController = new HierarchyFilterController(this._model.sample, function() {
_this._dataGrid.refresh();
});
@@ -49,7 +49,7 @@ function SampleHierarchyTableView(controller, model) {
property : 'level',
sortable : true
} , {
- label : 'Sample Type',
+ label : "" + ELNDictionary.Sample + " Type",
property : 'sampleType',
sortable : true,
render : function(data) {
@@ -105,7 +105,7 @@ function SampleHierarchyTableView(controller, model) {
this._dataGrid = new DataGridController(null, columns, getDataList, rowClick, false, "SAMPLE_HIERARCHY_TABLE");
this._dataGrid.init(this._container);
- this._container.prepend($("<legend>").append(" Sample Hierarchy"));
+ this._container.prepend($("<legend>").append(" " + ELNDictionary.Sample + " Hierarchy"));
}
this._annotationsRenderer = function(samples, sample) {
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableController.js
index 408e32a2f3a..1972be4b645 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableController.js
@@ -93,7 +93,7 @@ function SampleTableController(parentController, title, experimentIdentifier, pr
if(selected != undefined && selected.length == 0){
Util.showError("Please select at least one sample to delete!");
} else {
- var warningText = "The next samples will be deleted: ";
+ var warningText = "The next " + ELNDictionary.samples + " will be deleted: ";
var sampleTechIds = [];
for(var sIdx = 0; sIdx < selected.length; sIdx++) {
sampleTechIds.push(selected[sIdx].id);
@@ -105,7 +105,7 @@ function SampleTableController(parentController, title, experimentIdentifier, pr
if(data.error) {
Util.showError(data.error.message);
} else {
- Util.showSuccess("Sample/s Deleted");
+ Util.showSuccess("" + ELNDictionary.Sample + "/s Deleted");
mainController.refreshView();
}
});
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 39206983e03..b09da140d85 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
@@ -69,7 +69,7 @@ function SampleTableView(sampleTableController, sampleTableModel) {
mainController.changeView("showCreateSubExperimentPage", argsMapStr);
});
- toolbarModel.push({ component : $createButton, tooltip: "Create " + sampleTypeCode });
+ toolbarModel.push({ component : $createButton, tooltip: "Create " + Util.getDisplayNameFromCode(sampleTypeCode) });
}
}
@@ -115,19 +115,19 @@ function SampleTableView(sampleTableController, sampleTableModel) {
$dropDownMenu.append($caret);
$dropDownMenu.append($list);
- var $createSampleOption = $("<li>", { 'role' : 'presentation' }).append($("<a>", {'title' : 'Create Sample'}).append("Create Sample"));
+ var $createSampleOption = $("<li>", { 'role' : 'presentation' }).append($("<a>", {'title' : 'Create ' + ELNDictionary.Sample + ''}).append('Create ' + ELNDictionary.Sample + ''));
$createSampleOption.click(function() {
_this.createNewSample(_this._sampleTableModel.experimentIdentifier);
});
$list.append($createSampleOption);
- var $batchRegisterOption = $("<li>", { 'role' : 'presentation' }).append($("<a>", {'title' : 'Batch Register Samples'}).append("Batch Register Samples"));
+ var $batchRegisterOption = $("<li>", { 'role' : 'presentation' }).append($("<a>", {'title' : 'Batch Register ' + ELNDictionary.Sample + 's'}).append("Batch Register " + ELNDictionary.Sample + "s"));
$batchRegisterOption.click(function() {
_this.registerSamples(_this._sampleTableModel.experimentIdentifier);
});
$list.append($batchRegisterOption);
- var $batchUpdateOption = $("<li>", { 'role' : 'presentation' }).append($("<a>", {'title' : 'Batch Update Samples'}).append("Batch Update Samples"));
+ var $batchUpdateOption = $("<li>", { 'role' : 'presentation' }).append($("<a>", {'title' : 'Batch Update ' + ELNDictionary.Sample + 's'}).append("Batch Update " + ELNDictionary.Sample + "s"));
$batchUpdateOption.click(function() {
_this.updateSamples(_this._sampleTableModel.experimentIdentifier);
});
@@ -139,7 +139,7 @@ function SampleTableView(sampleTableController, sampleTableModel) {
this._getLoadedSampleTypesDropdown = function() {
var _this = this;
var $sampleTypesSelector = $('<select>', { 'id' : 'sampleTypeCodesToShow', class : 'form-control' });
- $sampleTypesSelector.append($("<option>").attr('value', '').attr('selected', '').attr('disabled', '').text("Select a sample type"));
+ $sampleTypesSelector.append($("<option>").attr('value', '').attr('selected', '').attr('disabled', '').text("Select a " + ELNDictionary.sample + " type"));
for(sampleTypeCode in this._sampleTableModel.sampleTypes) {
$sampleTypesSelector.append($('<option>', { 'value' : sampleTypeCode }).text(sampleTypeCode));
}
@@ -195,7 +195,7 @@ function SampleTableView(sampleTableController, sampleTableModel) {
this.registerSamples = function(experimentIdentifier) {
var _this = this;
- var typeAndFileController = new TypeAndFileController('Register Samples', "REGISTRATION", function(type, file) {
+ var typeAndFileController = new TypeAndFileController('Register ' + ELNDictionary.Samples + '', "REGISTRATION", function(type, file) {
Util.blockUI();
mainController.serverFacade.fileUpload(typeAndFileController.getFile(), function(result) {
//Code After the upload
@@ -253,7 +253,7 @@ function SampleTableView(sampleTableController, sampleTableModel) {
}
this.updateSamples = function(experimentIdentifier) {
- var typeAndFileController = new TypeAndFileController('Update Samples', "UPDATE", function(type, file) {
+ var typeAndFileController = new TypeAndFileController('Update ' + ELNDictionary.Samples + '', "UPDATE", function(type, file) {
Util.blockUI();
var finalCallback = function(data) {
if(data.error) {
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/widgets/MoveSampleController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/widgets/MoveSampleController.js
index 997ee37f410..24a08e06cd1 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/widgets/MoveSampleController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/widgets/MoveSampleController.js
@@ -48,7 +48,7 @@ function MoveSampleController(samplePermId, successAction) {
this._moveSampleModel.experimentIdentifier,
this._moveSampleModel.experimentType, function(isOK, errorMessage) {
if(isOK) {
- Util.showSuccess("Sample " + _this._moveSampleModel.sample.identifier + " moved to " + _this._moveSampleModel.experimentIdentifier, function() {
+ Util.showSuccess("" + ELNDictionary.Sample + " " + _this._moveSampleModel.sample.identifier + " moved to " + _this._moveSampleModel.experimentIdentifier, function() {
Util.unblockUI();
if(_this._moveSampleModel.successAction) {
//Delete Sample from current experiment menu
@@ -73,7 +73,7 @@ function MoveSampleController(samplePermId, successAction) {
}
});
} else {
- Util.showError("Sample " + _this._moveSampleModel.sample.identifier + " failed to move to " + _this._moveSampleModel.experimentIdentifier + " with error: " + errorMessage, function() {
+ Util.showError("" + ELNDictionary.Sample + " " + _this._moveSampleModel.sample.identifier + " failed to move to " + _this._moveSampleModel.experimentIdentifier + " with error: " + errorMessage, function() {
Util.unblockUI();
});
}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/widgets/MoveSampleView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/widgets/MoveSampleView.js
index db0f3b8d2fa..26a55d55caf 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/widgets/MoveSampleView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/widgets/MoveSampleView.js
@@ -27,7 +27,7 @@ function MoveSampleView(moveSampleController, moveSampleModel) {
_this._moveSampleController.move();
});
- $window.append($('<legend>').append("Move Sample"));
+ $window.append($('<legend>').append("Move " + ELNDictionary.Sample + ""));
$window.append(FormUtil.getFieldForLabelWithText("Type", this._moveSampleModel.sample.sampleTypeCode));
$window.append(FormUtil.getFieldForLabelWithText("Identifier", this._moveSampleModel.sample.identifier));
$window.append(FormUtil.getFieldForLabelWithText("Current Experiment", this._moveSampleModel.sample.experimentIdentifierOrNull));
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js
index e02392b8c4c..245fbf68a0f 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js
@@ -227,7 +227,7 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) {
}
if(profile.mainMenu.showSampleBrowser) {
- treeModelUtils.push({ title : "Sample Browser", entityType: "SAMPLE_BROWSER", key : "SAMPLE_BROWSER", folder : false, lazy : false, view : "showSamplesPage", icon : "glyphicon glyphicon-list-alt" });
+ treeModelUtils.push({ title : "" + ELNDictionary.Sample + " Browser", entityType: "SAMPLE_BROWSER", key : "SAMPLE_BROWSER", folder : false, lazy : false, view : "showSamplesPage", icon : "glyphicon glyphicon-list-alt" });
}
if(profile.mainMenu.showVocabularyViewer) {
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/StorageManagerController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/StorageManagerController.js
index dc809f2a468..3a0c8b59171 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/StorageManagerController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/StorageManager/StorageManagerController.js
@@ -56,11 +56,11 @@ function StorageManagerController(mainController) {
var isNewDataHolderEmpty = $(newDataHolder).children().length === 0;
if(isMultiplePosition) {
//var oldBoxName === data.properties[newStoragePropertyGroup.boxProperty];
- var errorMsg = "Multiple position Samples are not supported by the manager, please use the sample form for this.";
+ var errorMsg = "Multiple position " + ELNDictionary.Samples + " are not supported by the manager, please use the " + ELNDictionary.samples + " form for this.";
Util.showError(errorMsg);
throw errorMsg;
} else if(!isNewDataHolderEmpty) {
- var errorMsg = "That position on the box is already used by another Sample.";
+ var errorMsg = "That position on the box is already used by another " + ELNDictionary.Sample + ".";
Util.showError(errorMsg);
throw errorMsg;
} else {
@@ -110,7 +110,7 @@ function StorageManagerController(mainController) {
newDataHolder) {
var isBox = data.samples !== undefined;
if(!isBox) {
- var errorMsg = "Samples can't be put inside a rack without a Box.";
+ var errorMsg = "" + ELNDictionary.Samples + " can't be put inside a rack without a Box.";
Util.showError(errorMsg);
throw errorMsg;
}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/TrashManager/TrashManagerView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/TrashManager/TrashManagerView.js
index 68d52c809aa..3940ec634c2 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/TrashManager/TrashManagerView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/TrashManager/TrashManagerView.js
@@ -128,7 +128,7 @@ function TrashManagerView(trashManagerController, trashManagerModel) {
break;
case "SAMPLE":
entitiesSamplesCount++;
- entitiesSamples = addEntityToList("Samples", entitiesSamples, entity);
+ entitiesSamples = addEntityToList("" + ELNDictionary.Samples + "", entitiesSamples, entity);
break;
case "DATA_SET":
entitiesDatasetsCount++;
--
GitLab