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 0e49f11cf9f36c611172ba65511419581b2ee3a6..ba5686fae40be9faa4ce65e790145bbb8af675e0 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
@@ -1292,11 +1292,7 @@ var FormUtil = new function() {
}
var $section = $(option.section);
- if(shown && option.beforeShowingAction) {
- option.beforeShowingAction();
- }
$section.toggle(shown);
-
var $label = $("<span>").append((shown ? "Hide " : "Show ") + option.label);
var id = 'options-menu-btn-' + _this.prepareId(option.label).toLowerCase();
var $dropdownElement = $("<li>", { 'role' : 'presentation' }).append($("<a>", { 'id' : id }).append($label));
@@ -1306,9 +1302,6 @@ var FormUtil = new function() {
var $section = event.data.section;
$section.toggle(300, function() {
if ($section.css("display") === "none") {
- if (option.afterHidingAction) {
- option.afterHidingAction();
- }
$label.text("Show " + option.label);
sectionsSettings[option.label] = "hidden";
} else {
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/DataGridController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/DataGridController.js
index efb5e2745dbbe9b12c5f8462ed1e3b25c3787e9c..05e2163cb2a6249e3629e761acba46343d21fb04 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/DataGridController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/DataGridController.js
@@ -276,8 +276,6 @@ function DataGridController(
mainController.serverFacade.setSetting(configKey, elnGridSettingsStr)
}
- this.refreshHeight = function () {}
-
this.refresh = function () {
if (_this.controller) {
_this.controller.load()
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 aba9a8f382686d7ae65ae5c2cb5b036c2698508a..d9640eb205051f0ac80c67caf75f6fea0398818b 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
@@ -462,26 +462,23 @@ function ExperimentFormView(experimentFormController, experimentFormModel) {
this._createSamplesSection = function(hideShowOptionsModel) {
var _this = this;
var $samples = $("<div>", { id : "experiment-samples" });
+ $samples.append($('<legend>').text(ELNDictionary.Samples));
+ var sampleListHeader = $("<p>");
+ var sampleListContainer = $("<div>");
+ $samples.append(sampleListHeader);
+ $samples.append(sampleListContainer);
+ var views = {
+ header : sampleListHeader,
+ content : sampleListContainer
+ }
+ var sampleList = new SampleTableController(this._experimentFormController, null, this._experimentFormModel.experiment.identifier, null, null, this._experimentFormModel.experiment);
+ sampleList.init(views);
$samples.hide();
hideShowOptionsModel.push({
label : ELNDictionary.Samples,
section : "#experiment-samples",
beforeShowingAction : function() {
- $samples.append($('<legend>').text(ELNDictionary.Samples));
- var sampleListHeader = $("<p>");
- var sampleListContainer = $("<div>");
- $samples.append(sampleListHeader);
- $samples.append(sampleListContainer);
- var views = {
- header : sampleListHeader,
- content : sampleListContainer
- }
- var sampleList = new SampleTableController(_this._experimentFormController, null, _this._experimentFormModel.experiment.identifier, null, null, _this._experimentFormModel.experiment);
- sampleList.init(views);
- sampleList.refreshHeight();
- },
- afterHidingAction : function(){
- $samples.empty()
+ sampleList.refresh();
}
});
return $samples;
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentTable/ExperimentTableController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentTable/ExperimentTableController.js
index 8174295b7a647f17c1083d460996eb7506ba89ff..8fe6a935ca576b9bdca7242bb60c9b3e854ca65a 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentTable/ExperimentTableController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentTable/ExperimentTableController.js
@@ -86,10 +86,10 @@ function ExperimentTableController(parentController, title, project, showInProje
}
}
- this.refreshHeight = function()
+ this.refresh = function()
{
if (this._dataGridController) {
- this._dataGridController.refreshHeight();
+ this._dataGridController.refresh();
}
}
}
\ No newline at end of file
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 b50e6c8d5745febec3a38ab59b386f56a7e5c3cd..dfe85fbeb632ea23714888a25229655b286a16f9 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
@@ -282,55 +282,48 @@ function ProjectFormView(projectFormController, projectFormModel) {
}
this._createExperimentsSection = function(projectIdentifier, hideShowOptionsModel) {
- var _this = this
var entityKindName = ELNDictionary.getExperimentKindName(projectIdentifier, true);
var $experiments = $("<div>", { id : "project-experiments" });
+ var $experimentsContainer = $("<div>");
+ $experiments.append($("<legend>").append(entityKindName));
+ $experiments.append($experimentsContainer);
+
+ var experimentTableController = new ExperimentTableController(this._projectFormController, null, jQuery.extend(true, {}, this._projectFormModel.project), true);
+ experimentTableController.init($experimentsContainer);
$experiments.hide();
hideShowOptionsModel.push({
label : entityKindName,
section : "#project-experiments",
beforeShowingAction : function() {
- var $experimentsContainer = $("<div>");
- $experiments.append($("<legend>").append(entityKindName));
- $experiments.append($experimentsContainer);
-
- var experimentTableController = new ExperimentTableController(_this._projectFormController, null, jQuery.extend(true, {}, _this._projectFormModel.project), true);
- experimentTableController.init($experimentsContainer);
- experimentTableController.refreshHeight();
- },
- afterHidingAction : function(){
- $experiments.empty()
+ experimentTableController.refresh();
}
});
return $experiments;
}
this._createSamplesSection = function(hideShowOptionsModel) {
- var _this = this
var entityKindName = "" + ELNDictionary.Samples + "";
var $samples = $("<div>", { id : "project-samples" });
+ var $experimentsContainer = $("<div>");
+ $samples.append($("<legend>").append(entityKindName));
+ var $samplesContainerHeader = $("<div>");
+ $samples.append($samplesContainerHeader);
+ var $samplesContainer = $("<div>");
+ $samples.append($samplesContainer);
+
+ var views = {
+ header : $samplesContainerHeader,
+ content : $samplesContainer
+ }
+ var sampleTableController = new SampleTableController(this._projectFormController, null, null, this._projectFormModel.project.permId, true, null, 40);
+ sampleTableController.init(views);
$samples.hide();
-
hideShowOptionsModel.push({
label : entityKindName,
section : "#project-samples",
beforeShowingAction : function() {
- $samples.append($("<legend>").append(entityKindName));
- var $samplesContainerHeader = $("<div>");
- $samples.append($samplesContainerHeader);
- var $samplesContainer = $("<div>");
- $samples.append($samplesContainer);
- var views = {
- header : $samplesContainerHeader,
- content : $samplesContainer
- }
- var sampleTableController = new SampleTableController(_this._projectFormController, null, null, _this._projectFormModel.project.permId, true, null, 40);
- sampleTableController.init(views);
- sampleTableController.refreshHeight();
- },
- afterHidingAction : function(){
- $samples.empty()
+ sampleTableController.refresh();
}
});
return $samples;
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 e8fccd34259d52a990617e67fce139b5e24af8e1..8498168a711b8ef9d381611326717f96d50df78d 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
@@ -1000,7 +1000,7 @@ function SampleFormView(sampleFormController, sampleFormModel) {
section : "#sample-parents",
showByDefault : true,
beforeShowingAction : function() {
- _this._sampleFormModel.sampleLinksParents.refreshHeight();
+ _this._sampleFormModel.sampleLinksParents.refresh();
}
});
}
@@ -1067,7 +1067,7 @@ function SampleFormView(sampleFormController, sampleFormModel) {
section : "#sample-children",
showByDefault : true,
beforeShowingAction : function() {
- _this._sampleFormModel.sampleLinksChildren.refreshHeight();
+ _this._sampleFormModel.sampleLinksChildren.refresh();
}
});
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/LinksController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/LinksController.js
index b9758bd830981ab142ade5ffcb34b6126e23a954..ebe38d92645925209919559c66cc75e68e47cb73 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/LinksController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/LinksController.js
@@ -64,8 +64,8 @@ function LinksController(title, sampleTypeHints, isDisabled, samplesToEdit, show
}
}
- this.refreshHeight = function() {
- linksView.refreshHeight();
+ this.refresh = function() {
+ linksView.refresh();
}
//
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/LinksView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/LinksView.js
index 4214fed0bfc96e6d30fc8b508d2c2881ed6225ef..f3421370d08fa76a6cb7865a5dcbffdc99cd92b9 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/LinksView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/LinksView.js
@@ -169,9 +169,9 @@ function LinksView(linksController, linksModel) {
dataGrids.push(dataGrid);
}
- this.refreshHeight = function() {
+ this.refresh = function() {
dataGrids.forEach(function(dataGrid) {
- dataGrid.refreshHeight();
+ dataGrid.refresh();
});
}
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 c42949f7860a1bb3a172f1d9aec6966d08e285a2..fde0fbff02ec662c4dce0a60357332899d353f06 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
@@ -177,9 +177,9 @@ function SampleTableController(parentController, title, experimentIdentifier, pr
this._dataGridController.init(this._sampleTableView.getTableContainer(), extraOptions);
}
- this.refreshHeight = function() {
+ this.refresh = function() {
if (this._dataGridController) {
- this._dataGridController.refreshHeight();
+ this._dataGridController.refresh();
}
}