')
def generated_file(filename):
logger.info(request.url)
- return send_from_directory(GENERATED_IMAGE_DIR,filename)
+ return send_from_directory(GENERATED_IMAGE_DIR, filename)
@app.route("/help")
def help():
--
cgit v1.2.3
From 42ba26dbfd73b48ef463965d5ee22c16e159dc55 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Wed, 19 Aug 2020 14:14:16 -0500
Subject: Show short labels by default in Correlation Matrix *
wqflask/wqflask/templates/correlation_matrix.html - remove display: none for
short label div
---
wqflask/wqflask/templates/correlation_matrix.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'wqflask')
diff --git a/wqflask/wqflask/templates/correlation_matrix.html b/wqflask/wqflask/templates/correlation_matrix.html
index cb9fb815..4e17a0b2 100644
--- a/wqflask/wqflask/templates/correlation_matrix.html
+++ b/wqflask/wqflask/templates/correlation_matrix.html
@@ -36,7 +36,7 @@
|
Trait {{ loop.index }}: {{ trait.dataset.name }} {{ trait.name }}
- {% if trait.dataset.type == "ProbeSet" %}Gene Symbol: {{ trait.symbol }}{% elif trait.dataset.type == "Publish" %}Trait Symbol: {{ trait.post_publication_abbreviation }}{% elif trait.dataset.type == "Geno" %}Genotype{% endif %}
+ {% if trait.dataset.type == "ProbeSet" %}Gene Symbol: {{ trait.symbol }}{% elif trait.dataset.type == "Publish" %}Trait Symbol: {{ trait.post_publication_abbreviation }}{% elif trait.dataset.type == "Geno" %}Genotype{% endif %}
{% if trait.dataset.type == "ProbeSet" %}
{{ trait.symbol }} on Chr {{ trait.chr }} @ {{ trait.mb }} Mb {{ trait.description }} {{ trait.probe_target_description }}
--
cgit v1.2.3
From b3db00fc28d7826749f1fb00c2b82908b4a046f3 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Wed, 19 Aug 2020 14:16:46 -0500
Subject: Tools used from the collection page now use all traits if no rows are
checked and there are fewer than 100 traits in the table *
wqflask/wqflask/static/new/javascript/search_results.js - Created
get_traits_from_table function to get the list of traits and check if none
are selected, and also renamed the previous function also called
get_traits_from_table to submit_traits_to_export_or_bnw since that better
describes what the function does
---
.../static/new/javascript/search_results.js | 49 +++++++++++-----------
1 file changed, 25 insertions(+), 24 deletions(-)
(limited to 'wqflask')
diff --git a/wqflask/wqflask/static/new/javascript/search_results.js b/wqflask/wqflask/static/new/javascript/search_results.js
index b3ed06fc..16eff345 100644
--- a/wqflask/wqflask/static/new/javascript/search_results.js
+++ b/wqflask/wqflask/static/new/javascript/search_results.js
@@ -138,14 +138,14 @@ $(function() {
};
submit_bnw = function() {
- trait_data = get_traits_from_table("trait_table", "submit_bnw")
+ trait_data = submit_traits_to_export_or_bnw("trait_table", "submit_bnw")
}
export_traits = function() {
- trait_data = get_traits_from_table("trait_table", "export_csv")
+ trait_data = submit_traits_to_export_or_bnw("trait_table", "export_csv")
};
- get_traits_from_table = function(table_name, destination) {
+ submit_traits_to_export_or_bnw = function(table_name, destination) {
trait_table = $('#'+table_name);
table_dict = {};
@@ -181,55 +181,58 @@ $(function() {
$('#export_form').submit();
};
- $("#corr_matrix").on("click", function() {
- traits = $("#trait_table input:checked").map(function() {
+ get_traits_from_table = function(){
+ traits = $("#trait_table input:checked").map(function() {
+ return $(this).val();
+ }).get();
+ if (traits.length == 0){
+ num_traits = $("#trait_table input").length
+ if (num_traits <= 100){
+ traits = $("#trait_table input").map(function() {
return $(this).val();
- }).get();
+ }).get();
+ }
+ }
+ return traits
+ }
+
+ $("#corr_matrix").on("click", function() {
+ traits = get_traits_from_table()
$("#trait_list").val(traits)
$("input[name=tool_used]").val("Correlation Matrix")
$("input[name=form_url]").val($(this).data("url"))
return submit_special("/loading")
});
$("#network_graph").on("click", function() {
- traits = $("#trait_table input:checked").map(function() {
- return $(this).val();
- }).get();
+ traits = get_traits_from_table()
$("#trait_list").val(traits)
$("input[name=tool_used]").val("Network Graph")
$("input[name=form_url]").val($(this).data("url"))
return submit_special("/loading")
});
$("#wgcna_setup").on("click", function() {
- traits = $("#trait_table input:checked").map(function() {
- return $(this).val();
- }).get();
+ traits = get_traits_from_table()
$("#trait_list").val(traits)
$("input[name=tool_used]").val("WGCNA Setup")
$("input[name=form_url]").val($(this).data("url"))
return submit_special("/loading")
});
$("#ctl_setup").on("click", function() {
- traits = $("#trait_table input:checked").map(function() {
- return $(this).val();
- }).get();
+ traits = get_traits_from_table()
$("#trait_list").val(traits)
$("input[name=tool_used]").val("CTL Setup")
$("input[name=form_url]").val($(this).data("url"))
return submit_special("/loading")
});
$("#heatmap").on("click", function() {
- traits = $("#trait_table input:checked").map(function() {
- return $(this).val();
- }).get();
+ traits = get_traits_from_table()
$("#trait_list").val(traits)
$("input[name=tool_used]").val("Heatmap")
$("input[name=form_url]").val($(this).data("url"))
return submit_special("/loading")
});
$("#comp_bar_chart").on("click", function() {
- traits = $("#trait_table input:checked").map(function() {
- return $(this).val();
- }).get();
+ traits = get_traits_from_table()
$("#trait_list").val(traits)
$("input[name=tool_used]").val("Comparison Bar Chart")
$("input[name=form_url]").val($(this).data("url"))
@@ -237,9 +240,7 @@ $(function() {
});
$("#send_to_webgestalt, #send_to_bnw, #send_to_geneweaver").on("click", function() {
- traits = $("#trait_table input:checked").map(function() {
- return $(this).val();
- }).get();
+ traits = get_traits_from_table()
$("#trait_list").val(traits)
url = $(this).data("url")
return submit_special(url)
--
cgit v1.2.3
From 72e7b028060c04bb210064f4de263c46b700921f Mon Sep 17 00:00:00 2001
From: zsloan
Date: Wed, 19 Aug 2020 14:19:31 -0500
Subject: Added Invert button to collection page *
wqflask/wqflask/templates/collections/view.html - Added the Invert button
back to the collection page; it was removed in the past but Rob decided it
should be re-added
---
wqflask/wqflask/templates/collections/view.html | 1 +
1 file changed, 1 insertion(+)
(limited to 'wqflask')
diff --git a/wqflask/wqflask/templates/collections/view.html b/wqflask/wqflask/templates/collections/view.html
index b56a89da..ef08f04c 100644
--- a/wqflask/wqflask/templates/collections/view.html
+++ b/wqflask/wqflask/templates/collections/view.html
@@ -72,6 +72,7 @@
|