aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-08-27Added logic that creates a user account if an e-mail is added to a group...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 zsloan
2020-08-27Added function for sending an invitation e-mail...* wqflask/wqflask/user_login.py - Added send_invitation_email function, which does what it says zsloan
2020-08-27Added manager_user.html because it was missing from gitzsloan
2020-08-25Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2020-08-25Fixed issue in DatasetType that caused an error when trying to load new...datasets * wqflask/base/data_set.py - Added fetchone() to g.db.execute() which is what was causing the error zsloan
2020-08-25Merge pull request #427 from BonfaceKilz/Build/add-scientific-js-datatables-p......Build/add scientific js datatables pluginzsloan
2020-08-26Add check for "scientific.js" dataTables extension plugin...* test/requests/link_checker.py (check_packaged_file): Add it. BonfaceKilz
2020-08-25This should fix an issue where the new qtlreaper wouldn't work properlty...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) zsloan
2020-08-25Merge pull request #425 from BonfaceKilz/refactor/extract-htmlgen-methods-to-......Refactor/extract htmlgen methods to wrapper classzsloan
2020-08-25Use scientific.js dataTables extension plugin from guixBonfaceKilz
2020-08-25Merge pull request #426 from BonfaceKilz/Build/use-naturaljs-datatables-exten......Build/use naturaljs datatables extensionszsloan
2020-08-24Add check for "natural.js" in Mechanical Rob...* test/requests/link_checker.py (check_packaged_file): Add it. BonfaceKilz
2020-08-24Use natural.js dataTables extension plugin from guixBonfaceKilz
2020-08-24Remove non-keyword args...* wqflask/wqflask/marker_regression/display_mapping_results.py (HtmlGenWrapper)[create_image_tag]: Remove "src" and "alt" as function parameters. BonfaceKilz
2020-08-24Replace "HtmlGen" method calls with those from "HtmlGenWrapper"...* wqflask/wqflask/marker_regression/display_mapping_results.py (DisplayMappingResults): Replace direct calls to HtmlGen with methods from the constructed wrapper class "HtmlGenWrapper". BonfaceKilz
2020-08-24Add new wrapper class for HtmlGen method...* wqflask/wqflask/marker_regression/display_mapping_results.py: Add new class BonfaceKilz
2020-08-24Add tests for the HtmlGenWrapper class...* wqflask/tests/wqflask/marker_regression/test_display_mapping_results.py: Add new tests BonfaceKilz
2020-08-24Fix some pylint errors...* wqflask/wqflask/marker_regression/display_mapping_results.py: Remove unused imports and add fix some pylint errors BonfaceKilz
2020-08-24Remove unused imports...* 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. BonfaceKilz
2020-08-24Rename file...* wqflask/tests/wqflask/marker_regression/test_display_mapping_results.py: Rename test_display_marking_results.py to test_display_mapping_results.py BonfaceKilz
2020-08-24Fix failing test...* wqflask/tests/wqflask/api/test_gen_menu.py: Update assertion. Result data introduced in 092212df Signed-off-by: BonfaceKilz <bonfacemunyoki@gmail.com> BonfaceKilz
2020-08-24Fixed issue where im_drawer wasn't being set in drawHaplotypeBand...* wqflask/wqflask/marker_regression/display_mapping_results.py - defined im_drawer in drawHaplotypeBand to fix errror and removed an unused import zsloan
2020-08-24The function draw_rotated_text_ was writing an image to /tmp, which GN2...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 zsloan
2020-08-22Set min-width for search result table, since the description column...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 zsloan
2020-08-20Changed Molecular Trait Datasets to Molecular Traits in the Type...drop-down on the home page * wqflask/wqflask/api_gen_menu.py - Changed where Molecular Trait Datasets was hardcoded to Molecular Traits zsloan
2020-08-20Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2020-08-20Merge pull request #423 from BonfaceKilz/build/use-datatable-extensions-from-......Build/use datatable extensions from guixzsloan
2020-08-20Check the availability of datatables extension files from guix...* test/requests/link_checker.py (check_packaged_js_files): Add it. * test/requests/test-website.py: Use above method. BonfaceKilz
2020-08-20Use dataTables.colResize.js and naturalSort from guixBonfaceKilz
2020-08-20Use buttons.colVis.min.js from guixBonfaceKilz
2020-08-20Use buttons.bootstrap.css from guixBonfaceKilz
2020-08-20Use scroller.dataTables.min.css from guixBonfaceKilz
2020-08-20Use dataTables.colReorder.js from guixBonfaceKilz
2020-08-20Use jquery.dataTables.js from guixBonfaceKilz
2020-08-20Use dataTables.buttons.min.js from guixBonfaceKilz
2020-08-20Use buttons.dataTables.min.css from guixBonfaceKilz
2020-08-19Added Invert button to collection page...* wqflask/wqflask/templates/collections/view.html - Added the Invert button back to the collection page; it was removed in the past but Rob decided it should be re-added zsloan
2020-08-19Tools used from the collection page now use all traits if no rows are...checked and there are fewer than 100 traits in the table * wqflask/wqflask/static/new/javascript/search_results.js - Created get_traits_from_table function to get the list of traits and check if none are selected, and also renamed the previous function also called get_traits_from_table to submit_traits_to_export_or_bnw since that better describes what the function does zsloan
2020-08-19Show short labels by default in Correlation Matrix...* wqflask/wqflask/templates/correlation_matrix.html - remove display: none for short label div zsloan
2020-08-17Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2020-08-17Merge pull request #417 from BonfaceKilz/feature/pil-pillow-conversion...Resolve merge conflicts from Pil Pillow conversion branchzsloan
2020-08-18Fix positioning for many instances of text in the mapping figure...* wqflask/wqflask/marker_regression/display_mapping_results.py: Many text instances had their positions changed by the switch from piddle to PIL. Change various Y offsets and in some cases changing the logic of the way text is positioned related to its length and font size. * wqflask/wqflask/static/fonts/verdanab.ttf: Add bold Verdana, since there needs to be a separate font file for bold text. zsloan
2020-08-17Placed X/Y trait info before the table on the correlation scatterplot...page * wqflask/wqflask/templates/corr_scatterplot.html - reordered table and X/Y trait info divs zsloan
2020-08-10Add fonts for pillow...* wqflask/wqflask/marker_regression/display_mapping_results.py: replace piddle method with PIL.ImageFont * wqflask/wqflask/static/fonts: Add fonts in path Pjotr Prins
2020-08-08Add a basic test for test_display_marking_results.py...* wqflask/tests/wqflask/marker_regression/__init__.py: Add it * wqflask/tests/wqflask/marker_regression/test_display_marking_results.py: Check that PIL colors are being used instead of the deprecated Piddle colors. BonfaceKilz
2020-08-08Change Y Coodinate system...* wqflask/wqflask/marker_regression/display_mapping_results.py: Piddle seemed to centre text about the given Y coordinate, while Pillow requires specification to top-left corner of the text. This slight change means text all over the image is displaced somewhat, and this fixes the coordinate system for some of the text. Muriithi Frederick Muriuki
2020-08-08Fix placement for axes labels...* wqflask/wqflask/marker_regression/display_mapping_results.py: Fix the placement for the axes labels. Muriithi Frederick Muriuki
2020-08-08Use TEXT_Y_DISPLACEMENT instead of magic numbers...* wqflask/wqflask/marker_regression/display_mapping_results.py: Use TEXT_Y_DISPLACEMENT instead of magic numbers to help with making it clear that the drawn text is displaced somewhat. Muriithi Frederick Muriuki
2020-08-08Give rectangles black outlines...* wqflask/wqflask/marker_regression/display_mapping_results.py: Give the rectangles black outlines to correspond to earlier drawings. Muriithi Frederick Muriuki
2020-08-08Use new `draw_open_polygon()` utility...* wqflask/wqflask/marker_regression/display_mapping_results.py: Use the new `draw_open_polygon()` utility to draw open polygons. Muriithi Frederick Muriuki