aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base
AgeCommit message (Collapse)Author
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-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-23Remove stale commentsBonfaceKilz
2021-04-19Removed unused codezsloan
2021-03-17Added the RRID urls for mouse and rat to webqtlConfigzsloan
2021-03-03Checked if pre_publication_description is NULL, because there was an error ↵zsloan
resulting from a trait missing both pre_publication_description and pubmed ID
2021-02-18Changed DEFAULT_PERMISSIONS AND SUPER_PERMISSIONS to not have permissions be ↵zsloan
lists (I think the proxy expects them to not be lists, but then returns them as lists; need to check about this)
2021-02-18Fixed missing colonzsloan
2021-02-18Fixed checking permissions in trait.pyzsloan
2021-02-18Fixed SUPER_PRIVILEGES and DEFAULT_PRIVILEGESzsloan
2021-02-11Removed some log statementszsloan
2021-02-11Ensure trait description_display is setzsloan
2020-12-07Changed the logic in create_trait so that permissions should always be set, ↵zsloan
and added an assert that 'name' is passed instead of using if/else, since it should always be passed
2020-12-01Merge pull request #482 from zsloan/feature/corr_table_changeszsloan
Feature/corr table changes
2020-11-18Fixed issue where the cofactor trait descriptions didn't work correctlyzsloan
for genotype/snp cofactors (the code previously only accounted for probeset/phenotype cofactors, so it was treating genotypes/snps like phenotype traits)
2020-11-18Fixed issue that was causing scatterplot cofactors to not work if thezsloan
cofactors were genotypes (because it tried to get the "description_display" which doesn't exist for genotype traits)
2020-11-11Switched checking if a trait is confidential to checking if it has a pubmed ↵zsloan
ID for the purposes of showing pre-publication abbreviation/description
2020-11-03Changed the syntax for the "sort" function in the docstring of GeneralObject ↵zsloan
to be compatible with Python 3 syntax * wqflask/base/GeneralObject.py - edited docstring to be correct for Python 3
2020-10-27Get the "first_attr_start_pos" from a samplelist instead of from each ↵zsloan
individual sample, because it was previously causing problems when only some samples had an N * wqflask/base/webqtlCaseData.py - Removed code getting first_attr_start_pos * wqflask/wqflask/show_trait/SampleList.py - Added code getting first_attr_start_pos and assigning it to all samples + removing one unnecessary sort * wqflask/wqflask/static/new/javascript/initialize_show_trait_tables.js - Fixed issue that was causing the N column to not be displayed
2020-10-20Merge branch 'testing' into build/python3-migrationBonfaceKilz
2020-10-19Merge branch 'testing' into scroller_testingzsloan
2020-10-12Merge branch 'testing' into build/python3-migrationBonfaceKilz
2020-10-09Merge pull request #458 from BonfaceKilz/tests/add-extra-tests-for-collectionsBonfaceKilz
Tests/add extra tests for collections
2020-10-09Apply PEP 8 to bufferBonfaceKilz
* wqflask/wqflask/wgcna/wgcna_analysis.py: Apply pep8 * wqflask/wqflask/collect.py: Ditto * wqflask/base/trait.py: Ditto
2020-10-08Fixed remaining issue that applies to all dataset typeszsloan
* wqflask/base/data_set.py - Fixed issue where there was an error when trying to take the len of the query results when there were no results
2020-10-08Fixed issue where new phenotype groups wouldn't be saved to the ↵zsloan
self.datasets property because the group name was used as the key (instead of the group name + "Publish", which is the full dataset name for phenotypes) * wqflask/base/data_set.py - Set "group_name" as a separate variable from "name" to avoid it being used as the key in self.datasets
2020-10-02Ignore utf-8 encoding errorsBonfaceKilz
* wqflask/base/trait.py (retrieve_trait_info): Add extra param to ignore errors such as: "utf-8 codec can't decode byte 0xb5 in position 0: invalid start byte" thrown in Python3.
2020-10-01Convert trait attributes to utf-8 strings if they were bytesBonfaceKilz
2020-09-30Removed unused code from TempDataSet classzsloan
* wqflask/base/data_set.py - TempDataSet class contained some code referring to the SQL DB, but temp traits aren't stored in the SQL DB anymore
2020-09-28Merge branch 'build/python3-migration' of ↵BonfaceKilz
github.com:BonfaceKilz/genenetwork2 into build/python3-migration
2020-09-28Fix casting errorBonfaceKilz
* wqflask/base/trait.py (retrieve_trait_info): If the description_string or discription_display value return a None object, evaluate to an empty string. Fixes errors related to *len(None)*.
2020-09-28Merge branch 'testing' into build/python3-migrationBonfaceKilz
2020-09-28Fix casting errorBonfaceKilz
* wqflask/base/trait.py (retrieve_trait_info): If the description_string or discription_display value return a None object, evaluate to an empty string. Fixes errors related to *len(None)*.
2020-09-28Convert None to "" in if statementBonfaceKilz
* wqflask/base/trait.py: Fixes error parsing error: "(GeneNetwork error: float argument required, not NoneType)"
2020-09-18Made a bunch of changes to move trait page DataTables initialization tozsloan
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
2020-09-17Convert "target_string" to a str typeBonfaceKilz
* wqflask/base/trait.py (retrieve_trait_info): Convert "target_string" to a str, otherwise an exception will be thrown if it's None.
2020-09-17Apply pep8BonfaceKilz
* wqflask/base/trait.py: Apply pep8. * wqflask/utility/authentication_tools.py: Ditto.
2020-08-28Merge branch 'testing' into build/python3-migrationBonfaceKilz
2020-08-27Remove python2 string processing to utf-8BonfaceKilz
* wqflask/base/trait.py: Remove python2 codecs.BOM_UTF8 methods. * wqflask/wqflask/search_results.py: Remove utf-8 decode method on string.
2020-08-27Replace mysqldb's "escape" with the one from utils.db_toolsBonfaceKilz
Mysqldb's escape returns a binary string. Use utils.db_tools which adds an extra step of converting the binary string to a string.
2020-08-27Remove redundant methods which are defined elsewhereBonfaceKilz
* wqflask/base/data_set.py: Delete "create_in_clause", and "mescape" which are defined in "utility.db_tools"
2020-08-27Remove unused importsBonfaceKilz
2020-08-27Replace "string.split" & "string.join" with python's inbuilt methodsBonfaceKilz
2020-08-26Remove "from __future__ import new_feature" statementsBonfaceKilz
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-future>
generated by cgit v1.2.3 (git 2.44.0) at 2024-11-23 04:02:01 +0000