aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base/data_set.py
AgeCommit message (Collapse)Author
2017-02-09Fixed issue where I forgot to add GeneticType to the query_for_group query ↵zsloan
for non-mRNA Assay datasets Increased digits of some Basic Statistics values from 2 to 3
2017-02-09Added genetic_type to DatasetGroup object to differentiate between which ↵zsloan
groups should show dominance effect Minor changes/improvements for trait page Updated dataset_menu_structure.json
2017-02-06Merge branch 'master' of github.com:zsloan/genenetwork2zsloan
2017-02-06Fixed appearance of several tables (search, mapping results, sample data)zsloan
Temporarily removed second sample table for CFW traits Fixed location of global search bar to work with wider screens
2017-01-26Merge pull request #1 from genenetwork/testingzsloan
Various changes/fixes
2017-01-26GEMMA now works with CFW data (had to update where it looks for the input ↵zsloan
files and how it writes the phenotype file) Y-axis for GEMMA now says -log(p) Updated the style of the trait sample data table in the trait page Updated dataset_select_menu_orig.js to also build just the Species and Group drop-downs for the trait input page (as opposed to all 4 drop-downs) Updated dataset menu json file Added option to show and hide columns to regular search page using colVis Changed regular and global search result table styles/column widths Began work on user trait submission code (not working yet though) Began work on static loading page for mapping results
2016-12-15Merge pull request #234 from zsloan/masterzsloan
Various changes
2016-11-18Fix sql error: (GeneNetwork error: (_mysql_exceptions.OperationalError) ↵Lei Yan
(1054, "Unknown column 'mouse' in 'where clause'") [SQL: '\n select Geno)
2016-11-02Merge branch 'testing' of github.com:genenetwork/genenetwork2 into developmentzsloan
2016-11-02Added Scroller functionality to regular (but not global) search, which ↵zsloan
increases table load speed In order to implement Scroller (and make table look nicer), all rows are the same height and excess description/authors text is shown in a tooltip Increased table width for non-Geno DBs Fixed issue where Genotype traits did not fetch their location_repr (text for displaying location), causing that column to be blank in searches Fixed issue causing Correlation Matrix cells to not be colored corresponding with their correlation and also increased cell font a little Fixed issue where dataset link in the Correlation Page did not correctly point to corresponding GN1 page
2016-10-29For those case that we have multiple genotypes we would like to add a selector.Lei Yan
2016-10-06Logger: add more granular debug messagesPjotr Prins
2016-10-05Show datasets only on debugPjotr Prins
2016-09-13Run scripts from ./wqflask - just like the webserverPjotr Prins
2016-09-10Support for running maintenance scripts so they can pick up all webserver ↵Pjotr Prins
settings Run with ./bin/genenetwork2 ~/my_settings.py -c ./wqflask/maintenance/gen_select_dataset.py
2016-07-27Problem with phenotype traits should be fixed nowzsloan
2016-06-26gn_server: simplifyPjotr Prins
2016-06-26gn_server: simplifyPjotr Prins
2016-06-26gn_server: introduced one new query to fetch a dataset record and force ↵Pjotr Prins
fetch1 to return a tuple
2016-06-24Log: and document SQL callsPjotr Prins
2016-06-23Logger: SQLPjotr Prins
2016-06-23Log: SQL queriesPjotr Prins
2016-06-23Add fetchall iteratorPjotr Prins
2016-06-23Removed dependency on dataset_menu_structure.jsonPjotr Prins
2016-06-23Backend: moved methods into call modulePjotr Prins
2016-06-23Refactored dir name dbFunction to dbPjotr Prins
2016-06-18Logger: replacing print statementsPjotr Prins
2016-05-23Reaper mapping results are now correct and account for samples with two ↵zsloan
names (like BXD65a) R/qtl and PYLMM still not working with the change and bootstrap results are also still wrong, so need to fix those issues.
2016-04-29MergePjotr Prins
2016-04-28Added option to export permutation results for mapping pagezsloan
Added data_scale to dataset objects and basic stats table will now check data scale when calculating range Made interval analyst results table work with datatables Changed the appearance of the basic stats table some by giving it a border
2016-04-20-aPjotr Prins
[PATCH 039/100] Removing commented code
2016-04-20-aPjotr Prins
[PATCH 038/100] Fix compile errors
2016-04-20[PATCH 037/100] WebQtlConfig: sanitizing naming and used varsPjotr Prins
2016-04-20[PATCH 033/100] Refactored file searchingPjotr Prins
2016-04-20[PATCH 032/100] file locating: error checking is built-inPjotr Prins
2016-04-20[PATCH 024/100] Sanitizing file handlingPjotr Prins
2016-04-20[PATCH 023/100] WIP fixing all pathsPjotr Prins
2016-03-18Replaced header with other information in qtl mapzsloan
Began adding menu to qtl map Fixed global search to not retrieve samples (to increase speed) Got the vector plot working again so it can be displayed alongside the gn1-style plot Only display the vector plot when doing GEMMA to speed up (this might not be necessary)
2016-03-15Fixed the mapping figure track that lets you zoom into a smaller rangezsloan
Fixed the third party mapping figure tracks to refer to the correct chromosome (before it was always 1)
2016-03-02Increased gsearch speed by removing unnecessary query for sample datazsloan
Still slower than preferable due to having to query the gn1 database for every trait in the search results
2016-02-04Most importantly, this commit fixes an issue that caused the trait page to ↵zsloan
not work because of the new dataset_menu_structure.json file An Intro section is also added to the header, though for the time being its contents aren't populated and the edit option isn't working
2015-11-09Fixed issue that caused mapping to not work; for some reason the path to ↵zsloan
pylmm was wrong
2015-10-12Changed the location filter for correlation pagezsloan
2015-09-11Comment out some excessive stdout spamDannyArends
2015-09-10Fixed "TypeError: float argument required, not NoneType" about mean.Lei Yan
Committer: Lei Yan <lei@penguin.uthsc.edu> On branch master
2015-08-26Fixed issue with colums for the gene global search (still need to change for ↵zsloan
phenotype) Fixed issue where LRS and LOD are sometimes labeled incorrectly Changed the header of the trait page Added link to GN1 in header Fixxed an issue that made permutations not work with pylmm Fixed "sign in" button when creating a collection while not logged in
2015-07-20Fixed the code that generates the dataset selection drop-down for correlationszsloan
Made changes to the tables of correlation results, collections, and search results: - Added resizeable columns to correlation results and collections, but not to search results because it seems that it requires Y scrolling to be set (I'll check if it makes sense to add scrolling to the search results) - Correlation results and collections are now in scrolling tables - The style is the same across all of these tables now Remaining issues: - It doesn't seem like I can set the column width when initializing dataTables in correlation results. I don't know why this is; it might be due to the table already being the size of a full page. I want to be able to default to some good widths, even if the user can resize them - I tried adding hoverForMore, but it doesn't seem to cooperate with datatable cells; I think this is due to having to put the text in a div.
2015-07-10Fixed the genofile_parser.py script since some .geno files had been ↵zsloan
incorrectly converted to json Fixed GO search to work with combined searches
2015-07-09Mapping methods now check for existing genotype files.zsloan
Currently we still usually get our samplelists from the genofile. This is dumb because it results in us having a bunch of "dummy" genofiles for certain data sets (seems to be mostly human ones). This means that checking for the genofile alone isn't enough to determine if a mapping method should exist for a given group I wrote some code that will instead get the samplelist from the plink .fam file for some of these groups/datasets (if the .fam file exists). Ideally I would like to remove all of the dummy .geno files, but we can't yet do so because it's currently the only place we seem to be storing the sample list for some groups. I also moved gemma into the plink directory to get it out of the git tree. Since it uses the same files as plink, it doesn't make sense for it to be in its own separate directory
2015-07-07Added index column and changed the way location is displayed for search resultszsloan