aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-10-05Changed the way tranform functions work...* wqflask/wqflask/static/new/javascript/show_trait.js - Changed transform options to only apply to original values, with the exception of the "invert" transform and rows where the value was set to "x" - Only run "check_if_zero_to_one_vals" once on page load instead of running it every time a transform is run - Changed Transform text to reflect when there's a combination of Invert and some other transform - Updated Reset function to use DataTables API zsloan
2020-10-05Simplified if statements...* wqflask/wqflask/static/new/javascript/initialize_show_trait_tables.js - simplified if statements to just say if(js_data.se_exists) instead of if(js_data.se_exists === true) zsloan
2020-10-05Changed order of JS imports to both make DataTables objects available to all ......* wqflask/wqflask/templates/show_trait.html - Changed order of JS imports zsloan
2020-10-05Added square root to the transform functions that are only active if there ar......* wqflask/wqflask/templates/show_trait_transform_and_filter.html - made sqrt option contingent on no negative values zsloan
2020-10-05Fixed issue that was causing SE column to not show up in the trait page table...* wqflask/wqflask/static/new/javascript/initialize_show_trait_tables.js - Apparently "true" in js_data was a boolean instead of a string, so the previous if statements weren't working properly zsloan
2020-10-02Converted transform functions to use DataTables API to work with scroller + f......* wqflask/wqflask/static/new/javascript/show_trait.js - Changed transform/normalize functions to use DataTables API to fetch and change values and also changed the way that code is structured to avoid a lot of duplicated code zsloan
2020-10-02Added function that pulls input data out of table and inserts it as hidden in......* wqflask/wqflask/static/new/javascript/show_trait.js - Added function "get_table_contents_for_form_submit" that is called with submit_special (that is called for correlations and mapping from the trait page) zsloan
2020-10-02There were two copies of the "submit_special" function in both show_trait.js ......* wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js - Everything in this file was previously inside its own function, which made its functions unable to access the functions from show_trait.js (and necessitated it having its own "copy" of the submit_special function zsloan
2020-09-25Fixed issue where attribute columns' alignment was offset by 1...* wqflask/wqflask/static/new/javascript/initialize_show_trait_tables.js - attribute cells' alignment and column names were wrong because they were referring to an attribute offset by 1 in the attribute list - zsloan
2020-09-25Changed edit_data_change and block_by_index to use DataTables API...* wqflask/wqflask/static/new/javascript/show_trait.js - Changed edit_data_change to use DataTables API to fetch the list of names, values, and (where applicable) standard errors in a way that just looks at those columns (previously it iterated through all rows). block_by_index was also changed to look just at columns zsloan
2020-09-24Changed logic that defines the primary/other samplelists to be much more...efficient * wqflask/wqflask/show_trait/show_trait.py - Add an "if" statement to avoid unnecessarily running some code and changed a list to a set for the purposes of searching if it contains an element zsloan
2020-09-22Changed JS on trait page that updates basic stats and graphs/figures to...use the DataTables API to pull sample values * wqflask/wqflask/static/new/javascript/show_trait.js - Changed the way sample name/val/var are pulled from the table to instead use DataTables' API + removed an unused event listener * wqflask/wqflask/static/new/javascript/initialize_show_trait_tables.js - added "var" before a defined variable for consistency zsloan
2020-09-18Made some style changes with whitespace/line-breakszsloan
2020-09-18Made a bunch of changes to move trait page DataTables initialization to...a separate file (initialize_show_trait_tables.js). The biggest complication was getting the order of attributes in the rows to sync with the order of atribute namees in the column headers. Previously this logic was all in the template. * wqflask/base/webqtlCaseData.py - added attribute first_attr_col as a very awkward solution to passing the column position into the column render function in situations where there are case attribute columns (which can be variable in number) * wqflask/wqflask/show_trait/show_trait.py - Replace "attribute_names" in js_data with "attributes" (which allows the JS access to more information) and also pass new se_exists and has_num_cases variables with js_data, so the javascript has access to whether or not those columns exist in the table * wqflask/wqflask/static/new/javascript/show_trait.js - Change case attribute-related logic to use js_data.attributes instead of js_data.attribute_names * wqflask/wqflask/templates/show_trait.html - Removed table initialization from template * wqflask/wqflask/static/new/javascript/initialize_show_trait_tables.js - new file that initializes tables and reproduces what the template logic used to do with JS logic zsloan
2020-09-16Changed references to se_exists to just get it as a property of...SampleList instead of calling the method * wqflask/wqflask/show_trait/show_trait.py - see above * wqflask/wqflask/templates/show_trait.html - see above + removed some commented out code zsloan
2020-09-16Changed se_exists to a property so the SampleList instance can include...that when converted to a dict (which is needed to use it in the javascript) * wqflask/wqflask/show_trait/SampleList.py - Directly set se_exists as a property of SampleList instead of requiring a method be called; I could have set self.se_exists by calling the se_exists method, but that would have resulted in the convoluted line "self.se_exists = self.se_exists()" and the se_exists method only consisted of one line anyways zsloan
2020-09-16Applied PEP8 and removed commented out codezsloan
2020-09-15Added scroller to trait page and changed sample tables to use it...* wqflask/wqflask/templates/show_trait.html - Imported scroller (from the Google cdn temporarily for testing) and activated it for the sample tables, as well as disabled options that conflicted with it (like paging: false) zsloan
2020-09-08Changed the Add button color for all the different pages that use it...* wqflask/wqflask/templates/collections/view.html - changed Add button color * wqflask/wqflask/templates/correlation_matrix.html - changed Add button color * wqflask/wqflask/templates/correlation_page.html - changed Add button color * wqflask/wqflask/templates/mapping_results.html - changed Add button color * wqflask/wqflask/templates/search_result_page.html - changed Add button color zsloan
2020-09-08Search code now checks if there are more than 50,000 results before...running the code that queries the DB for max LRS locus information (which is what takes the most time to run) and sets a variable that indicates to the template (search_results.html) that it shouldn't show the results * wqflask/wqflask/search_results.py - Check number of results from base query in order to prevent certain searches from running too long zsloan
2020-09-08Changed regular and global search results table to use the new sort...method that always places NAs at bottom, changed the Add to Collection button's color, and added something to the regular search page template to display alternative text if there are more than 50000 results * wqflask/wqflask/templates/gsearch_gene.html - Added natural-minus-na sort to certain columns and changed Add button color * wqflask/wqflask/templates/gsearch_pheno.html - Added natural-minus-na sort to certain columns and changed Add button color * wqflask/wqflask/templates/search_result_page.html - Added natural-minus-na sort to certain columns, changed Add button color, and added template logic that shows alternative text if there are more than 50,000 results zsloan
2020-09-08Added a sort function (derived from the natural sort import) that always...places N/As at the bottom regardless of search direction * wqflask/wqflask/static/new/javascript/search_results.js - created "natural-minus-na" sort zsloan
2020-09-04Merge pull request #437 from BonfaceKilz/fix/use-correct-path-give-a-path-loc......Fix/use correct path give a path locationBonfaceKilz
2020-09-04Update how static js/ css files are fetched...* wqflask/wqflask/views.p:(css, js) Add "css" router decorator. Also, if "js_alt" is in path, fetch the file from "GUIX_PROFILE/share/javascript" instead of the default directory: "GUIX_PROFILE/share/genenetwork2/javascript" See: <https://github.com/genenetwork/genenetwork2/issues/436> BonfaceKilz
2020-09-04Fix false positive tests...* test/requests/link_checker.py: (verify_static_file): Add it. Verify that a static link is fetched by checking for the message "Error: 404 not Found" in page. (check_package_js_files): Add appropriate 'js' or 'css' prefix. BonfaceKilz
2020-09-01There was a missing quote in one of the javascript imports added by the...PR changing them to get fetched from GUIX; I need to check and see if there are other situations like this * wqflask/wqflask/templates/mapping_results.html - Added missing quote zsloan
2020-09-01Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2020-09-01Fixed indent issue that could cause error when showing the haplotype...analyst in the mapping chromosome view * wqflask/wqflask/marker_regression/display_mapping_results.py - Indented a bit of code that was wrongly indented in such a way that the variable "ind" wasn't set if "plotbxd" is 0 zsloan
2020-09-01Merge pull request #434 from BonfaceKilz/Build/use-md5-js-from-guix...Build/use md5 js from guixBonfaceKilz
2020-09-01Add check for "md5.min.js" library...* test/requests/link_checker.py: Add it. BonfaceKilz
2020-09-01Use "md5.min.js" from guixBonfaceKilz
2020-09-01Merge pull request #433 from BonfaceKilz/Build/remove-cdns...Build/remove cdnsBonfaceKilz
2020-09-01Check availability of several js and css files...* test/requests/link_checker.py: Check availability of: chroma.min.js; d3-tip.js; d3.min.js; underscore.min.js; nv.d3.min.css; and jquery.qtip.min.js BonfaceKilz
2020-09-01Remove commented out script tags that references CDNsBonfaceKilz
2020-09-01Replace CDNs with packages from guixBonfaceKilz
2020-09-01Merge pull request #432 from BonfaceKilz/Fix/add-missing-apostrophe...Add missing apostrophe in url_for argsBonfaceKilz
2020-09-01Add missing apostrophe in url_for argsBonfaceKilz
2020-08-31Merge pull request #431 from BonfaceKilz/Build/add-d3-tip...Use d3-tip from guixBonfaceKilz
2020-08-31Fixed text on not_authenticated to use proper grammar...* wqflask/wqflask/templates/new_security/not_authenticated.html - Changed "this" to "these" since "data" is plural zsloan
2020-08-31Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2020-08-31Fixed issue that was causing updating resource default privileges to not...work * wqflask/utility/redis_tools.py - There was an issue where resources wouldn't be updated if they already existed. This is because the code didn't yet account for the "update" tag (that is meant to give the option of preventing updating resources when running the script to enter all resources into Redis). I changed the logic to add a resource if "update" is True or the resource doesn't already exist (so it won't if update is False and the resource exists). zsloan
2020-08-31Add check for "d3-tip.js" js library...* test/requests/link_checker.py (check_packaged_js_files): Add it. BonfaceKilz
2020-08-31Merge pull request #429 from BonfaceKilz/chore/add-gh-templates...Add github templates for filing bugs, user stories/ features and PRsBonfaceKilz
2020-08-31Use d3-tip from guixBonfaceKilz
2020-08-31Merge pull request #430 from BonfaceKilz/Build/add-chroma-js...Build/add chroma jsBonfaceKilz
2020-08-31Add github templates for filing bugs, user stories/ features and PRs...* .github/ISSUE_TEMPLATE/bug_report.md : Add template for filing bug reports. * .github/ISSUE_TEMPLATE/feature_request.md: Add template for filing a feature. * .github/ISSUE_TEMPLATE/user_story.md: Add a template for creating a user story for a feature. * .github/PULL_REQUEST_TEMPLATE.md: Add a template for filing a PR. BonfaceKilz
2020-08-31Add check for "chroma.js" dataTables extension plugin...* test/requests/link_checker.py (check_packaged_js_files): Add it. BonfaceKilz
2020-08-31Use chroma from guix...* wqflask/wqflask/templates/correlation_matrix.html: Fetch chroma from guix profile BonfaceKilz
2020-08-31Merge pull request #428 from BonfaceKilz/chore/delete-datatables-extensions-f......Delete dataTables and it's extensions from gitBonfaceKilz
2020-08-29Fixed issue where exporting traits would throw an error if a dataset's...group didn't have an InbredSetCode set in the DB * wqflask/utility/authentication_tools.py - Changed get_group_code to return an empty string instead of None if InbredSetCode doesn't exist for a dataset group * wqflask/wqflask/views.py - Changed zipped export filename to "export_(datetime)" instead of "collection_(datetime)" since this export can occur from both the collection page and the global search page zsloan