quick fix for #684

geneontology · May 4, 2023 · 386c405 · 386c405
1 parent 09f5762
commit 386c405
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 18 deletions.
diff --git a/javascript/web/Matrix.js b/javascript/web/Matrix.js
@@ -435,6 +435,7 @@ function TermDataStage(term_info, term_accs){
 	// Next, we put our link information into the same format as
 	// the example.
 	var already_done_links = {};
+	var tstr = '<table id="datatable" class="table"><tbody>';
 	us.each(seen_links, function(sub_data, sub){
 	    us.each(sub_data, function(link_count, obj){
 
@@ -455,9 +456,37 @@ function TermDataStage(term_info, term_accs){
 			'value': link_count
 		    };
 		    data.links.push(link);
+
+		    tstr +=
+			'<tr>' +
+			'<td>' +
+			term_info[sub]['name'] +
+			'</td>' +
+			'<td>' +
+			sub +
+			'</td>' +
+			'<td>'+
+			term_info[sub]['source'] +
+			'</td>' +
+			'<td>' +
+			term_info[obj]['name'] +
+			'</td>' +
+			'<td>' +
+			obj +
+			'</td>' +
+			'<td>' +
+			term_info[obj]['source'] +
+			'</td>' +
+			'<td>' +
+			link_count +
+			'</td>'+
+			'</tr>';
 		}
 	    });
 	});
+	tstr += '</tbody></table>';
+	jQuery("#datadrop").empty();
+	jQuery("#datadrop").append(tstr);
 
 	ll(' Seen links: ' + bbop.dump(seen_links));
 	ll(' Data: ' + bbop.dump(data));

diff --git a/templates/html/bs3/pages/matrix.tmpl b/templates/html/bs3/pages/matrix.tmpl
@@ -27,25 +27,25 @@
 <div id="input">
   <div class="panel panel-default">
     <div class="panel-body">
-      
+
       <div class="row">
-	
+
 	<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
 	  <div>
 	    <h4>Filter shared bioentities</h4>
 	    <div id="accordion" class="bbop-widget-set-live-filters">
 	      Loading...
 	    </div>
-	  </div>	  
+	  </div>
 	</div>
-	
+
 	<div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
-	  
+
 	  <div>
-	    
+
 	    <div class="panel panel-default">
 	      <div class="panel-body">
-		
+
 		<div class="form-group">
 		  <label for="query">Input GO IDS</label>
 		  <textarea id="input-terms"
@@ -55,7 +55,7 @@
 			    rows="5"
 			    cols="80"></textarea>
 		</div>
-		
+
 		<h5>Transitivity type</h5>
 		<div class="form-group">
 		  <div class="radio">
@@ -75,7 +75,7 @@
 		    </label>
 		  </div>
 		</div>
-		
+
 		<h5>Coloration</h5>
 		<div class="form-group">
 		  <div class="radio">
@@ -93,20 +93,20 @@
 		    </label>
 		  </div>
 		</div>
-		
+
 		<div class="form-group">
 		  <button id="button"
 			  type="button"
 			  class="btn btn-primary">Process</button>
 		</div>
-		
+
 	      </div>
-	      
+
 	    </div>
-	    
+
 	    <div class="panel panel-default">
 	      <div class="panel-body">
-		
+
 		<div id="initial_placeholder">No results yet.</div>
 
 		<div id="progress-widget">
@@ -125,14 +125,14 @@
 		    <option value="index" selected="selected">by initial order</option>
 		  </select>
 		</div>
-		
+
 		<div id="matrix_plot"></div>
 
 	      </div>
-	    </div>  
-	    
+	    </div>
+
 	  </div>
-	  
+
 	</div>
       </div>
     </div>
@@ -148,4 +148,21 @@
 
 <div class="clearboth"></div>
 
+<div></div>
+<div class="panel panel-default">
+  <div class="panel-heading">
+    <h4 class="panel-title">
+      <a class="accordion-toggle" data-toggle="collapse" title="Click to display the data that was used to generated this graph." href="#dropheader">Graph data&nbsp;<span class="glyphicon glyphicon-question-sign"></span>
+      </a>
+    </h4>
+  </div>
+  <div id="dropheader" class="panel-collapse collapse">
+    <div class="panel-body">
+      <div id="datadrop">The raw data from your query will be displayed here.</div>
+    </div>
+  </div>
+</div>
+
+<div class="clearboth"></div>
+
 <!-- End: matrix.tmpl -->