From a7316acfe9110ee8b7c1482d3eae613aa5d75d1a Mon Sep 17 00:00:00 2001 From: zsloan Date: Mon, 28 Sep 2020 13:37:35 -0500 Subject: Changed add to collection to open the collection in a new tab/page so the results on the initial page aren't lost * wqflask/wqflask/static/new/javascript/search_results.js - Changed the add to collection method name to "add_to_collection" because it was previously "add" which is a terrible method name * wqflask/wqflask/templates/collections/add.html - Added target="_blank" to the add to collection form so it will open in a new tab/window --- wqflask/wqflask/static/new/javascript/search_results.js | 4 ++-- wqflask/wqflask/templates/collections/add.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wqflask/wqflask/static/new/javascript/search_results.js b/wqflask/wqflask/static/new/javascript/search_results.js index 685d6291..61134a88 100644 --- a/wqflask/wqflask/static/new/javascript/search_results.js +++ b/wqflask/wqflask/static/new/javascript/search_results.js @@ -93,7 +93,7 @@ $(function() { }); - add = function() { + add_to_collection = function() { var traits; traits = $("#trait_table input:checked").map(function() { return $(this).val(); @@ -250,7 +250,7 @@ $(function() { $("#select_all").click(select_all); $("#deselect_all").click(deselect_all); $("#invert").click(invert); - $("#add").click(add); + $("#add").click(add_to_collection); $("#submit_bnw").click(submit_bnw); $("#export_traits").click(export_traits); $('.trait_checkbox, .btn').click(change_buttons); diff --git a/wqflask/wqflask/templates/collections/add.html b/wqflask/wqflask/templates/collections/add.html index 825dfb84..62b6abb5 100644 --- a/wqflask/wqflask/templates/collections/add.html +++ b/wqflask/wqflask/templates/collections/add.html @@ -5,7 +5,7 @@ or add to an existing collection.

-
+ {% if traits is defined %} {% else %} -- cgit v1.2.3 From 5ec0a7b0aa543203ade7920389fdf922865f59a0 Mon Sep 17 00:00:00 2001 From: zsloan Date: Tue, 29 Sep 2020 13:46:10 -0500 Subject: Changed the DataTables column sort arrows to a different color by changing the image they're referencing * wqflask/wqflask/templates/base.html - Added CSS changing the table sort arrow image directly into base.html because it requires using url_for to reference the images in the GUIX profile (so it needs to be in the template and can't just be added to a CSS file) --- wqflask/wqflask/templates/base.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/wqflask/wqflask/templates/base.html b/wqflask/wqflask/templates/base.html index e6802cc4..b44538cf 100644 --- a/wqflask/wqflask/templates/base.html +++ b/wqflask/wqflask/templates/base.html @@ -21,6 +21,14 @@ {% block css %} {% endblock %} + -- cgit v1.2.3 From 12a350c1185978602eaa91025c5ea5e7dd7bfbff Mon Sep 17 00:00:00 2001 From: zsloan Date: Tue, 29 Sep 2020 13:50:01 -0500 Subject: Changed Add (to collection) button color to match other Add buttons and changed the text for the GN1 link button * wqflask/wqflask/templates/show_trait_details.html - Changed Add button class to btn-success (to make it green like the other Add buttons) and changed text from "View in GN1" to "Go to GN1" --- wqflask/wqflask/templates/show_trait_details.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wqflask/wqflask/templates/show_trait_details.html b/wqflask/wqflask/templates/show_trait_details.html index 8b3e4907..2284ca99 100644 --- a/wqflask/wqflask/templates/show_trait_details.html +++ b/wqflask/wqflask/templates/show_trait_details.html @@ -216,7 +216,7 @@
- + {% if this_trait.dataset.type == 'ProbeSet' or this_trait.dataset.type == 'Geno' %} {% if this_trait.symbol != None %} @@ -246,7 +246,7 @@ {% endif %} {% endif %} - + {% if admin_status == "owner" or admin_status == "edit-admins" or admin_status == "edit-access" %} -- cgit v1.2.3 From 2637872ed32be6223eb464a76370a4e38850b5cd Mon Sep 17 00:00:00 2001 From: zsloan Date: Tue, 29 Sep 2020 14:42:33 -0500 Subject: Fixed issue where negative additive effect values weren't being displayed in the "view collection" page * wqflask/wqflask/templates/collections/view.html - Apparently the correct way to check if a value can be cast to a float in Jinja2 is to say "value != 0"; it previous said "value > 0" which exlcuded all negative values --- wqflask/wqflask/templates/collections/view.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wqflask/wqflask/templates/collections/view.html b/wqflask/wqflask/templates/collections/view.html index dce814dd..13d45d62 100644 --- a/wqflask/wqflask/templates/collections/view.html +++ b/wqflask/wqflask/templates/collections/view.html @@ -144,7 +144,7 @@ N/A {% endif %} {{ this_trait.LRS_location_repr }} - {% if this_trait.additive|float > 0 %} + {% if this_trait.additive|float != 0 %} {{ '%0.3f' % this_trait.additive|float }} {% else %} N/A -- cgit v1.2.3 From 1320283cb1374365777dbe61e9c4ec6d42cba40d Mon Sep 17 00:00:00 2001 From: zsloan Date: Tue, 29 Sep 2020 16:10:07 -0500 Subject: Made a variety of changes to table pages * wqflask/wqflask/static/new/css/show_trait.css - Adding position relative and a 2px offset for glyphicons to make them better align with button text * wqflask/wqflask/templates/collections/view.html - Added glyphicon to Download button, changed a couple head names (Peak Location and Effect Size), made Location and Peak Location columns the same width, and made the "?" glossary links a little larger and red * wqflask/wqflask/templates/search_result_page.html - same as above * wqflask/wqflask/templates/show_trait_edit_data.html - Added glyphicon to Export button --- wqflask/wqflask/static/new/css/show_trait.css | 5 +++++ wqflask/wqflask/templates/collections/view.html | 10 ++++------ wqflask/wqflask/templates/search_result_page.html | 20 ++++++++++---------- wqflask/wqflask/templates/show_trait_edit_data.html | 2 +- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/wqflask/wqflask/static/new/css/show_trait.css b/wqflask/wqflask/static/new/css/show_trait.css index 338302af..92deab20 100644 --- a/wqflask/wqflask/static/new/css/show_trait.css +++ b/wqflask/wqflask/static/new/css/show_trait.css @@ -46,4 +46,9 @@ table.dataTable.cell-border tbody th, table.dataTable.cell-border tbody td { table.dataTable.cell-border tbody tr th:first-child, table.dataTable.cell-border tbody tr td:first-child { border-left: 1px solid #ccc; +} + +.glyphicon { + position: relative; + top: 2px; } \ No newline at end of file diff --git a/wqflask/wqflask/templates/collections/view.html b/wqflask/wqflask/templates/collections/view.html index 13d45d62..ca8aece3 100644 --- a/wqflask/wqflask/templates/collections/view.html +++ b/wqflask/wqflask/templates/collections/view.html @@ -16,8 +16,6 @@

This collection has {{ '{}'.format(numify(trait_obs|count, "record", "records")) }}

- -
@@ -77,7 +75,7 @@ - + @@ -99,9 +97,9 @@ Description Location Mean - Max LRS ? - Max LRS Location - Additive Effect ? + Max LRS ? + Peak Location + Effect Size ? diff --git a/wqflask/wqflask/templates/search_result_page.html b/wqflask/wqflask/templates/search_result_page.html index 282e752d..487c6980 100644 --- a/wqflask/wqflask/templates/search_result_page.html +++ b/wqflask/wqflask/templates/search_result_page.html @@ -127,7 +127,7 @@ - + @@ -315,20 +315,20 @@ 'orderSequence': [ "desc", "asc"] }, { - 'title': "Max LRS?", + 'title': "Max LRS ?", 'type': "natural-minus-na", 'data': "lrs_score", 'width': "80px", 'orderSequence': [ "desc", "asc"] }, { - 'title': "Max LRS Location", + 'title': "Peak Location", 'type': "natural-minus-na", - 'width': "150px", + 'width': "120px", 'data': "lrs_location" }, { - 'title': "Additive Effect?", + 'title': "Effect Size ?", 'type': "natural-minus-na", 'data': "additive", 'width': "120px", @@ -390,20 +390,20 @@ 'orderSequence': [ "desc", "asc"] }, { - 'title': "Max LRS?", + 'title': "Max LRS ?", 'type': "natural-minus-na", 'data': "lrs_score", 'width': "80px", 'orderSequence': [ "desc", "asc"] }, { - 'title': "Max LRS Location", + 'title': "Peak Location", 'type': "natural-minus-na", - 'width': "150px", + 'width': "120px", 'data': "lrs_location" }, { - 'title': "Additive Effect?", + 'title': "Effect Size ?", 'type': "natural-minus-na", 'width': "120px", 'data': "additive", @@ -412,7 +412,7 @@ { 'title': "Location", 'type': "natural-minus-na", - 'width': "140px", + 'width': "120px", 'data': "location" }{% endif %} ], diff --git a/wqflask/wqflask/templates/show_trait_edit_data.html b/wqflask/wqflask/templates/show_trait_edit_data.html index 05a2be73..a8ed91b1 100644 --- a/wqflask/wqflask/templates/show_trait_edit_data.html +++ b/wqflask/wqflask/templates/show_trait_edit_data.html @@ -5,7 +5,7 @@
- +