From 3ce58db39d2d920b03cce85c1b86ce24a8acc6bf Mon Sep 17 00:00:00 2001 From: zsloan Date: Wed, 4 Dec 2019 13:12:45 -0600 Subject: Mapping now also computes if you click the tab + some aesthetic changes --- .../new/javascript/show_trait_mapping_tools.js | 114 ++++++++++++--------- .../templates/show_trait_mapping_tools.html | 39 +++---- 2 files changed, 83 insertions(+), 70 deletions(-) diff --git a/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js b/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js index 8db9522c..3d66a698 100644 --- a/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js +++ b/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js @@ -160,68 +160,80 @@ $("#rqtl_geno_compute").on("click", (function(_this) { return function() { - var form_data, url; - url = "/loading"; - $('input[name=method]').val("rqtl_geno"); - $('input[name=selected_chr]').val($('#chr_rqtl_geno').val()); - $('input[name=genofile]').val($('#genofile_rqtl_geno').val()); - $('input[name=num_perm]').val($('input[name=num_perm_rqtl_geno]').val()); - $('input[name=manhattan_plot]').val($('input[name=manhattan_plot_rqtl]:checked').val()); - $('input[name=control_marker]').val($('input[name=control_rqtl_geno]').val()); - $('input[name=do_control]').val($('input[name=do_control_rqtl]:checked').val()); - $('input[name=tool_used]').val("Mapping"); - $('input[name=form_url]').val("/run_mapping"); - $('input[name=wanted_inputs]').val(mapping_input_list.join(",")); - if ($('input[name=pair_scan]:checked').val() == "true") { - run_pair_scan = confirm(runtime_warning_text) - if (run_pair_scan == true) { - submit_special(url); + if ($(this).hasClass('active') || $(this).attr('id') == "rqtl_compute"){ + var form_data, url; + url = "/loading"; + $('input[name=method]').val("rqtl_geno"); + $('input[name=selected_chr]').val($('#chr_rqtl_geno').val()); + $('input[name=genofile]').val($('#genofile_rqtl_geno').val()); + $('input[name=num_perm]').val($('input[name=num_perm_rqtl_geno]').val()); + $('input[name=manhattan_plot]').val($('input[name=manhattan_plot_rqtl]:checked').val()); + $('input[name=control_marker]').val($('input[name=control_rqtl_geno]').val()); + $('input[name=do_control]').val($('input[name=do_control_rqtl]:checked').val()); + $('input[name=tool_used]').val("Mapping"); + $('input[name=form_url]').val("/run_mapping"); + $('input[name=wanted_inputs]').val(mapping_input_list.join(",")); + if ($('input[name=pair_scan]:checked').val() == "true") { + run_pair_scan = confirm(runtime_warning_text) + if (run_pair_scan == true) { + submit_special(url); + } + else { + return false + } } else { - return false + return submit_special(url); } - } - else { - return submit_special(url); + } else { + return true } }; })(this)); - - $("#gemma_compute").on("click", (function(_this) { + + $(".gemma_tab, #gemma_compute").on("click", (function(_this) { return function() { - var form_data, url; - console.log("RUNNING GEMMA"); - url = "/loading"; - $('input[name=method]').val("gemma"); - $('input[name=selected_chr]').val($('#chr_gemma').val()); - $('input[name=num_perm]').val(0); - $('input[name=genofile]').val($('#genofile_gemma').val()); - $('input[name=maf]').val($('input[name=maf_gemma]').val()); - $('input[name=tool_used]').val("Mapping"); - $('input[name=form_url]').val("/run_mapping"); - $('input[name=wanted_inputs]').val(mapping_input_list.join(",")); - return submit_special(url); + if ($(this).hasClass('active') || $(this).attr('id') == "gemma_compute"){ + var form_data, url; + console.log("RUNNING GEMMA"); + url = "/loading"; + $('input[name=method]').val("gemma"); + $('input[name=selected_chr]').val($('#chr_gemma').val()); + $('input[name=num_perm]').val(0); + $('input[name=genofile]').val($('#genofile_gemma').val()); + $('input[name=maf]').val($('input[name=maf_gemma]').val()); + $('input[name=tool_used]').val("Mapping"); + $('input[name=form_url]').val("/run_mapping"); + $('input[name=wanted_inputs]').val(mapping_input_list.join(",")); + return submit_special(url); + } else { + return true + } }; })(this)); - $("#interval_mapping_compute").on("click", (function(_this) { + $(".reaper_tab, #interval_mapping_compute").on("click", (function(_this) { return function() { - var form_data, url; - console.log("In interval mapping"); - url = "/loading"; - $('input[name=method]').val("reaper"); - $('input[name=selected_chr]').val($('#chr_reaper').val()); - $('input[name=genofile]').val($('#genofile_reaper').val()); - $('input[name=num_perm]').val($('input[name=num_perm_reaper]').val()); - $('input[name=control_marker]').val($('input[name=control_reaper]').val()); - $('input[name=do_control]').val($('input[name=do_control_reaper]:checked').val()); - $('input[name=manhattan_plot]').val($('input[name=manhattan_plot_reaper]:checked').val()); - $('input[name=mapping_display_all]').val($('input[name=display_all_reaper]')); - $('input[name=suggestive]').val($('input[name=suggestive_reaper]')); - $('input[name=tool_used]').val("Mapping"); - $('input[name=form_url]').val("/run_mapping"); - $('input[name=wanted_inputs]').val(mapping_input_list.join(",")); - return submit_special(url); + if ($(this).hasClass('active') || $(this).attr('id') == "interval_mapping_compute"){ + var form_data, url; + console.log("In interval mapping"); + url = "/loading"; + $('input[name=method]').val("reaper"); + $('input[name=selected_chr]').val($('#chr_reaper').val()); + $('input[name=genofile]').val($('#genofile_reaper').val()); + $('input[name=num_perm]').val($('input[name=num_perm_reaper]').val()); + $('input[name=control_marker]').val($('input[name=control_reaper]').val()); + $('input[name=do_control]').val($('input[name=do_control_reaper]:checked').val()); + $('input[name=manhattan_plot]').val($('input[name=manhattan_plot_reaper]:checked').val()); + $('input[name=mapping_display_all]').val($('input[name=display_all_reaper]')); + $('input[name=suggestive]').val($('input[name=suggestive_reaper]')); + $('input[name=tool_used]').val("Mapping"); + $('input[name=form_url]').val("/run_mapping"); + $('input[name=wanted_inputs]').val(mapping_input_list.join(",")); + return submit_special(url); + } else { + return true + } }; })(this)); diff --git a/wqflask/wqflask/templates/show_trait_mapping_tools.html b/wqflask/wqflask/templates/show_trait_mapping_tools.html index 1a67dce8..bc8b9743 100644 --- a/wqflask/wqflask/templates/show_trait_mapping_tools.html +++ b/wqflask/wqflask/templates/show_trait_mapping_tools.html @@ -1,27 +1,27 @@
{% if dataset.group.mapping_names|length > 0 %} -
+
    {% if dataset.group.mapping_id == "1" %} -
  • +
  • GEMMA
    • -
  • +
  • Haley-Knott Regression
    • -
  • +
  • R/qtl
    • {% endif %} {% for mapping_method in dataset.group.mapping_names %} {% if mapping_method == "GEMMA" %} -
  • +
  • GEMMA
    • {% elif mapping_method == "PLINK" %} -
  • +
  • PLINK
    • {% endif %} @@ -37,7 +37,7 @@
    - {% for item in chr_list %} {% endfor %} @@ -59,7 +59,7 @@
    - +
    @@ -85,11 +85,11 @@ {% if g.user_session.num_collections < 1 %} No collections available. Please add traits to a collection to use them as covariates. {% else %} -
    - - +
    + +
    - + {% endif %} {% elif g.cookie_session.display_num_collections() == "" %} No collections available. Please add traits to a collection to use them as covariates. @@ -98,7 +98,8 @@
    - +
    + {% endif %}
    @@ -118,7 +119,7 @@
    - @@ -127,7 +128,7 @@
    - {% for item in chr_list %} {% endfor %} @@ -232,7 +233,7 @@
    - {% for item in chr_list %} {% endfor %} @@ -354,9 +355,9 @@
    -
    -
    -
    GEMMA
    +
    +
    +
    GEMMA
    GEMMA is software implementing the Genome-wide Efficient Mixed Model Association algorithm for a standard linear mixed model for genome-wide association studies (GWAS).
    {% if dataset.group.mapping_id == "1" %}
    Haley-Knott Regression
    -- cgit v1.2.3