diff options
| -rw-r--r-- | wqflask/wqflask/gsearch.py | 8 | ||||
| -rw-r--r-- | wqflask/wqflask/templates/gsearch_gene.html | 4 | ||||
| -rw-r--r-- | wqflask/wqflask/templates/gsearch_pheno.html | 4 | ||||
| -rw-r--r-- | wqflask/wqflask/templates/search_result_page.html | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/wqflask/wqflask/gsearch.py b/wqflask/wqflask/gsearch.py index 6289c2b5..b2224831 100644 --- a/wqflask/wqflask/gsearch.py +++ b/wqflask/wqflask/gsearch.py @@ -99,7 +99,7 @@ class GSearch: this_trait['mean'] = "N/A" if line[11] != "" and line[11] != None: - this_trait['LRS_score_repr'] = f"{line[11]:.3f}" + this_trait['LRS_score_repr'] = f"{float(line[11]) / 4.61:.1f}" if line[14] != "" and line[14] != None: this_trait['additive'] = f"{line[14]:.3f}" if line[10] != "" and line[10] != None: @@ -147,8 +147,8 @@ class GSearch: 'Description', 'Location', 'Mean', - 'Max LRS', - 'Max LRS Location', + '-logP', + '-logP Location', 'Additive Effect'] self.header_data_names = [ @@ -241,7 +241,7 @@ class GSearch: trait_dict['mean'] = "N/A" if line[10] != "" and line[10] != None: - trait_dict['LRS_score_repr'] = f"{line[10]:.3f}" + trait_dict['LRS_score_repr'] = f"{float(line[10]) / 4.61:.1f}" # Some Max LRS values in the DB are wrongly listed as 0.000, but shouldn't be displayed if trait_dict['LRS_score_repr'] == "0.000": trait_dict['LRS_score_repr'] = "N/A" diff --git a/wqflask/wqflask/templates/gsearch_gene.html b/wqflask/wqflask/templates/gsearch_gene.html index 39c46f02..0e96f673 100644 --- a/wqflask/wqflask/templates/gsearch_gene.html +++ b/wqflask/wqflask/templates/gsearch_gene.html @@ -171,7 +171,7 @@ 'data': "mean" }, { - 'title': "Max<br>LRS<a href=\"{{ url_for('glossary_blueprint.glossary') }}#LRS\" target=\"_blank\" style=\"color: white;\"><sup>?</sup></a>", + 'title': "<div style='text-align: right; padding-right: 10px;'>Peak</div> <div style='text-align: right;'>-logP <a href=\"{{ url_for('glossary_blueprint.glossary') }}#LRS\" target=\"_blank\" style=\"color: white;\"><sup>?</sup></a></div>", 'type': "natural-minus-na", 'width': "60px", 'targets': 11, @@ -179,7 +179,7 @@ 'orderSequence': [ "desc", "asc"] }, { - 'title': "Max LRS Location", + 'title': "Peak Location", 'type': "natural-minus-na", 'width': "125px", 'targets': 12, diff --git a/wqflask/wqflask/templates/gsearch_pheno.html b/wqflask/wqflask/templates/gsearch_pheno.html index 0d18a0bf..6eb7e18a 100644 --- a/wqflask/wqflask/templates/gsearch_pheno.html +++ b/wqflask/wqflask/templates/gsearch_pheno.html @@ -165,7 +165,7 @@ 'orderSequence': [ "desc", "asc"] }, { - 'title': "Max LRS<a href=\"{{ url_for('glossary_blueprint.glossary') }}#LRS\" target=\"_blank\" style=\"color: white;\"><sup>?</sup></a>", + 'title': "<div style='text-align: right; padding-right: 10px;'>Peak</div> <div style='text-align: right;'>-logP <a href=\"{{ url_for('glossary_blueprint.glossary') }}#LRS\" target=\"_blank\" style=\"color: white;\"><sup>?</sup></a></div>", 'type': "natural-minus-na", 'data': "LRS_score_repr", 'width': "60px", @@ -173,7 +173,7 @@ 'orderSequence': [ "desc", "asc"] }, { - 'title': "Max LRS Location", + 'title': "Peak Location", 'type': "natural-minus-na", 'width': "125px", 'targets': 10, diff --git a/wqflask/wqflask/templates/search_result_page.html b/wqflask/wqflask/templates/search_result_page.html index 3b01f4a6..5bcd17b8 100644 --- a/wqflask/wqflask/templates/search_result_page.html +++ b/wqflask/wqflask/templates/search_result_page.html @@ -122,7 +122,7 @@ <button class="toggle-vis" data-column="4">Description</button> <button class="toggle-vis" data-column="5">Location</button> <button class="toggle-vis" data-column="6">Mean</button> - <button class="toggle-vis" data-column="7">Peak LOD</button> + <button class="toggle-vis" data-column="7">Peak -logP</button> <button class="toggle-vis" data-column="8">Peak Location</button> <button class="toggle-vis" data-column="9">Effect Size</button> {% elif dataset.type == 'Publish' %} @@ -130,7 +130,7 @@ <button class="toggle-vis" data-column="4">Mean</button> <button class="toggle-vis" data-column="5">Authors</button> <button class="toggle-vis" data-column="6">Year</button> - <button class="toggle-vis" data-column="7">Peak LOD</button> + <button class="toggle-vis" data-column="7">Peak -logP</button> <button class="toggle-vis" data-column="8">Peak Location</button> <button class="toggle-vis" data-column="9">Effect Size</button> {% endif %} @@ -259,7 +259,7 @@ 'orderSequence': [ "desc", "asc"] }, { - 'title': "<div style='text-align: right; padding-right: 10px;'>Peak</div> <div style='text-align: right;'>LOD <a href=\"{{ url_for('glossary_blueprint.glossary') }}#LRS\" target=\"_blank\" style=\"color: white;\"><sup style='color: #FF0000;'><i>?</i></sup></a></div>", + 'title': "<div style='text-align: right; padding-right: 10px;'>Peak</div> <div style='text-align: right;'>-logP <a href=\"{{ url_for('glossary_blueprint.glossary') }}#LRS\" target=\"_blank\" style=\"color: white;\"><sup style='color: #FF0000;'><i>?</i></sup></a></div>", 'type': "natural-minus-na", 'data': "lod_score", 'width': "60px", @@ -344,7 +344,7 @@ 'orderSequence': [ "desc", "asc"] }, { - 'title': "<div style='text-align: right; padding-right: 10px;'>Peak</div> <div style='text-align: right;'>LOD <a href=\"{{ url_for('glossary_blueprint.glossary') }}#LRS\" target=\"_blank\" style=\"color: white;\"><sup style='color: #FF0000;'><i>?</i></sup></a></div>", + 'title': "<div style='text-align: right; padding-right: 10px;'>Peak</div> <div style='text-align: right;'>-logP <a href=\"{{ url_for('glossary_blueprint.glossary') }}#LRS\" target=\"_blank\" style=\"color: white;\"><sup style='color: #FF0000;'><i>?</i></sup></a></div>", 'type': "natural-minus-na", 'data': "lod_score", 'targets': 7, |