diff options
| author | zsloan | 2017-06-13 18:45:11 +0000 |
|---|---|---|
| committer | zsloan | 2017-06-13 18:45:11 +0000 |
| commit | ecd573cc7e150805383d9cdbd41f1b136c9afc0e (patch) | |
| tree | 4dccc7ea1093d71c20fb6fab641889c36d91f4cc | |
| parent | f13cf491ac849c9ca484a204cc25d9493f36d781 (diff) | |
| download | genenetwork2-ecd573cc7e150805383d9cdbd41f1b136c9afc0e.tar.gz | |
Fixed trait links in network graph nodes
Added warning notifying users that file upload option in the submit_trait page doesn't work yet
| -rw-r--r-- | wqflask/wqflask/network_graph/network_graph.py | 6 | ||||
| -rw-r--r-- | wqflask/wqflask/static/new/javascript/network_graph.js | 2 | ||||
| -rw-r--r-- | wqflask/wqflask/templates/submit_trait.html | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/wqflask/wqflask/network_graph/network_graph.py b/wqflask/wqflask/network_graph/network_graph.py index 4ce6c48d..7eb5be61 100644 --- a/wqflask/wqflask/network_graph/network_graph.py +++ b/wqflask/wqflask/network_graph/network_graph.py @@ -183,6 +183,8 @@ class NetworkGraph(object): if trait_db[1].type == "ProbeSet": node_dict = { 'data' : {'id' : str(this_trait.name) + ":" + str(this_trait.dataset.name), + 'name' : str(this_trait.name), + 'dataset' : str(this_trait.dataset.name), 'label' : this_trait.symbol, 'symbol' : this_trait.symbol, 'geneid' : this_trait.geneid, @@ -190,10 +192,14 @@ class NetworkGraph(object): 'max_corr' : max_corr } } elif trait_db[1].type == "Publish": node_dict = { 'data' : {'id' : str(this_trait.name) + ":" + str(this_trait.dataset.name), + 'name' : str(this_trait.name), + 'dataset' : str(this_trait.dataset.name), 'label' : this_trait.name, 'max_corr' : max_corr } } else: node_dict = { 'data' : {'id' : str(this_trait.name) + ":" + str(this_trait.dataset.name), + 'name' : str(this_trait.name), + 'dataset' : str(this_trait.dataset.name), 'label' : this_trait.name, 'max_corr' : max_corr } } self.nodes_list.append(node_dict) diff --git a/wqflask/wqflask/static/new/javascript/network_graph.js b/wqflask/wqflask/static/new/javascript/network_graph.js index 731acf1a..03ef1c98 100644 --- a/wqflask/wqflask/static/new/javascript/network_graph.js +++ b/wqflask/wqflask/static/new/javascript/network_graph.js @@ -82,7 +82,7 @@ window.onload=function() { cy.nodes().qtip({ content: function(){ qtip_content = '' - gn_link = '<b>'+'<a href="http://gn2.genenetwork.org/show_trait?trait_id=' + this.data().id + '&dataset=' + this.data().dataset + '" >'+this.data().id +'</a>'+'</b><br>' + gn_link = '<b>'+'<a href="http://gn2.genenetwork.org/show_trait?trait_id=' + this.data().name + '&dataset=' + this.data().dataset + '" >'+this.data().id +'</a>'+'</b><br>' qtip_content += gn_link if (typeof(this.data().geneid) !== 'undefined'){ ncbi_link = '<a href="http://www.ncbi.nlm.nih.gov/entrez/query.fcgi?db=gene&cmd=Retrieve&dopt=Graphics&list_uids=' + this.data().geneid + '" >NCBI<a>'+'<br>' diff --git a/wqflask/wqflask/templates/submit_trait.html b/wqflask/wqflask/templates/submit_trait.html index 8d624ffd..e93c1c9d 100644 --- a/wqflask/wqflask/templates/submit_trait.html +++ b/wqflask/wqflask/templates/submit_trait.html @@ -56,6 +56,7 @@ </div> <div style="padding-bottom: 50px;" class="form-horizontal"> <h3>2. Enter Trait Data:</h3> + <h4 style="color:red;">WARNING: File uploading isn't enabled yet, so please paste your values using the second option.</h4> <br> <div class="col-xs-2" style="min-height: 100vh; display: flex; align-items: center;"> <img src="/static/new/images/step2.gif"> |