diff options
9 files changed, 42 insertions, 12 deletions
diff --git a/wqflask/wqflask/static/new/javascript/dataset_select_menu.js b/wqflask/wqflask/static/new/javascript/dataset_select_menu.js index 5e19ca46..34fa7503 100644 --- a/wqflask/wqflask/static/new/javascript/dataset_select_menu.js +++ b/wqflask/wqflask/static/new/javascript/dataset_select_menu.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.3.3 +// Generated by CoffeeScript 1.4.0 (function() { $(function() { diff --git a/wqflask/wqflask/static/new/javascript/marker_regression.js b/wqflask/wqflask/static/new/javascript/marker_regression.js index a1c73913..064df143 100644 --- a/wqflask/wqflask/static/new/javascript/marker_regression.js +++ b/wqflask/wqflask/static/new/javascript/marker_regression.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.3.3 +// Generated by CoffeeScript 1.4.0 (function() { var __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }; diff --git a/wqflask/wqflask/static/new/javascript/show_trait.js b/wqflask/wqflask/static/new/javascript/show_trait.js index ff705ea5..ec93727c 100644 --- a/wqflask/wqflask/static/new/javascript/show_trait.js +++ b/wqflask/wqflask/static/new/javascript/show_trait.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.3.3 +// Generated by CoffeeScript 1.4.0 (function() { var Stat_Table_Rows, is_number, __hasProp = {}.hasOwnProperty, diff --git a/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.coffee b/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.coffee index d0fc869d..83cdce4d 100644 --- a/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.coffee +++ b/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.coffee @@ -11,8 +11,21 @@ $ -> $("#trait_data_form").attr("action", url); $("#trait_data_form").submit() - $(".submit_special").click(submit_special) - + $("#marker_regression").click(() => + $("#progress_bar_container").modal() + url = "/marker_regression" + $.ajax( + type: "POST" + url: url + data: $("#trait_data_form").serialize() + success: (data) => + $('#progress_bar_container').modal('hide') + $("body").html(data) + ) + return false + ) + + #$(".submit_special").click(submit_special) composite_mapping_fields = -> $(".composite_fields").toggle() 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 c6766288..9e40a129 100644 --- a/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js +++ b/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js @@ -1,8 +1,9 @@ -// Generated by CoffeeScript 1.3.3 +// Generated by CoffeeScript 1.4.0 (function() { $(function() { - var composite_mapping_fields, submit_special, toggle_enable_disable; + var composite_mapping_fields, submit_special, toggle_enable_disable, + _this = this; submit_special = function() { var url; console.log("In submit_special"); @@ -13,7 +14,21 @@ $("#trait_data_form").attr("action", url); return $("#trait_data_form").submit(); }; - $(".submit_special").click(submit_special); + $("#marker_regression").click(function() { + var url; + $("#progress_bar_container").modal(); + url = "/marker_regression"; + $.ajax({ + type: "POST", + url: url, + data: $("#trait_data_form").serialize(), + success: function(data) { + $('#progress_bar_container').modal('hide'); + return $("body").html(data); + } + }); + return false; + }); composite_mapping_fields = function() { return $(".composite_fields").toggle(); }; diff --git a/wqflask/wqflask/static/new/javascript/stats.js b/wqflask/wqflask/static/new/javascript/stats.js index 36e96640..4cca0d13 100644 --- a/wqflask/wqflask/static/new/javascript/stats.js +++ b/wqflask/wqflask/static/new/javascript/stats.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.3.3 +// Generated by CoffeeScript 1.4.0 (function() { var Stats, bxd_only; diff --git a/wqflask/wqflask/static/new/javascript/validation.js b/wqflask/wqflask/static/new/javascript/validation.js index 06ed196d..2ac477b5 100644 --- a/wqflask/wqflask/static/new/javascript/validation.js +++ b/wqflask/wqflask/static/new/javascript/validation.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 1.3.3 +// Generated by CoffeeScript 1.4.0 (function() { $(function() { diff --git a/wqflask/wqflask/templates/show_trait.html b/wqflask/wqflask/templates/show_trait.html index 79271356..8d0dc586 100644 --- a/wqflask/wqflask/templates/show_trait.html +++ b/wqflask/wqflask/templates/show_trait.html @@ -30,6 +30,7 @@ {% include 'show_trait_calculate_correlations.html' %} {% include 'show_trait_mapping_tools.html' %} {% include 'show_trait_edit_data.html' %} + {% include 'show_trait_progress_bar.html' %} </div> </form> diff --git a/wqflask/wqflask/templates/show_trait_mapping_tools.html b/wqflask/wqflask/templates/show_trait_mapping_tools.html index 84196959..58174c78 100644 --- a/wqflask/wqflask/templates/show_trait_mapping_tools.html +++ b/wqflask/wqflask/templates/show_trait_mapping_tools.html @@ -143,13 +143,14 @@ <div class="control-group"> <div class="controls"> - <button class="btn btn-inverse submit_special" + <button id="marker_regression" + class="btn btn-inverse submit_special" data-url="/marker_regression" title="Compute Marker Regression"> <i class="icon-ok-circle icon-white"></i> Compute </button> </div> - </div> + </div> </div> |