Merged Records Per Search Records: Order same as Searches

For first expansion of merged data and data listed per link in image and structure pages: Order the searches same as in search details. For Merged Peptides and Proteins, put color block before search name with color that matches color of block in search details.
yeastrc · Jun 21, 2019 · 65b7210 · 65b7210
1 parent 8434437
commit 65b7210
Show file tree

Hide file tree

Showing 42 changed files with 972 additions and 1,023 deletions.
diff --git a/proxl_web_app/front_end/build.gradle b/proxl_web_app/front_end/build.gradle
@@ -102,6 +102,9 @@ task createHandlebarsOutputDirs {
 
   	  dirToCreate = rootDir
   	  mkdirSuccess = project.file( dirToCreate ).mkdirs()
+
+  	  dirToCreate = rootDir + "image_structure_pages_shared"
+  	  mkdirSuccess = project.file( dirToCreate ).mkdirs()
 
   	  dirToCreate = rootDir + "merged_pages_shared"
   	  mkdirSuccess = project.file( dirToCreate ).mkdirs()
@@ -187,6 +190,31 @@ task createHandlebarsOutputDirs {
 	}
 }
 
+//  Handlebars Precompile for input handlebars_templates/image_structure_pages_shared
+
+task handlebarsPrecompile_image_structure_pages_shared(type: NodeTask) {
+
+  def precompile_Input_Directory = "handlebars_templates/image_structure_pages_shared"
+  def precompile_Output_File = "handlebars_templates_precompiled/image_structure_pages_shared/image_structure_pages_shared_template-bundle.js"
+
+  // Gradle Build Avoidance information.  Must specify correct inputs and outputs.
+  inputs.dir( precompile_Input_Directory )
+  outputs.file( precompile_Output_File )
+
+  def osName = System.getProperty("os.name").toLowerCase();
+  if (osName.contains("windows")) {
+    script = project.file('node_modules/handlebars/bin/handlebars')
+  } else {
+    script = project.file('node_modules/.bin/handlebars')
+  }
+  args = [ '--amd' , // parameters must be before file list
+  '--min',
+  '-f', precompile_Output_File,
+   precompile_Input_Directory
+   ]
+}
+
+
 //  Handlebars Precompile for input handlebars_templates/merged_pages_shared
 
 task handlebarsPrecompile_merged_pages_shared(type: NodeTask) {
@@ -872,6 +900,7 @@ task frontEndBuild(type: GradleBuild) {
      'handlebarsPrecompile_project_page__saved_views_section_loggedin_users',
      'handlebarsPrecompile_project_page__ann_cutoff_defaults_project_level',
      'handlebarsPrecompile_save_view',
+     'handlebarsPrecompile_image_structure_pages_shared',
      'handlebarsPrecompile_merged_pages_shared',
      'handlebarsPrecompile_peptide_page',
      'handlebarsPrecompile_protein_page',

diff --git a/...rotein_data_per_search_block_template.jsp → ...data_per_search_block_template.handlebars b/...rotein_data_per_search_block_template.jsp → ...data_per_search_block_template.handlebars
@@ -1,13 +1,8 @@
+{{!-- image_structure_pages_shared_data_per_search_block_template.handlebars in 'protein_page' 
 
-<%--  protein_data_per_search_block_template.jsp --%>
-
-		<%-- !!!   Handlebars template   !!!!!!!!!   --%>
-
-
-
-	<%--  Protein Data Per Search Template --%>
+	Image And Structure Pages Shared - Link Info Display in Overlay - Per Search Block
 	
-	<%--  For <script id="protein_data_per_search_block_template"  type="text/x-handlebars-template"> --%>
+--}}
 
 <div >
 
@@ -16,7 +11,7 @@
 		<tr>
 			<th data-tooltip="Search Name"
 				class=" tool_tip_attached_jq "
-				style="text-align:left;width:60%;font-weight:bold;">Name</th>
+				style="text-align:left;width:60%;font-weight:bold;">Search Name</th>
 
 			<th  data-tooltip="Number of distinct peptides showing link"
 				class="integer-number-column-header tool_tip_attached_jq " style="width:10%;font-weight:bold;">Peptides</th>
@@ -50,11 +45,4 @@
 		<tbody class=" link_info_table__tbody_jq "></tbody>
 	</table>
 
-
-	<div class=" data_per_search_between_searches_html_jq " style="display: none;"> <%-- This is a template to be inserted --%>
-
-		<div class=" data-per-search-between-searches " ></div>
-	</div>
-
-
 </div>	 
diff --git a/...e_pages_shared/image_structure_pages_shared_data_per_search_child_row_template.handlebars b/...e_pages_shared/image_structure_pages_shared_data_per_search_child_row_template.handlebars
@@ -0,0 +1,15 @@
+{{!--image_structure_pages_shared_data_per_search_child_row_template.handlebars in 'protein_page' 
+
+	Image And Structure Pages Shared - Link Info Display in Overlay - Per Search Child Row 
+	
+--}}
+
+<tr class="expand-child" style="display:none;">
+
+	<td colspan="{{ colSpan }}" align="center" class=" child_data_container_jq ">
+
+		<div style="color: green; font-size: 16px; padding-top: 10px; padding-bottom: 10px;" >
+			Loading...
+		</div>
+	</td>
+</tr>
diff --git a/...ta_per_search_data_row_entry_template.jsp → ...a_per_search_data_row_template.handlebars b/...ta_per_search_data_row_entry_template.jsp → ...a_per_search_data_row_template.handlebars
@@ -1,11 +1,9 @@
+{{!-- image_structure_pages_shared_data_per_search_data_row_template.handlebars in 'protein_page' 
 
-		<%-- !!!   Handlebars template   !!!!!!!!!   --%>
+	Image And Structure Pages Shared - Link Info Display in Overlay - Per Search Data Row 
 	
-	<%--  Protein Data Per Search Template --%>
-<%-- 
-containing div id:  protein_data_per_search_data_row_entry_template
---%>
-
+--}}
+
 <tr class=" main_data_row_jq " 
 	style="cursor: pointer; " 
 	show_children_if_one_row="true"
@@ -38,12 +36,12 @@ containing div id:  protein_data_per_search_data_row_entry_template
 
 	>
 
-			<td>{{ data.searchName }}</td>
+			<td>{{ data.searchName }} ({{ data.searchId }})</td>
 
 			<td class="integer-number-column" style="" >
 				<a class="show-child-data-link   "
 					href="javascript:"
-					>{{ data.numPeptides }}<%-- << actual data in the cell --%><span class=" toggle_visibility_expansion_span_jq" 
+					>{{ data.numPeptides }}{{!-- << actual data in the cell --}}<span class=" toggle_visibility_expansion_span_jq" 
 								style="" 
 							><img src="images/icon-expand-small.png" 
 								class=" icon-expand-contract-in-data-table "
@@ -71,7 +69,4 @@ containing div id:  protein_data_per_search_data_row_entry_template
 	 			>{{this}}</td>
 	{{/each}}	
 
-		</tr>
-
-
-
+		</tr>
diff --git a/...emplates/merged_pages_shared/mergedPages_data_per_search_between_searches_html.handlebars b/...emplates/merged_pages_shared/mergedPages_data_per_search_between_searches_html.handlebars
@@ -0,0 +1,8 @@
+{{!-- mergedPages_data_per_search_between_searches_html.handlebars in 'merged_pages_shared'
+
+	Merged Pages Multiple Searches - Listing Per search entries, placed between the searches.
+
+    In Page template was stored with id 'data_per_search_between_searches_html'
+	
+--}}
+<div class=" data-per-search-between-searches " ></div>
diff --git a/...eptide_data_per_search_block_template.jsp → ...data_per_search_block_template.handlebars b/...eptide_data_per_search_block_template.jsp → ...data_per_search_block_template.handlebars
@@ -1,27 +1,24 @@
+{{!-- peptidePage_peptide_data_per_search_block_template.handlebars in 'peptide_page' 
 
-
-
-		<%-- !!!   Handlebars template   !!!!!!!!!   --%>
-
-
+	Peptide Page Multiple Searches - Per Search Block
 	
-	<%--  Peptide Data Per Search Template --%>
+--}}
 
 <div >
 	<table class="tablesorter peptide_table_jq " style="width:80%">
 
 	  <thead>
 		<tr>
-			<th style="text-align:left;width:{{ pageFormatting.nameWidthPercent }}%;font-weight:bold;">Name</th>
-			<th <%-- data-tooltip="The peptide as reported by respective search program (e.g., Kojak or XQuest)"  --%> 
-					class=" <%-- tool_tip_attached_jq  --%> " 
+			<th style="text-align:left;width:{{ pageFormatting.nameWidthPercent }}%;font-weight:bold;">Search Name</th>
+			<th {{!--  data-tooltip="The peptide as reported by respective search program (e.g., Kojak or XQuest)"  --}} 
+					class=" {{!--  tool_tip_attached_jq  --}} " 
 					style="text-align:left;width:{{ pageFormatting.reportedPeptideWidthPercent }}%;font-weight:bold;">
 				Reported peptide
 			</th>
 
 			{{#each peptideAnnotationDisplayNameDescriptionList}}
 			 	<th style="text-align:left;font-weight:bold;"
-			 		><span style="white-space: nowrap" <%-- TODO Add Description as tool tip, {{this.description}} --%>
+			 		><span style="white-space: nowrap" {{!-- TODO Add Description as tool tip, {{this.description}} --}}
 			 			>{{this.displayName}}</span></th>
 			{{/each}}
 
@@ -30,7 +27,7 @@
 
 			{{#each psmAnnotationDisplayNameDescriptionList}}
 			 	<th style="text-align:left;font-weight:bold;"
-			 		><span style="white-space: nowrap" >Best PSM</span> <span style="white-space: nowrap" <%-- TODO Add Description as tool tip, {{this.description}} --%>
+			 		><span style="white-space: nowrap" >Best PSM</span> <span style="white-space: nowrap" {{!--  TODO Add Description as tool tip, {{this.description}} --}}
 			 			>{{this.displayName}}</span></th>
 			{{/each}}
 

diff --git a/...link_protein_child_row_entry_template.jsp → ..._per_search_child_row_template.handlebars b/...link_protein_child_row_entry_template.jsp → ..._per_search_child_row_template.handlebars
@@ -1,13 +1,8 @@
+{{!-- peptidePage_peptide_data_per_search_child_row_template.handlebars in 'peptide_page' 
 
-
-
-		<%-- !!!   Handlebars template   !!!!!!!!!   --%>
-
-
+	Peptide Page Multiple Searches - Per Search Child Data Row 
 	
-	<%--  Protein Data Per Search Template --%>
-
-
+--}}
 
 <tr class="expand-child" style="display:none;">
 

diff --git a/...ide_data_per_search_data_row_template.jsp → ...a_per_search_data_row_template.handlebars b/...ide_data_per_search_data_row_template.jsp → ...a_per_search_data_row_template.handlebars
@@ -1,20 +1,21 @@
-<%--
-		peptide_data_per_search_data_row_template.jsp
+{{!-- peptidePage_peptide_data_per_search_data_row_template.handlebars in 'peptide_page' 
 
-		!!!   Handlebars template   !!!!!!!!!   
-
-	Peptide Data Per Search Template 
+	Peptide Page Multiple Searches - Per Search Data Row 
 	
---%>
+--}}
 
 <tr class="" 
 	id=""
 	style="cursor: pointer; "
 	onclick="viewPsmsLoadedFromWebServiceTemplate.showHidePsms( { clickedElement : this } )"
 	data-reported_peptide_id="{{ data.reportedPeptide.id }}"
-	data-project_search_id="{{  data.searchId }}"
+	data-project_search_id="{{  data.projectSearchId }}"
 	>
-	<td>{{ data.searchName }}</td>
+	<td>  {{!-- span is color block before search name --}}
+		<span class=" merged-expanded-row-single-search-color-block merged-search-search-background-color-{{ colorIndex_OneBased }} "
+			></span>
+		{{ data.searchName }} ({{  data.searchId }})
+	</td>
 	<td>
 		{{ data.reportedPeptide.sequence }}
 	</td>
@@ -43,5 +44,3 @@
 	 			>{{this}}</td>
 	{{/each}}	
 </tr>
-
-
diff --git a/...lts_project_level/project_page__ann_cutoff_defaults_project_level_overlay_root.handlebars b/...lts_project_level/project_page__ann_cutoff_defaults_project_level_overlay_root.handlebars
@@ -5,7 +5,7 @@
 --}}
 <div id="project_page__ann_cutoff_defaults_project_level_overlay_root"
     class=" project-level-ann-cutoff-defaults-modal-dialog-overlay-div overlay-outer-div  "
-    style=" width: 600px; "  >
+    style=" width: 600px; top: {{ topPosition }}px;"  >
 
     <div class="project-level-ann-cutoff-defaults-modal-dialog-overlay-header" style="width:100%; " >
 
@@ -16,7 +16,7 @@
         <h1 class="project-level-ann-cutoff-defaults-modal-dialog-overlay-header-text" >Set Custom Filters for Project</h1>
     </div>
     <div class="project-level-ann-cutoff-defaults-modal-dialog-overlay-body selector_project_page__ann_cutoff_defaults_project_level_body " 
-        style="max-height: 630px; overflow-y: auto;">
+        style="max-height: {{ mainBodyMaxHeight }}px; overflow-y: auto;">
 
         <div style="margin-top: 10px; margin-bottom: 10px;">
             <div >

diff --git a/..._templates/all_protein_block_template.jsp → ...data_per_search_block_template.handlebars b/..._templates/all_protein_block_template.jsp → ...data_per_search_block_template.handlebars
@@ -1,21 +1,18 @@
+{{!-- protein_AllProteins_data_per_search_block_template.handlebars in 'protein_page' 
 
-
-
-		<%-- !!!   Handlebars template   !!!!!!!!!   --%>
-
-	<%-- all_protein_block_template.jsp --%>
+	All Proteins Page Multiple Searches - Per Search Block
 	
-	<%--  Protein Data Per Search Template --%>
+--}}
 
 <div >
 	<table class="tablesorter all_protein_table_jq " style="width:80%">
 
 	  <thead>
 		<tr>
-<%-- 
+{{!-- 
 			<th style="text-align:left;width:{{ pageFormatting.nameWidthPercent }}%;font-weight:bold;">Name</th>
---%>		
-			<th style="text-align:left;width:60%;font-weight:bold;">Name</th>
+--}}					
+			<th style="text-align:left;width:60%;font-weight:bold;">Search Name</th>
 
 			<th class="integer-number-column-header" style="width:10%;font-weight:bold;">Peptides</th>
 			<th class="integer-number-column-header" style="width:10%;font-weight:bold;">Unique peptides</th>
@@ -38,9 +35,4 @@
 	  </thead>
 
 	 </table>
-
-	<div class=" data_per_search_between_searches_html_jq " style="display: none;"> <%-- This is a template to be inserted --%>
-
-		<div class=" data-per-search-between-searches " ></div>
-	</div>
-</div>	 
+</div>	 
diff --git a/...a_per_search_child_row_entry_template.jsp → ..._per_search_child_row_template.handlebars b/...a_per_search_child_row_entry_template.jsp → ..._per_search_child_row_template.handlebars
@@ -1,13 +1,8 @@
+{{!-- protein_AllProteins_data_per_search_child_row_template.handlebars in 'protein_page' 
 
-
-
-		<%-- !!!   Handlebars template   !!!!!!!!!   --%>
-
-
+	All Proteins Page Multiple Searches - Per Search Child Row 
 	
-	<%--  Protein Data Per Search Template --%>
-
-
+--}}
 
 <tr class="expand-child" style="display:none;">
 

diff --git a/...s/all_protein_data_row_entry_template.jsp → ...a_per_search_data_row_template.handlebars b/...s/all_protein_data_row_entry_template.jsp → ...a_per_search_data_row_template.handlebars
@@ -1,13 +1,8 @@
+{{!-- protein_AllProteins_data_per_search_data_row_template.handlebars in 'protein_page' 
 
-
-		<%-- !!!   Handlebars template   !!!!!!!!!   --%>
-
-	<%-- all_protein_data_row_entry_template.jsp --%>
+	Crosslink Protein Page Multiple Searches - Per Search Data Row 
 	
-	<%--  Protein Data Per Search Template --%>
-
-
-
+--}}
 <tr id=""
 	style="cursor: pointer; "
 
@@ -16,7 +11,12 @@
 	data-protein_id="{{ protein_id }}"
 >
 
-	<td>{{ data.searchName }}</td>
+
+	<td>  {{!-- span is color block before search name --}}
+		<span class=" merged-expanded-row-single-search-color-block merged-search-search-background-color-{{ colorIndex_OneBased }} "
+			></span>
+		{{ data.searchName }} ({{ data.searchId }})
+	</td>
 
 	<td class="integer-number-column-header"
 		><a class="show-child-data-link   " 
@@ -49,3 +49,4 @@
 </tr>
 
 
+