aboutsummaryrefslogtreecommitdiff
path: root/wqflask
diff options
context:
space:
mode:
authorzsloan2021-06-21 14:11:32 -0500
committerGitHub2021-06-21 14:11:32 -0500
commit795fcd0c1b5eedbd910dd11f6e990fc43cf9f093 (patch)
treea8b5871e6eb8c8e558475fde23694a5ddb9a3b48 /wqflask
parentaefd88a9950592fb8cdc28cda43a2ca3c39e7f60 (diff)
parent116f911561dc81565dc0f77c12e901c0d53de4e5 (diff)
downloadgenenetwork2-795fcd0c1b5eedbd910dd11f6e990fc43cf9f093.tar.gz
Merge pull request #588 from zsloan/feature/add_scroller_to_mapping_results
Feature/add scroller to mapping results
Diffstat (limited to 'wqflask')
-rw-r--r--wqflask/wqflask/marker_regression/run_mapping.py6
-rw-r--r--wqflask/wqflask/templates/mapping_results.html15
2 files changed, 11 insertions, 10 deletions
diff --git a/wqflask/wqflask/marker_regression/run_mapping.py b/wqflask/wqflask/marker_regression/run_mapping.py
index c5b980a7..f601201b 100644
--- a/wqflask/wqflask/marker_regression/run_mapping.py
+++ b/wqflask/wqflask/marker_regression/run_mapping.py
@@ -673,9 +673,9 @@ def trim_markers_for_table(markers):
sorted_markers = sorted(
markers, key=lambda k: k['lrs_value'], reverse=True)
- # ZS: So we end up with a list of just 2000 markers
- if len(sorted_markers) >= 2000:
- trimmed_sorted_markers = sorted_markers[:2000]
+ #ZS: So we end up with a list of just 2000 markers
+ if len(sorted_markers) >= 10000:
+ trimmed_sorted_markers = sorted_markers[:10000]
return trimmed_sorted_markers
else:
return sorted_markers
diff --git a/wqflask/wqflask/templates/mapping_results.html b/wqflask/wqflask/templates/mapping_results.html
index d6fc6e37..35d8a157 100644
--- a/wqflask/wqflask/templates/mapping_results.html
+++ b/wqflask/wqflask/templates/mapping_results.html
@@ -357,7 +357,9 @@
{% endif %}
<script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTables/js/jquery.dataTables.min.js') }}"></script>
- <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/buttons/js/dataTables.buttons.min.js') }}"></script>
+ <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/buttons/js/dataTables.buttons.min.js') }}"></script>
+ <script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/scroller/js/dataTables.scroller.min.js') }}"></script>
+
<script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/plugins/sorting/scientific.js') }}"></script>
<script language="javascript" type="text/javascript" src="{{ url_for('js', filename='DataTablesExtensions/plugins/sorting/natural.js') }}"></script>
<script language="javascript" type="text/javascript" src="{{ url_for('js', filename='purescript-genome-browser/js/purescript-genetics-browser.js') }}"></script>
@@ -409,13 +411,12 @@
"info": "Showing from _START_ to _END_ of " + js_data.total_markers + " records",
},
"order": [[1, "asc" ]],
- "sDom": "iRZtir",
- "iDisplayLength": -1,
- "autoWidth": false,
- "deferRender": true,
+ "sDom": "itir",
+ "autoWidth": true,
"bSortClasses": false,
- "scrollCollapse": false,
- "paging": false
+ "scrollY": "100vh",
+ "scroller": true,
+ "scrollCollapse": true
} );
{% elif selectedChr != -1 and plotScale =="physic" and (dataset.group.species == 'mouse' or dataset.group.species == 'rat') %}
$('#trait_table').dataTable( {