aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-04-30autopep8: Fix E20-E27BonfaceKilz
Run: python -m autopep8 --in-place --recrusive ./ --select\ E20,E211,E22,E224,E224,E225,E226,E227,E228,E231,E241,\ E242,E251,E252,E26,E265,E266,E27 -p 3
2021-04-29I think the import of collect.py got removed with recent changes, so I'm ↵zsloan
adding it back
2021-04-29Merge pull request #569 from zsloan/bug/network_graph_fixeszsloan
Bug/network graph fixes
2021-04-29Merge branch 'testing' into bug/network_graph_fixeszsloan
2021-04-29Fix corr_scatter_plot url to include method - without method it was throwing ↵zsloan
an error
2021-04-29Don't draw edges between a trait and itselfzsloan
2021-04-29Changed the way sample data is fetched for network graph to include parents/f1szsloan
2021-04-29Merge pull request #566 from BonfaceKilz/Feature/Add-upload-data-formsBonfaceKilz
Chore/Cosmetic-changes
2021-04-29Merge branch 'testing' into Feature/Add-upload-data-formsBonfaceKilz
2021-04-29Run `sed -i 's/(object)//g'`BonfaceKilz
See: https://is.gd/pL7IJF Ran: find . \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i 's/(object)//g'
2021-04-29base: trait: Remove unused functionBonfaceKilz
* wqflask/base/trait.py (jsonable_table_row): Delete it.
2021-04-29base: data_set: Remove unused methodBonfaceKilz
* wqflask/base/data_set.py (Dataset.get_accession_id): Delete it.
2021-04-29base: data_set: Apply pep-8BonfaceKilz
2021-04-29base: data_set: Remove unused methodBonfaceKilz
* wqflask/base/data_set.py (riset): Delete class method.
2021-04-29base: data_set: Rewrite data_set using @dataclassBonfaceKilz
@dataclasses should be used to hold only data. Since dataset only encapsulates data, re-writing it using a dataclass makes it more readable and easier to follow.
2021-04-29tests: test_data_set: Update testBonfaceKilz
2021-04-29tests: unit: test_data_set: Remove unused mockBonfaceKilz
2021-04-29wqflask: show_trait: Autopep-8 bufferBonfaceKilz
2021-04-29wqflask: show_trait: Remove unused imports.BonfaceKilz
* wqflask/wqflask/show_trait/show_trait.py: Delete unused imports.
2021-04-29wqflask: Add new js file for processing menu entriesBonfaceKilz
* wqflask/wqflask/static/new/javascript/dataset_select_menu_edit_trait.js: New file. Copy of dataset_select_menu_orig.js that will later modified... * wqflask/wqflask/templates/edit_trait.html: Use :point_up:.
2021-04-29templates: edit_trait.html: Trim form to only contain selection menuBonfaceKilz
2021-04-29templates: edit_trait.html: Add extra fields for the formBonfaceKilz
Add form elements for selecting group, type, and dataset. This mimics the home page.
2021-04-29templates: edit_trait.html: Add comment headersBonfaceKilz
The comment headers mark different sections.
2021-04-29wqflask: views: Add new function for selecting a datasetBonfaceKilz
* wqflask/wqflask/views.py(edit_trait_page): New function.
2021-04-29templates: edit_trait.html: New fileBonfaceKilz
Copy of submit_trait.html. This is a copy; that'll form the basis of the new edit page.
2021-04-29wqflask: views: Replace dict de-structuring with kw argumentsBonfaceKilz
* wqflask/wqflask/views.py (submit_trait_form): Use kw arguments when passing variables to the template. This is more readable.
2021-04-28Merge pull request #568 from zsloan/bug/fix_gemma_temptrait_covariateszsloan
Fix the way temp traits are displayed when selecting covariates from a collection
2021-04-28Added something to jsonable in trait.py to account for temp traits (this is ↵zsloan
necessary for them to show up correctly when selecting traits from collections in pop-up windows, like when selecting cofactors for mapping)
2021-04-28Merge pull request #567 from zsloan/bug/fix_gemma_temptrait_covariateszsloan
Account for temp traits when adding covariates with GEMMA mapping
2021-04-28Account for temp traits when adding covariates with GEMMA mappingzsloan
2021-04-28wqflask: views: Delete stale commentsBonfaceKilz
2021-04-28wqflask: views: Apply pep-8BonfaceKilz
2021-04-28Use right block level commentsBonfaceKilz
2021-04-28Remove stale commentsBonfaceKilz
2021-04-28Remove local variables that are unusedBonfaceKilz
2021-04-28wqflask: views: Remove news importBonfaceKilz
This name clashes with "def news" which is defined later.
2021-04-28wqflask: views.py: Clean up imports sectionBonfaceKilz
Remove unused imports and break up long imports into shorter lines.
2021-04-27Convert to array and transpose R/qtl scanone results when not using ↵zsloan
cofactors. For some reason the rows/columns are inverted when converted to a python object when doing scanone with cofactors vs without cofactors
2021-04-27Randomized cross object filename, since I think it throws an error if the ↵zsloan
same file is being written to simultaneously (or being written to while it's being read)
2021-04-27Stopped using the scanone function pointer when doing R/qtl mapping, since ↵zsloan
the results are not converted into a Python object in a way that preserves marker names (which is important because pseudomarkers can be added) Instead the marker names are extracted from the scanone results using R immediately after they're generated, and then passed to process_rqtl_results
2021-04-27templates: submit_trait.html: Add field for inputting trait nameBonfaceKilz
2021-04-23Remove stale commentsBonfaceKilz
2021-04-23Apply PEP-8BonfaceKilz
2021-04-23Rewrite For Loop in a more Pythonic wayBonfaceKilz
2021-04-23Rename index_page_orig to index_pageBonfaceKilz
2021-04-23Add full link to genetic data collected as part of WebQTL projectBonfaceKilz
2021-04-23Move looped sql query into one statement in "get_species_groups"BonfaceKilz
It's in-efficient to have a sql query executed in a loop. As data grows, the query becomes slower. It's better to let sql handle such queries.
2021-04-23Remove stale commentsBonfaceKilz
2021-04-22Account for situations where the trait symbol is null for ProbeSet traits; ↵zsloan
previously it could throw an error
2021-04-22Added JS that sets the 'add to collection' dropdown to default to the ↵zsloan
collection the use set as their default collection