Age | Commit message (Collapse) | Author |
|
|
|
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
|
|
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
|
|
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
|
|
|
|
* 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)
|
|
* 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
|
|
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
|
|
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
|
|
places N/As at the bottom regardless of search direction
* wqflask/wqflask/static/new/javascript/search_results.js - created
"natural-minus-na" sort
|
|
* 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>
|
|
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
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
Use d3-tip from guix
|
|
* wqflask/wqflask/templates/new_security/not_authenticated.html -
Changed "this" to "these" since "data" is plural
|
|
|
|
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).
|
|
|
|
* wqflask/wqflask/templates/correlation_matrix.html: Fetch chroma from guix
profile
|
|
BonfaceKilz/chore/delete-datatables-extensions-from-guix
Delete dataTables and it's extensions from git
|
|
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
|
|
the collection page (the filename wasn't being set)
* wqflask/wqflask/views.py - Set filename to "collection_(datetime)" in
export_traits_csv because it wasn't being set before
|
|
* wqflask/wqflask/static/new/packages/DataTables/: Delete folder.
|
|
that isn't already associated with a GN2 account and sends the user an
e-mail; still need to test
* wqflask/wqflask/group_manager.py - Added logic sending an invitation
e-mail if user_details aren't found for any of the e-mails provided when
adding users to a group
|
|
* wqflask/wqflask/user_login.py - Added send_invitation_email function,
which does what it says
|
|
|
|
|
|
datasets
* wqflask/base/data_set.py - Added fetchone() to g.db.execute() which is
what was causing the error
|
|
BonfaceKilz/Build/add-scientific-js-datatables-plugin
Build/add scientific js datatables plugin
|
|
with genotypes that only have cM positions
* wqflask/wqflask/marker_regression/qtlreaper_mapping.py -
parse_reaper_output is changed to check if cM and Mb exist in output
when creating marker obs
* wqflask/wqflask/marker_regression/run_mapping.py - Changed
export_mapping_results to properly deal with all combinations of cM and
Mb positions (both and either/or)
|
|
BonfaceKilz/refactor/extract-htmlgen-methods-to-wrapper-class
Refactor/extract htmlgen methods to wrapper class
|
|
|
|
|
|
* wqflask/wqflask/marker_regression/display_mapping_results.py
(HtmlGenWrapper)[create_image_tag]: Remove "src" and "alt" as function
parameters.
|
|
* wqflask/wqflask/marker_regression/display_mapping_results.py
(DisplayMappingResults): Replace direct calls to HtmlGen with methods from
the constructed wrapper class "HtmlGenWrapper".
|
|
* wqflask/wqflask/marker_regression/display_mapping_results.py: Add new class
|
|
* wqflask/tests/wqflask/marker_regression/test_display_mapping_results.py: Add
new tests
|
|
* wqflask/wqflask/marker_regression/display_mapping_results.py: Remove unused
imports and add fix some pylint errors
|
|
* wqflask/utility/Plot.py: Remove unused imports like "numarray". "numarray" is
does not have py3 support so it's important to remove references to it.
|
|
* wqflask/tests/wqflask/marker_regression/test_display_mapping_results.py:
Rename test_display_marking_results.py to test_display_mapping_results.py
|
|
* wqflask/tests/wqflask/api/test_gen_menu.py: Update assertion. Result data
introduced in 092212df
Signed-off-by: BonfaceKilz <bonfacemunyoki@gmail.com>
|
|
* wqflask/wqflask/marker_regression/display_mapping_results.py - defined
im_drawer in drawHaplotypeBand to fix errror and removed an unused
import
|
|
user apparently doesn't have access to, so I replaced it with a link to
the dynamically set TEMPDIR
* wqflask/utility/pillow_utils.py - Replaced "/tmp/" in image location
with TEMPDIR
|
|
often looks weird if it gets below a certain width
* wqflask/wqflask/templates/search_result_page.html - Set min-width of
table container div to 1500px since that seems to be a reasonable width
that prevents the description column from getting too narrow
|
|
drop-down on the home page
* wqflask/wqflask/api_gen_menu.py - Changed where Molecular Trait
Datasets was hardcoded to Molecular Traits
|