aboutsummaryrefslogtreecommitdiff
path: root/wqflask
diff options
context:
space:
mode:
authorzsloan2019-09-09 16:24:41 -0500
committerzsloan2019-09-09 16:24:41 -0500
commitbbc12d6db4b40247e02377b2c24d933243dd7cc1 (patch)
tree0f07b1b2dc420c104c8e35a42ef7901b04222550 /wqflask
parentcc12fe06593f4957fb2b5b641ebe7e5cf43453b1 (diff)
downloadgenenetwork2-bbc12d6db4b40247e02377b2c24d933243dd7cc1.tar.gz
Revert "Add option to hide columns in correlation results"
This reverts commit cc12fe06593f4957fb2b5b641ebe7e5cf43453b1. Mistakenly included changes to tools.py that are only for the new guix build
Diffstat (limited to 'wqflask')
-rw-r--r--wqflask/utility/tools.py5
-rw-r--r--wqflask/wqflask/marker_regression/display_mapping_results.py2
-rw-r--r--wqflask/wqflask/templates/correlation_page.html28
-rw-r--r--wqflask/wqflask/templates/mapping_results.html2
4 files changed, 17 insertions, 20 deletions
diff --git a/wqflask/utility/tools.py b/wqflask/utility/tools.py
index a2eb0817..31ab2046 100644
--- a/wqflask/utility/tools.py
+++ b/wqflask/utility/tools.py
@@ -105,7 +105,7 @@ def js_path(module=None):
try_guix = get_setting("JS_GUIX_PATH")+"/"+module
if valid_path(try_guix):
return try_guix
- raise Exception("No JS path found for "+module+" (if not in Guix check JS_GN_PATH)")
+ raise "No JS path found for "+module+" (if not in Guix check JS_GN_PATH)"
def reaper_command(guess=None):
return get_setting("REAPER_COMMAND",guess)
@@ -291,8 +291,7 @@ assert_dir(JS_GUIX_PATH)
assert_dir(JS_GUIX_PATH+'/cytoscape-panzoom')
CSS_PATH = "UNKNOWN"
# assert_dir(JS_PATH)
-#JS_TWITTER_POST_FETCHER_PATH = get_setting("JS_TWITTER_POST_FETCHER_PATH",js_path("Twitter-Post-Fetcher"))
-JS_TWITTER_POST_FETCHER_PATH = get_setting("JS_TWITTER_POST_FETCHER_PATH",js_path("javascript-twitter-post-fetcher"))
+JS_TWITTER_POST_FETCHER_PATH = get_setting("JS_TWITTER_POST_FETCHER_PATH",js_path("Twitter-Post-Fetcher"))
assert_dir(JS_TWITTER_POST_FETCHER_PATH)
assert_file(JS_TWITTER_POST_FETCHER_PATH+"/js/twitterFetcher_min.js")
JS_CYTOSCAPE_PATH = get_setting("JS_CYTOSCAPE_PATH",js_path("cytoscape"))
diff --git a/wqflask/wqflask/marker_regression/display_mapping_results.py b/wqflask/wqflask/marker_regression/display_mapping_results.py
index 2834f1c3..911219f4 100644
--- a/wqflask/wqflask/marker_regression/display_mapping_results.py
+++ b/wqflask/wqflask/marker_regression/display_mapping_results.py
@@ -2066,7 +2066,7 @@ class DisplayMappingResults(object):
#########################################
# Permutation Graph
#########################################
- myCanvas = pid.PILCanvas(size=(500,300))
+ myCanvas = pid.PILCanvas(size=(400,300))
if 'lod_score' in self.qtlresults[0] and self.LRS_LOD == "LRS":
perm_output = [value*4.61 for value in self.perm_output]
elif 'lod_score' not in self.qtlresults[0] and self.LRS_LOD == "LOD":
diff --git a/wqflask/wqflask/templates/correlation_page.html b/wqflask/wqflask/templates/correlation_page.html
index 9e986eda..cbd2ab46 100644
--- a/wqflask/wqflask/templates/correlation_page.html
+++ b/wqflask/wqflask/templates/correlation_page.html
@@ -2,7 +2,6 @@
{% block css %}
<link rel="stylesheet" type="text/css" href="/static/new/packages/DataTables/css/jquery.dataTables.css" />
<link rel="stylesheet" type="text/css" href="/static/new/packages/DataTables/extensions/buttons.bootstrap.css" />
- <link rel="stylesheet" type="text/css" href="/static/new/packages/DataTables/extensions/buttons.dataTables.css">
{% endblock %}
{% block content %}
<div class="container" style="min-width: 1250px;">
@@ -189,9 +188,10 @@
<script language="javascript" type="text/javascript" src="/static/new/js_external/jszip.min.js"></script>
<script language="javascript" type="text/javascript" src="/static/packages/underscore/underscore-min.js"></script>
- <script language="javascript" type="text/javascript" src="https://cdn.datatables.net/1.10.13/js/jquery.dataTables.min.js"></script>
- <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/extensions/dataTables.buttons.min.js"></script>
- <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/extensions/buttons.colVis.min.js"></script>
+ <script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/jquery.dataTables.js"></script>
+ <script language="javascript" type="text/javascript" src="https://cdn.datatables.net/buttons/1.0.0/js/dataTables.buttons.min.js"></script>
+ <script language="javascript" type="text/javascript" src="https://cdn.datatables.net/buttons/1.0.0/js/buttons.html5.min.js"></script>
+ <script language="javascript" type="text/javascript" src="https://cdn.datatables.net/buttons/1.0.0/js/buttons.bootstrap.min.js"></script>
<script language="javascript" type="text/javascript" src="/static/new/packages/DataTables/js/dataTables.naturalSort.js"></script>
<script type="text/javascript" charset="utf-8">
@@ -319,17 +319,15 @@
});
$('.trait_checkbox:checkbox').on("change", change_buttons);
},
- buttons: [
+ "buttons": [
{
- extend: 'columnsToggle',
- columns: function( idx, data, node ) {
- if (idx != 0) {
- return true;
- } else {
- return false;
- }
- },
- postfixButtons: [ 'colvisRestore' ]
+ extend: 'csvHtml5',
+ text: 'Download CSV',
+ title: 'correlation_results',
+ fieldBoundary: '"',
+ exportOptions: {
+ columns: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
+ }
}
],
"columnDefs": [ {
@@ -362,7 +360,7 @@
}
},
"order": [[9, "asc" ]],
- "sDom": "Btir",
+ "sDom": "tir",
"iDisplayLength": -1,
"autoWidth": false,
"deferRender": true,
diff --git a/wqflask/wqflask/templates/mapping_results.html b/wqflask/wqflask/templates/mapping_results.html
index baf2b1ec..373bae1e 100644
--- a/wqflask/wqflask/templates/mapping_results.html
+++ b/wqflask/wqflask/templates/mapping_results.html
@@ -214,7 +214,7 @@
<button class="btn btn-default" id="add" disabled><span class="glyphicon glyphicon-plus-sign"></span> Add</button>
<br />
<br />
- <div id="table_container" style="width:{% if 'additive' in trimmed_markers[0] %}500{% else %}470{% endif %}px;">
+ <div id="table_container" style="width:{% if 'additive' in trimmed_markers[0] %}480{% else %}450{% endif %}px;">
<table id="trait_table" class="table-hover table-striped cell-border dataTable no-footer">
<thead>
<tr>