From def859a1cca17e78ee15f59c3952334c2c628a0d Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Wed, 12 Mar 2014 09:14:37 +0000
Subject: [PATCH] BIS-604 / SP-1211: ELN UI - Hierarchical View - Improvements
1. Now you can't have the same view opened twice, this fixes a lot of miss
behaviors.
SVN: 31102
---
.../as/webapps/newbrowser/html/js/config/Profile.js | 6 +++---
.../html/js/controllers/MainController.js | 13 ++++++-------
.../webapps/newbrowser/html/js/views/SampleForm.js | 4 ++--
.../newbrowser/html/js/widgets/NavigationBar.js | 7 +------
4 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/config/Profile.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/config/Profile.js
index 34981059e5e..8b97146fbb3 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/config/Profile.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/config/Profile.js
@@ -1208,9 +1208,9 @@ $.extend(BioATProfile.prototype, DefaultProfile.prototype, {
//Use this with all known types to create groups, if a type is not specified by default will be added to the OTHERS group.
this.typeGroups = {
- "SCREENING" : {
- "TYPE" : "SCREENING",
- "DISPLAY_NAME" : "Screening",
+ "PLATES" : {
+ "TYPE" : "PLATES",
+ "DISPLAY_NAME" : "Plates",
"LIST" : ["PLATE"]
},
"OTHERS" : {
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js
index 5ea2f47ca82..2cd50c94d75 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js
@@ -144,7 +144,6 @@ function MainController(profile) {
this._showSearchPage(arg);
break;
case "showSamplesPage":
- this.navigationBar.updateBreadCrumbToSecondLevel();
this._showSamplesPage(arg);
break;
case "showSampleHierarchyPage":
@@ -202,7 +201,7 @@ function MainController(profile) {
sampleTypeDisplayName = sampleTypeCode;
}
- var breadCrumbPage = new BreadCrumbPage(sampleTypeCode+"-table", "showSamplesPage", sampleTypeCode, sampleTypeDisplayName);
+ var breadCrumbPage = new BreadCrumbPage("sample-table", "showSamplesPage", sampleTypeCode, sampleTypeDisplayName);
this.navigationBar.updateBreadCrumbPage(breadCrumbPage);
//Show Sample Table
@@ -218,7 +217,7 @@ function MainController(profile) {
//Show View
var localInstance = this;
this.serverFacade.searchWithUniqueId(permId, function(data) {
- var breadCrumbPage = new BreadCrumbPage('sample-hierarchy-'+data[0].permId, "showSampleHierarchyPage", data[0].permId, 'Hierarchy '+data[0].code);
+ var breadCrumbPage = new BreadCrumbPage('sample-hierarchy', "showSampleHierarchyPage", data[0].permId, 'Hierarchy '+data[0].code);
localInstance.navigationBar.updateBreadCrumbPage(breadCrumbPage);
var sampleHierarchy = new SampleHierarchy(localInstance.serverFacade, localInstance.inspector, "mainContainer", localInstance.profile, data[0]);
@@ -234,7 +233,7 @@ function MainController(profile) {
if(sampleTypeDisplayName === null) {
sampleTypeDisplayName = sampleTypeCode;
}
- var breadCrumbPage = new BreadCrumbPage('new-sample-'+sampleTypeCode, "showCreateSamplePage", sampleTypeCode, 'Create '+sampleTypeDisplayName);
+ var breadCrumbPage = new BreadCrumbPage('new-sample', "showCreateSamplePage", sampleTypeCode, 'Create '+sampleTypeDisplayName);
this.navigationBar.updateBreadCrumbPage(breadCrumbPage);
//Show Form
@@ -247,7 +246,7 @@ function MainController(profile) {
this._showEditSamplePage = function(sample) {
//Update menu
- var breadCrumbPage = new BreadCrumbPage('edit-sample-'+sample.permId, "showEditSamplePage", sample, 'Update '+sample.code);
+ var breadCrumbPage = new BreadCrumbPage('edit-sample', "showEditSamplePage", sample, 'Update '+sample.code);
this.navigationBar.updateBreadCrumbPage(breadCrumbPage);
//Show Form
@@ -265,7 +264,7 @@ function MainController(profile) {
var localInstance = this;
this.serverFacade.searchWithUniqueId(permId, function(data) {
//Update menu
- var breadCrumbPage = new BreadCrumbPage('view-sample-'+data[0].permId, "showViewSamplePageFromPermId", data[0].permId, 'View '+data[0].code);
+ var breadCrumbPage = new BreadCrumbPage('view-sample', "showViewSamplePageFromPermId", data[0].permId, 'View '+data[0].code);
localInstance.navigationBar.updateBreadCrumbPage(breadCrumbPage);
//Show Form
@@ -279,7 +278,7 @@ function MainController(profile) {
this._showCreateDataSetPage = function(sample) {
//Update menu
- var breadCrumbPage = new BreadCrumbPage('new-dataset-'+sample.permId, "showCreateDataSetPage", sample, 'Create Data Set for '+sample.code);
+ var breadCrumbPage = new BreadCrumbPage('new-dataset', "showCreateDataSetPage", sample, 'Create Data Set for '+sample.code);
this.navigationBar.updateBreadCrumbPage(breadCrumbPage);
//Show Form
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js
index 128adea3acc..e887d3d406a 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js
@@ -324,7 +324,7 @@ function SampleForm(serverFacade, inspector, containerId, profile, sampleTypeCod
this.enableEditButtonEvent = function() {
var localReference = this;
$( "#editButton" ).click(function() {
- mainController.navigationBar.updateBreadCrumbToMinusOne();
+ mainController.navigationBar.updateBreadCloseActual();
mainController.changeView('showEditSamplePage',sample);
});
}
@@ -713,7 +713,7 @@ function SampleForm(serverFacade, inspector, containerId, profile, sampleTypeCod
mainController.changeView('showSamplesPage', localReference.sampleTypeCode);
// TO-DO: The Sample is not necessarily searchable after creation since the index runs asynchronously
// localReference.serverFacade.searchWithType(localReference.sampleTypeCode, $("#sampleCode")[0].value, function(data) {
-// mainController.navigationBar.updateBreadCrumbToMinusOne();
+// mainController.navigationBar.updateBreadCloseActual();
// mainController.changeView('showViewSamplePageFromPermId',data[0].permId);
// });
}
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/NavigationBar.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/NavigationBar.js
index 9b64086ecc3..4beebc95b68 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/NavigationBar.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/NavigationBar.js
@@ -118,18 +118,13 @@ function NavigationBar(mainController, containerId, activeMenuId, menuStructure)
this.activeMenuId = newActiveId;
}
- this.updateBreadCrumbToSecondLevel = function() { //Used by the quick menu
- this.breadcrumb.length = 1;
- }
-
- this.updateBreadCrumbToMinusOne = function() { //Used when you change a form from view to edit
+ this.updateBreadCloseActual = function() { //Used when you change a form from view to edit
this.breadcrumb.length = this.breadcrumb.length - 1;
}
this.executeBreadCrumb = function(breadCrumbIndex) {
var href = this.breadcrumb[breadCrumbIndex].href;
var hrefArgs = this.breadcrumb[breadCrumbIndex].hrefArgs;
- //this.mainController[href](hrefArgs);
this.mainController.changeView(href, hrefArgs);
}
--
GitLab