From dd87d19b9a445363fd32bab77c151e1a1e1a2bf0 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Tue, 17 Mar 2015 15:28:19 +0000
Subject: [PATCH] SSDM-1614 : YEASTLAB - ELN UI - Show Names
SVN: 33680
---
.../as/webapps/newbrowser/html/css/style.css | 5 +++
.../html/js/views/legacy/SampleLinksWidget.js | 38 +++++++++++--------
2 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/css/style.css b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/css/style.css
index 90912be6d97..7829f5190a1 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/css/style.css
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/css/style.css
@@ -18,6 +18,11 @@
* General Overrides
*/
+a:hover {
+ text-decoration: none;
+ cursor: pointer;
+}
+
#mainContainer.col-md-12 {
padding-top: 30px;
}
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/legacy/SampleLinksWidget.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/legacy/SampleLinksWidget.js
index 7fb7a9f8269..e5752e22bbb 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/legacy/SampleLinksWidget.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/legacy/SampleLinksWidget.js
@@ -544,7 +544,7 @@ function SampleLinksWidget(containerId, profile, serverFacade, title, sampleType
var propertiesToShowDisplayNames = this.profile.getPropertiesDisplayNamesForTypeCode(sampleToAdd.sampleTypeCode, propertiesToShow);
- var meaningfulInfo = "<b>Code: </b>" + sampleToAdd.code + " ";
+
var name = sampleToAdd.properties["NAME"];
if(!name) {
name = sampleToAdd.properties["PLASMID_NAME"];
@@ -552,27 +552,33 @@ function SampleLinksWidget(containerId, profile, serverFacade, title, sampleType
if(!name) {
name = sampleToAdd.properties["YEAST_STRAIN_NAME"];
}
+
+ var info = $("<span>");
+
+ var codeLink = $("<a>").append(sampleToAdd.code);
+ codeLink.click(function() {
+ mainController.changeView("showViewSamplePageFromPermId",sampleToAdd.permId);
+ });
+
+ var infoCode = $("<span>")
+ .append($("<b>").append("Code: "))
+ .append(codeLink);
+ info.append(infoCode);
+
if(name) {
- meaningfulInfo += " <b>Name: </b>" + name + " ";
+ var infoName = $("<span>")
+ .append($("<b>").append(" Name: "))
+ .append(name);
+ info.append(infoName);
}
- for(var j = 0; j < propertiesToShow.length; j++) {
- var propertyToShow = sampleToAdd.properties[propertiesToShow[j]];
- if(!propertyToShow && propertiesToShow[j].charAt(0) === '$') {
- propertyToShow = sampleToAdd.properties[propertiesToShow[j].substr(1)];
- }
- var propertyToShowDisplayName = propertiesToShowDisplayNames[j];
-
- meaningfulInfo += "<b>" + propertyToShowDisplayName + ": </b>" + Util.getEmptyIfNull(propertyToShow) + " ";
- }
var $input = $("#" +freePredefinedSampleId);
- if(meaningfulInfo.length > 200) {
- meaningfulInfo = meaningfulInfo.substring(0, 200) + "...";
- }
+
$input.empty();
- $input.append(meaningfulInfo);
+ $input.append(info);
+
if(this.isDisabled) {
- $input.after(meaningfulInfo);
+ $input.after(info);
$input.hide();
}
//Update annotations when adding an existing sample for updates
--
GitLab