Add Search Name and Id to Q-value QC Plot

yeastrc · Nov 5, 2015 · 1f2cd91 · 1f2cd91
1 parent b3fed21
commit 1f2cd91
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/WebRoot/WEB-INF/jsp-pages/viewProject.jsp b/WebRoot/WEB-INF/jsp-pages/viewProject.jsp
@@ -1458,7 +1458,7 @@
 
 							<table style="padding:0px;margin-top:0px;margin-bottom:0px;width:100%;">
 
-								<tr style="" searchId="<bean:write name="search" property="id" />" class="search_root_jq">
+								<tr searchId="<bean:write name="search" property="id" />" class=" search_root_jq ">
 
 									<td style="width:10px;" valign="top">
 										<input id="search-checkbox-<bean:write name="search" property="id" />" onChange="javascript:checkSearchCheckboxes(<bean:write name="search" property="id" />)" class="search-checkbox" type="checkbox" name="searchIds" value="<bean:write name="search" property="id" />"/>
@@ -1514,7 +1514,7 @@
 											><span class="search-name-display  search_name_display_jq" id="search-name-display-<bean:write name="search" property="id" />"
 												><bean:write name="search" property="name" /></span
 											 ><c:if test="${authAccessLevel.writeAllowed}" 
-											 		> <span class="search-name-display ">(<bean:write name="search" property="id" />)</span></c:if><c:if test="${authAccessLevel.writeAllowed}" 
+											 		> <span class="search-name-display search_number_in_parens_display_jq ">(<bean:write name="search" property="id" />)</span></c:if><c:if test="${authAccessLevel.writeAllowed}" 
 											 		><a class="tool_tip_attached_jq" data-tooltip="Edit name of search" href="javascript:showSearchNameForm(<bean:write name="search" property="id" />)"
 												><img class="edit-icon" src="${ contextPath }/images/icon-edit-small.png" 
 													></a></c:if></span>
@@ -2165,6 +2165,8 @@
 				<div >
 
 					<input type="hidden" id="psm_q_value_count_qc_plot_current_search_id" >
+
+					<input type="hidden" id="psm_q_value_count_qc_plot_current_search_name_and_id" >
 
 
 					<table style="border-width:0px;">

diff --git a/WebRoot/js/qcChartQValueCounts.js b/WebRoot/js/qcChartQValueCounts.js
@@ -217,17 +217,20 @@ QCChartQValueCounts.prototype.openQvalueCountQCPlotOverlay = function(clickThis,
 
 	// copy the search name to the overlay
 
-//	var $search_name_display_jq = $search_root_jq.find(".search_name_display_jq");
+	var $search_name_display_jq = $search_root_jq.find(".search_name_display_jq");
 
-//	var search_name_display_jq = $search_name_display_jq.text();
+	var search_name_display_jq = $search_name_display_jq.text();
 
-//	var $delete_search_overlay_search_name = $("#delete_search_overlay_search_name");
-//	$delete_search_overlay_search_name.text( search_name_display_jq );
-
-
-
-//	var $delete_search_confirm_button = $("#delete_search_confirm_button");
-//	$delete_search_confirm_button.data("searchId", searchId);
+	var $search_number_in_parens_display_jq = $search_root_jq.find(".search_number_in_parens_display_jq");
+
+	var search_number_in_parens_display_jq = $search_number_in_parens_display_jq.text();
+
+	var searchNameAndNumberInParens = search_name_display_jq + " " + search_number_in_parens_display_jq;
+
+	var $psm_q_value_count_qc_plot_current_search_name_and_id = $("#psm_q_value_count_qc_plot_current_search_name_and_id");
+
+	$psm_q_value_count_qc_plot_current_search_name_and_id.val( searchNameAndNumberInParens );
+
 
 	// Position dialog over clicked link
 
@@ -760,8 +763,14 @@ QCChartQValueCounts.prototype.createChartResponse = function(requestData, respon
 
 	}
 
+	var $psm_q_value_count_qc_plot_current_search_name_and_id = $("#psm_q_value_count_qc_plot_current_search_name_and_id");
+
+	var searchNameAndNumberInParens = 
+		$psm_q_value_count_qc_plot_current_search_name_and_id.val( );
+
+
 
-	var chartTitle = 'PSM Count vs Q-value';
+	var chartTitle = 'PSM Count vs Q-value\n' + searchNameAndNumberInParens;
 
 	var yAxisLabel = "Count";