aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-06Merge branch 'testing' of github.com:genenetwork/genenetwork2 into ↵Frederick Muriuki Muriithi
clustered_heatmaps
2021-10-06Enable selection of heatmap orientationFrederick Muriuki Muriithi
Issue: https://github.com/genenetwork/gn-gemtext-threads/blob/main/topics/gn1-migration-to-gn2/non-clustered-heatmaps-and-flipping.gmi * Provide the user with the UI elements to enable them select the orientation of the heatmap that will be produced.
2021-10-06doc: docker-container.org: Remove python2 gn2 docker set-up commandBonfaceKilz
2021-10-06tests: test_run_mapping: Add missing "name" attribute to testsBonfaceKilz
2021-10-06tests: test_run_mapping: Add missing callsBonfaceKilz
After adding the missing attribute to "self.trait", we need to also need to update some missing calls.
2021-10-06tests: test_run_mapping: Fix failing assert when getting perm strataBonfaceKilz
2021-10-06tests: test_run_mapping: Add missing attribute to "self.trait"BonfaceKilz
2021-10-06tests: test_run_mapping: Add missing positional argument "vals_hash"BonfaceKilz
2021-10-04Moved REDIS_CONN back into if __name__ == '__main__' since it doesn't need ↵zsloan
to be globally accessed anymore (I think I intiially moved it because I was calling it in create_group_data, but that ended up being unnecessary
2021-10-04Changed the group.py script to replace user e-mails with IDs and to include ↵zsloan
id, name, changed_timestamp, and created_timestamp in group details
2021-10-04Changed get_user_groups to pull both the ID and details in the for loop from ↵zsloan
group_list by using group_list.items()
2021-10-04Add group link for user member groupszsloan
2021-10-04scripts: group.py: Modify exit message when displaying updated dataBonfaceKilz
2021-10-04scripts: group.py: Remove "glom" dependencyBonfaceKilz
2021-10-04Decode redis response by defaultBonfaceKilz
2021-10-04Modify resource editing script to enable data backups & restorationBonfaceKilz
2021-10-04wqflask: resource_manager: Remove loggerBonfaceKilz
2021-10-04Add script that adds "editors" group to all resources in RedisBonfaceKilz
2021-10-04Add script for creating/ updating groups during authorisationBonfaceKilz
2021-10-04Remove "_scripts.html" and all it's referencesBonfaceKilz
2021-10-04new_security: login_user.html: Delete commented out blockBonfaceKilz
2021-10-04Replace hard-coded e-mails with gn-proxy queriesBonfaceKilz
* wqflask/wqflask/decorators.py (edit_access_required.wrap): Query the proxy to see the access rights of a given user.
2021-10-04Rename "admin_login_required" to "edit_access_required"BonfaceKilz
2021-09-27Apply pep-8 formattingBonfaceKilz
2021-09-27Remove variable-- named after a python keyword-- called "list"BonfaceKilz
2021-09-27Remove lengthy stack trace for 404, 400, 408 status codesBonfaceKilz
The stack trace causes the log file to grow into unmanageable sizes over time.
2021-09-25Add progress indicator. Handle errors.Frederick Muriuki Muriithi
Issue: https://github.com/genenetwork/gn-gemtext-threads/blob/main/topics/gn1-migration-to-gn2/clustering.gmi * Add a progress indicator to show the user that there is some progress happening, so that they can wait. Add a function to handle any errors that arise.
2021-09-25Remove hard-coded URL; use configured URLFrederick Muriuki Muriithi
Issue: https://github.com/genenetwork/gn-gemtext-threads/blob/main/topics/gn1-migration-to-gn2/clustering.gmi * etc/default_settings.py: remove duplicate configuration variable * wqflask/wqflask/collect.py: use the configured url for the API server Use the configured URL rather that the hard-coded URL that was used for testing out the clustered heatmap generation.
2021-09-23Clear any existing image on subsequent clicksFrederick Muriuki Muriithi
Issue: https://github.com/genenetwork/gn-gemtext-threads/blob/main/topics/gn1-migration-to-gn2/clustering.gmi * If the user clicks on the "Clustered Heatmap" button, the system should remove any previously existing clustered heatmap image and replace it with the new image.
2021-09-23Move the heatmap display area to before the tableFrederick Muriuki Muriithi
Issue: https://github.com/genenetwork/gn-gemtext-threads/blob/main/topics/gn1-migration-to-gn2/clustering.gmi * Move the heatmap area to before the data table, so that once the heatmap is generated, it shows up before the table, and the user is able to see what happened.
2021-09-22Removed the Control for (marker) option from R/qtl for now since Danny ↵zsloan
mentioned it isn't working correctly
2021-09-22Fixed issue where the control marker parameter was being passed incorrectly ↵zsloan
to GN3 (should be just 'control' but was previously passed as 'control_marker')
2021-09-22Only show most search page options if results exist; otherwise provide a ↵zsloan
link back to the home page
2021-09-22Added type='button' to the Delete Collection button within collections/view, ↵zsloan
since without it it attempts to submit the form encapsulating the button (export in this case)
2021-09-22Remove references to reaper_version and code for running old qtlreaperzsloan
2021-09-22Cleanup codeFrederick Muriuki Muriithi
Issue: https://github.com/genenetwork/gn-gemtext-threads/blob/main/topics/gn1-migration-to-gn2/clustering.gmi * Remove unnecessary console.log(...) statements that were used in development * Re-arrange the html elements * Rename element id
2021-09-22Test heatmap creation from serialized figureFrederick Muriuki Muriithi
Issue: https://github.com/genenetwork/gn-gemtext-threads/blob/main/topics/gn1-migration-to-gn2/clustering.gmi * Attempt using the figure, serialized as JSON, to display the clustered heatmap.
2021-09-20Returned the GN1 url to gn1.genenetwork.org since it's apparently working ↵zsloan
well enough again now that some issues have been fixed
2021-09-20Removed the reaper_version selection option, since original qtlreaper is no ↵zsloan
longer supported
2021-09-20Added back the option to edit privileges on trait pages, since the metadata ↵zsloan
edit button had replaced it
2021-09-20Prevent the default submit actionFrederick Muriuki Muriithi
Issue: https://github.com/genenetwork/gn-gemtext-threads/blob/main/topics/gn1-migration-to-gn2/clustering.gmi * Prevent the default submit action.
2021-09-20Fix id used.Frederick Muriuki Muriithi
2021-09-20Move "Clustered Heatmap" button to separate formFrederick Muriuki Muriithi
Issue: https://github.com/genenetwork/gn-gemtext-threads/blob/main/topics/gn1-migration-to-gn2/clustering.gmi * Move the button out of the "export_form" into a new "heatmaps_form" to avoid some weird JS interaction that showed up.
2021-09-20Implement proof-of-concept code to submit dataFrederick Muriuki Muriithi
Issue: https://github.com/genenetwork/gn-gemtext-threads/blob/main/topics/gn1-migration-to-gn2/clustering.gmi * Implement some javascript to activate the "Clustered Heatmap" button. This commit provides a proof-of-concept implementation to help with identifying the requirements for sending and receiving of the heatmaps data.
2021-09-20Provide UI elements for clustered heatmap generationFrederick Muriuki Muriithi
Issue: https://github.com/genenetwork/gn-gemtext-threads/blob/main/topics/gn1-migration-to-gn2/clustering.gmi * wqflask/wqflask/collect.py: provide hard-coded URL for testing * wqflask/wqflask/templates/collections/view.html: provide button Provide a button to trigger the heatmap generation. As a test, we also provide a hard-coded URL for the API endpoint to get the heatmap data.
2021-09-16wqflask: views: Redirect to the correct URL after phenotype updateBonfaceKilz
2021-09-14Replace / with _ in the mapping results filename, due to / causing issues ↵zsloan
with being translated to directories
2021-09-14Replace / with _ in the file hashes in rqtl_mapping.py, since they get ↵zsloan
translated to directories
2021-09-13Change mapping export filename to use the path passed from run_mapping, ↵zsloan
instead of the generic mapping_results.csv
2021-09-13Change mapping export filename to use the trait hashzsloan