From 18e669d70f167e27be26286610f12bdae7a1844f Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 24 Mar 2017 13:05:00 +0000
Subject: [PATCH] SSDM-3501 : lab notebooks and inventory form header
SVN: 37953
---
.../eln-lims/html/js/controllers/MainController.js | 8 ++++----
.../html/js/views/Inventory/InventoryController.js | 4 ++--
.../html/js/views/Inventory/InventoryView.js | 14 ++++----------
.../js/views/LabNotebook/LabNotebookController.js | 4 ++--
.../html/js/views/LabNotebook/LabNotebookView.js | 14 ++++----------
5 files changed, 16 insertions(+), 28 deletions(-)
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 d67f4081c14..fd03630f3c0 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
@@ -253,16 +253,16 @@ function MainController(profile) {
case "showLabNotebookPage":
document.title = "Lab Notebook";
var newView = new LabNotebookController(this);
- var content = this._getBackwardsCompatibleMainContainer();
- newView.init(content);
+ var views = this._getNewViewModel(true, true, false);
+ newView.init(views);
this.currentView = newView;
//window.scrollTo(0,0);
break;
case "showInventoryPage":
document.title = "Inventory";
var newView = new InventoryController(this);
- var content = this._getBackwardsCompatibleMainContainer();
- newView.init(content);
+ var views = this._getNewViewModel(true, true, false);
+ newView.init(views);
this.currentView = newView;
//window.scrollTo(0,0);
break;
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Inventory/InventoryController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Inventory/InventoryController.js
index 6263f9bef83..55f0c9b3874 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Inventory/InventoryController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Inventory/InventoryController.js
@@ -19,7 +19,7 @@ function InventoryController(parentController) {
var inventoryModel = new InventoryModel();
var inventoryView = new InventoryView(this, inventoryModel);
- this.init = function($container) {
- inventoryView.repaint($container);
+ this.init = function(views) {
+ inventoryView.repaint(views);
}
}
\ 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/Inventory/InventoryView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Inventory/InventoryView.js
index 5bc2bff7ce8..96dee3ac740 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Inventory/InventoryView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Inventory/InventoryView.js
@@ -18,8 +18,7 @@ function InventoryView(inventoryController, inventoryView) {
var inventoryController = inventoryController;
var inventoryView = inventoryView;
- this.repaint = function($container) {
- $container.empty();
+ this.repaint = function(views) {
var $form = $("<div>", { "class" : "form-horizontal"});
var $formColumn = $("<div>");
@@ -56,15 +55,10 @@ function InventoryView(inventoryController, inventoryView) {
});
});
-
toolbarModel.push({ component : $export, tooltip: "Export" });
-
-
- $formColumn.append($formTitle);
- $formColumn.append(FormUtil.getToolbar(toolbarModel));
- $formColumn.append("<br>");
-
- $container.append($form);
+ views.header.append($formTitle);
+ views.header.append(FormUtil.getToolbar(toolbarModel));
+ views.content.append($formColumn);
}
}
\ 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/LabNotebook/LabNotebookController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/LabNotebook/LabNotebookController.js
index 183923542f4..fe2abc707c2 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/LabNotebook/LabNotebookController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/LabNotebook/LabNotebookController.js
@@ -19,7 +19,7 @@ function LabNotebookController(parentController) {
var labNotebookModel = new LabNotebookModel();
var labNotebookView = new LabNotebookView(this, labNotebookModel);
- this.init = function($container) {
- labNotebookView.repaint($container);
+ this.init = function(views) {
+ labNotebookView.repaint(views);
}
}
\ 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/LabNotebook/LabNotebookView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/LabNotebook/LabNotebookView.js
index 3afcb47d63a..8ce4cf7ff2d 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/LabNotebook/LabNotebookView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/LabNotebook/LabNotebookView.js
@@ -18,8 +18,7 @@ function LabNotebookView(labNotebookController, labNotebookView) {
var labNotebookController = labNotebookController;
var labNotebookView = labNotebookView;
- this.repaint = function($container) {
- $container.empty();
+ this.repaint = function(views) {
var $form = $("<div>", { "class" : "form-horizontal"});
var $formColumn = $("<div>");
@@ -56,15 +55,10 @@ function LabNotebookView(labNotebookController, labNotebookView) {
});
});
-
toolbarModel.push({ component : $export, tooltip: "Export" });
-
-
- $formColumn.append($formTitle);
- $formColumn.append(FormUtil.getToolbar(toolbarModel));
- $formColumn.append("<br>");
-
- $container.append($form);
+ views.header.append($formTitle);
+ views.header.append(FormUtil.getToolbar(toolbarModel));
+ views.content.append($formColumn);
}
}
\ No newline at end of file
--
GitLab