aboutsummaryrefslogtreecommitdiff
path: root/wqflask
AgeCommit message (Collapse)Author
2020-10-20Merge branch 'testing' into move_styling_to_csszsloan
2020-10-20Added classes to replace styling in show_trait_edit_data.html to ↵zsloan
show_trait.css, replaced _ with - in class names, and changed the checkbox table cell styling to better center it * wqflask/wqflask/static/new/css/show_trait.css - Moved show_trait_edit_data.html styling to this file and changes padding for the checkbox table cell to better center it; for some reason text-align: center wasn't working and it specifically needed left-padding * wqflask/wqflask/static/new/javascript/show_trait.js - Replaced underscores with - in class names * wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js - Replaced underscores with - in class names
2020-10-20Replaced _ with - in class names (though this change will end up being ↵zsloan
unnecessary with the scroller changes that move the table initialization to a separate file) * wqflask/wqflask/templates/show_trait.html - Replaced underscores with - in class names
2020-10-20Replaced one class name with a more generic "inline-div" since there are ↵zsloan
other divs that only have the styling of being inline
2020-10-20Made class names consistently use - instead of _ in show_trait_edit_data.htmlzsloan
* wqflask/wqflask/templates/show_trait_edit_data.html - replaced underscores with -
2020-10-19Merge branch 'testing' into scroller_testingzsloan
2020-10-15Fixed issue that caused interval map setting to not work correctly for ↵zsloan
reaper mapping * wqflask/wqflask/templates/show_trait_mapping_tools.html - Mistakenly reversed true/false in the reaper Interval Map option
2020-10-15Replaced the styling in show_trait_mapping_tools.html with CSS and changed ↵zsloan
some styling to be more simple/consistent and deal better with different screen sizes * wqflask/wqflask/marker_regression/run_mapping.py - "manhattan_plot" is now passed as lower-case "true"/"false" to match the case of other boolean options * wqflask/wqflask/static/new/css/show_trait.css - Added classes for the styling in show_trait_mapping_tools.html * wqflask/wqflask/static/new/javascript/get_covariates_from_collection.js - Changed class name "selected_covariates" to "selected-covariates" to match class naming scheme * wqflask/wqflask/static/new/javascript/show_trait.js - Changed class name "selected_covariates" to "selected-covariates" to match class naming scheme * wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js - Changed class names from using underscore to useing "-" to match class naming scheme * wqflask/wqflask/templates/show_trait_mapping_tools.html - Replaced styling with class names and changed some styling to be more simple/consistent
2020-10-15Put the correlation descriptions inside of a div so that they could have ↵zsloan
their width set in the same way as other sections of the correlation/mapping options
2020-10-15Replaced styling from show_trait_transform_and_filter.html with CSSzsloan
* wqflask/wqflask/static/new/css/show_trait.css - Added styles for elements in show_trait_transform_and_filter.html * wqflask/wqflask/templates/show_trait_transform_and_filter.html - Replaced styling in template with classes
2020-10-14Removed some commented out HTMLzsloan
2020-10-14Converted show_trait_calculate_correlations.html to use CSS instead of ↵zsloan
styling in the template * wqflask/wqflask/static/new/css/show_trait.css - Added styling for elements in show_trait_calculate_correlations.html and changed a few existing class names to be more reasonable * wqflask/wqflask/templates/show_trait.html - Changed the class name for the main div * wqflask/wqflask/templates/show_trait_calculate_correlations.html - Substituted direct styling with CSS and changing some styling to make the correlation method descriptions keep a reasonable width and position * wqflask/wqflask/templates/show_trait_statistics.html - Changed some class names to be better
2020-10-14Changed a couple class names because it's probably dumb to include the ↵zsloan
pixels in the name since that might change later * wqflask/wqflask/static/new/css/show_trait.css - Changed a couple class names * wqflask/wqflask/templates/show_trait_statistics.html - Changed a couple class names
2020-10-14Moved show_trait_statistics.html styling to show_trait.css and fixed a minor ↵zsloan
issue where not all figures had "Select Group:" before the group selection drop-down * wqflask/wqflask/static/new/css/show_trait.css - Moved styling from show_trait_statistic.html here * wqflask/wqflask/templates/show_trait_statistics.html - Replaced styling with classes, removed some unnecessary/unused styling, and added some missing label text
2020-10-13Added styling from show_trait_details.html to show_trait.csszsloan
* wqflask/wqflask/static/new/css/show_trait.css - Added the bottom margin styling for the div containing the buttons * wqflask/wqflask/templates/show_trait_details.html - Removed some unnecessary styling and moved the styling for .btn_toolbar to show_trait.css
2020-10-13Changed styling in show_trait.html to use CSS insteadzsloan
* wqflask/wqflask/static/new/css/main.css - Added CSS for min-height in table cells with checkboxes, since this would apply to all tables throughout the site * wqflask/wqflask/static/new/css/show_trait.css - Added CSS for styling that was previous in show_trait.html * wqflask/wqflask/templates/show_trait.html - Replaced directly styling with classes
2020-10-13Merge branch 'testing', remote-tracking branch 'origin' into move_styling_to_csszsloan
2020-10-13Merge pull request #456 from zsloan/misc_rob_changeszsloan
Some trait page width changes
2020-10-13Added right-alignment for trait_value_input text fields in sample table to ↵zsloan
CSS file instead of setting it as a style in initialize_show_trait_tables.js
2020-10-13Merge pull request #459 from zsloan/table_width_changeszsloan
Change some column widths/headers in search and view collection pages
2020-10-09Change some column and overall table widths for search result table and view ↵zsloan
collections table + changed "Max LRS" column header to "High P" * wqflask/wqflask/templates/collections/view.html - changed column widths and "Max LRS" header to "High P" * wqflask/wqflask/templates/search_result_page.html - changed column widths and "Max LRS" header to "High P"
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-09Add test for process_traits from collections.pyBonfaceKilz
* wqflask/tests/wqflask/test_collect.py: Add it.
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-08Allowed mapping method description text to shrink with screen sizezsloan
* wqflask/wqflask/templates/show_trait_mapping_tools.html - Removed the "col-xs-_" class to allow the div containing mapping description text to shrink with screen size
2020-10-08Adjusted some widths/classes to allow correlation description text to ↵zsloan
expand/shrink with screen size and make drop-downs a better width * wqflask/wqflask/templates/show_trait_calculate_correlations.html - Adjusted widths of drop-down divs and removed the col-width class from the description div (the right side) so it can shrink wqwith screen size
2020-10-08Changed the min-width of trait page main div in order to allow trait ↵zsloan
descriptions to shrink to a smaller width (but not too small) * wqflask/wqflask/templates/show_trait.html - Changed width of main container div to 700px
2020-10-08Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2020-10-08Merge pull request #452 from zsloan/authentication_bug_fixzsloan
Checked if owner_id is "none" to avoid an error when trying to access…
2020-10-08Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testingzsloan
2020-10-08Merge pull request #455 from zsloan/temp_trait_scatterplot_fixzsloan
Temp Trait Scatterplot Error Fix
2020-10-08When generating links to correlation scatterplots (in corr results and corr ↵zsloan
matrix), append the group name to Temp dataset names so temp traits can be used in scatterplot * wqflask/wqflask/correlation/corr_scatter_plot.py - Create the dataset object using the group name included with Temp dataset names (which take the form "Temp_(group_name)") * wqflask/wqflask/templates/correlation_matrix.html - Change scatterplot links to include the group name if the dataset name is "Temp" * wqflask/wqflask/templates/correlation_page.html - Change scatterplot links to include the group name if the dataset name is "Temp" + a couple minor style changes
2020-10-06Merge pull request #454 from zsloan/update_docs_fixzsloan
Made change that should fix error when trying to change page text usi…
2020-10-06Made change that should fix error when trying to change page text using ckeditorzsloan
* wqflask/wqflask/docs.py - Changed query to include casting as binary to deal with certain unicode characters in ckeditor pages * wqflask/wqflask/views.py - Imported update_text from Docs since it previously wasn't updated, causing an error when attempting to update text
2020-10-06Merge pull request #453 from zsloan/index_page_textarea_fixzsloan
Index page dropdown/textarea fix
2020-10-06Fixed issue where drop-down arrows and textarea corners couldn't be clicked ↵zsloan
with certain window widths * wqflask/wqflask/templates/index_page_orig.html - Changed the left/right div's padding to prevent them from overlapping and changed the textareas' styles to make them only expandable vertically
2020-10-05Replaced "+" with "and" in transform textzsloan
* wqflask/wqflask/static/new/javascript/show_trait.js - Replaced "+" with "and" when Invert and another transform are combined and capitalized "Transform"
2020-10-05Changed the way tranform functions workzsloan
* wqflask/wqflask/static/new/javascript/show_trait.js - Changed transform options to only apply to original values, with the exception of the "invert" transform and rows where the value was set to "x" - Only run "check_if_zero_to_one_vals" once on page load instead of running it every time a transform is run - Changed Transform text to reflect when there's a combination of Invert and some other transform - Updated Reset function to use DataTables API
2020-10-05Simplified if statementszsloan
* wqflask/wqflask/static/new/javascript/initialize_show_trait_tables.js - simplified if statements to just say if(js_data.se_exists) instead of if(js_data.se_exists === true)
2020-10-05Changed order of JS imports to both make DataTables objects available to all ↵zsloan
other JS code and move all local JS code below third-party libraries * wqflask/wqflask/templates/show_trait.html - Changed order of JS imports
2020-10-05Added square root to the transform functions that are only active if there ↵zsloan
are no negative values * wqflask/wqflask/templates/show_trait_transform_and_filter.html - made sqrt option contingent on no negative values
2020-10-05Fixed issue that was causing SE column to not show up in the trait page tablezsloan
* wqflask/wqflask/static/new/javascript/initialize_show_trait_tables.js - Apparently "true" in js_data was a boolean instead of a string, so the previous if statements weren't working properly
2020-10-02Converted transform functions to use DataTables API to work with scroller + ↵zsloan
fixed them to take into account blocked samples * wqflask/wqflask/static/new/javascript/show_trait.js - Changed transform/normalize functions to use DataTables API to fetch and change values and also changed the way that code is structured to avoid a lot of duplicated code
2020-10-02Added function that pulls input data out of table and inserts it as hidden ↵zsloan
input elements in the form (so form submission can work with Scroller) * wqflask/wqflask/static/new/javascript/show_trait.js - Added function "get_table_contents_for_form_submit" that is called with submit_special (that is called for correlations and mapping from the trait page)
2020-10-02There were two copies of the "submit_special" function in both show_trait.js ↵zsloan
and show_trait_mapping_tools.js. The latter now just calls the function from the former * wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js - Everything in this file was previously inside its own function, which made its functions unable to access the functions from show_trait.js (and necessitated it having its own "copy" of the submit_special function
2020-10-02Checked if owner_id is "none" to avoid an error when trying to access the ↵zsloan
resource manager page with newly added datasets * wqflask/wqflask/resource_manager.py - Only get owner user info conditional on owner_id not being "none" (which it will be by default for newly added datasets). Previously it would throw an error due to "owner_info" being None
2020-10-01Merge branch 'testing' of github.com:genenetwork/genenetwork2 into ↵zsloan
corr_matrix_error_fix
2020-09-30Changed the logic for adding 0 to the PCA results to do so when thezsloan
shared samples are < 2 instead of 0; this fixed the error when running the correlation matrix, but results in the PCA traits having no values * wqflask/wqflask/correlation_matrx/show_corr_matrix.py - changed "if num_overlap == 0" to "if num_overlap < 2" because correlations can't be run if there are fewer than 2 shared samples (and previously would throw an error if there was exactly 1 shared sample)
generated by cgit v1.2.3 (git 2.44.0) at 2024-12-11 07:33:50 +0000