diff options
| -rw-r--r-- | wqflask/wqflask/static/new/javascript/show_trait.js | 8 | ||||
| -rw-r--r-- | wqflask/wqflask/templates/mapping_results.html | 13 |
2 files changed, 13 insertions, 8 deletions
diff --git a/wqflask/wqflask/static/new/javascript/show_trait.js b/wqflask/wqflask/static/new/javascript/show_trait.js index 003e0a90..28d13345 100644 --- a/wqflask/wqflask/static/new/javascript/show_trait.js +++ b/wqflask/wqflask/static/new/javascript/show_trait.js @@ -73,10 +73,12 @@ Stat_Table_Rows.push( }, { vn: "skewness", pretty: "Skewness", + url: "https://en.wikipedia.org/wiki/Skewness", digits: 3 }, { vn: "kurtosis", - pretty: "Kurtosis", + pretty: "Excess Kurtosis", + url: "https://en.wikipedia.org/wiki/Kurtosis", digits: 3 } ); @@ -389,7 +391,7 @@ make_table = function() { } row_line = "<tr>"; if (row.url != null) { - row_line += "<td id=\"" + row.vn + "\" align=\"right\"><a href=\"" + row.url + "\" style=\"color: #000000;\">" + row.pretty + "</a></td>"; + row_line += "<td id=\"" + row.vn + "\" align=\"right\"><a href=\"" + row.url + "\" style=\"color: #0000EE;\">" + row.pretty + "</a></td>"; } else { row_line += "<td id=\"" + row.vn + "\" align=\"right\">" + row.pretty + "</td>"; } @@ -839,7 +841,7 @@ get_sample_table_data = function(table_name) { for (key in _ref) { if (!__hasProp.call(_ref, key)) continue; attribute_info = _ref[key]; - row_data[attribute_info.name] = $.trim($(element).find('.column_name-' + attribute_info.name.replace(" ", "_")).text()); + row_data[attribute_info.name] = $.trim($(element).find('.column_name-' + attribute_info.name.replace(" ", "_").replace("/", "\\/")).text()); } return samples.push(row_data); }; diff --git a/wqflask/wqflask/templates/mapping_results.html b/wqflask/wqflask/templates/mapping_results.html index c046f7fb..ba0ebef9 100644 --- a/wqflask/wqflask/templates/mapping_results.html +++ b/wqflask/wqflask/templates/mapping_results.html @@ -207,7 +207,7 @@ <div id="perm_histogram" class="barchart"></div> <!--<img src="/generated/{{ perm_filename }}.gif">--> <br><br> - Total of {{ nperm }} permutations <a href="javascript:export_perm_data();" target="_blank" >Download Permutation Results</a> + Total of {{ nperm }} permutations <a href="javascript:;" id="download_perm" target="_blank" >Download Permutation Results</a> <br> {% endif %} </div> @@ -229,7 +229,7 @@ <tr> <th></th> <th>Row</th> - <th>Locus</th> + <th>Marker</th> <th>{{ LRS_LOD }}</th> <th>Chr</th> {% if plotScale != "physic" %} @@ -426,6 +426,7 @@ $('input[name=selected_chr]').val(this_chr) $('input[name=chr_mb_list]').val(chr_mb_list) + $('#marker_regression_form').attr('action', '/run_mapping'); return $('#marker_regression_form').submit(); }; @@ -435,24 +436,26 @@ $('input[name=endMb]').val(end_mb) //$('input[name=mb_range]').val(start_mb + "," + end_mb) + $('#marker_regression_form').attr('action', '/run_mapping'); return $('#marker_regression_form').submit(); }; remap = function() { $('input[name=selected_chr]').val($('select[name=chromosomes]').val()); + $('#marker_regression_form').attr('action', '/run_mapping'); return $('#marker_regression_form').submit(); }; {% if mapping_method != "gemma" and mapping_method != "plink" %} - export_perm_data = function() { - var num_perm, perm_data; + $('#download_perm').click(function(){ + var num_perm, perm_data; num_perm = js_data.num_perm perm_data = js_data.perm_results json_perm_data = JSON.stringify(perm_data); $('input[name=perm_results]').val(json_perm_data); $('#marker_regression_form').attr('action', '/export_perm_data'); return $('#marker_regression_form').submit(); - } + }); modebar_options = { modeBarButtonsToAdd:[{ |