aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzsloan2020-12-08 13:19:50 -0600
committerzsloan2020-12-08 13:19:50 -0600
commit61b0f112e75c22ff34aebcfa3f9361f575133b60 (patch)
tree7f2998cf9e6e0ff93b054ffbde9140955d0fe581
parent9b9205c93fccfd6aa8c7a58dc8befdb9ba3eb871 (diff)
downloadgenenetwork2-61b0f112e75c22ff34aebcfa3f9361f575133b60.tar.gz
Show the total number of markers in the mapping results table instead of just the trimmed number
-rw-r--r--wqflask/wqflask/marker_regression/run_mapping.py8
-rw-r--r--wqflask/wqflask/templates/mapping_results.html5
2 files changed, 10 insertions, 3 deletions
diff --git a/wqflask/wqflask/marker_regression/run_mapping.py b/wqflask/wqflask/marker_regression/run_mapping.py
index c474e0e0..891fcc66 100644
--- a/wqflask/wqflask/marker_regression/run_mapping.py
+++ b/wqflask/wqflask/marker_regression/run_mapping.py
@@ -426,6 +426,8 @@ class RunMapping(object):
marker['display_pos'] = "N/A"
self.qtl_results.append(marker)
+ total_markers = len(self.qtl_results)
+
with Bench("Exporting Results"):
export_mapping_results(self.dataset, self.this_trait, self.qtl_results, self.mapping_results_path, self.mapping_scale, self.score_type)
@@ -489,13 +491,15 @@ class RunMapping(object):
perm_results = self.perm_output,
significant = significant_for_browser,
browser_files = browser_files,
- selected_chr = this_chr
+ selected_chr = this_chr,
+ total_markers = total_markers
)
else:
self.js_data = dict(
chr_lengths = chr_lengths,
browser_files = browser_files,
- selected_chr = this_chr
+ selected_chr = this_chr,
+ total_markers = total_markers
)
def run_rqtl_plink(self):
diff --git a/wqflask/wqflask/templates/mapping_results.html b/wqflask/wqflask/templates/mapping_results.html
index 9542c29d..1130bcce 100644
--- a/wqflask/wqflask/templates/mapping_results.html
+++ b/wqflask/wqflask/templates/mapping_results.html
@@ -388,8 +388,11 @@
"targets": 0,
"orderable": false
} ],
+ "language": {
+ "info": "Showing1 from _START_ to _END_ of " + js_data.total_markers + " records",
+ },
"order": [[1, "asc" ]],
- "sDom": "RZtir",
+ "sDom": "iRZtir",
"iDisplayLength": -1,
"autoWidth": false,
"deferRender": true,