aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base
AgeCommit message (Collapse)Author
2013-11-25Got the interval mapping results into a tableZachary Sloan
2013-11-01Merge /home/sam/geneZachary Sloan
2013-10-30More work on collectionsSam
2013-10-25Began working on color coding bar chart by extra attributesZachary Sloan
2013-10-15Changed templates to call the header macroZachary Sloan
Correlation page now works with Non-BXD (or whatever group) or All Samples options
2013-10-11Merge /home/lei/geneZachary Sloan
Conflicts: wqflask/maintenance/quick_search_table.py
2013-10-10Almost have correlation working for non-primary strain/groupLei Yan
There's just some issue with parents/f1s not being included if you select non-BXD (or whatever the group is). All Samples, however does work.
2013-10-09Improved some of the code related to the correlation pageLei Yan
For example, changed the two functions getting gene symbols and ids for a dataset into one function that can take a column name as a parameter
2013-10-08Literature correlation works when it is selected as the sortedLei Yan
correlation type (that is, when it is run again all traits in a database) Added a function to data_set.py that gets all the gene_ids in the data set. Not sure if having a separate function for getting the gene_ids and another for getting the gene symbols makes sense.
2013-10-08Did some work with interval mapping page; will use qtl reaper to doZachary Sloan
the mapping, since it is reliable/fast and avoids us having to rewrite from scratch using something like r/qtl
2013-09-27Added trait links to correlation resultsLei Yan
Began adding the code that does the initial sort by literature correlation
2013-09-24Did some work towards doing the tissue correlation for all traitsroot
in a dataset (in order to sort by tissue correlation instead of sample correlation).
2013-09-24Fixed the db_tools import in mrna_assay_tissue_data.pyZachary Sloan
Added file for the interval mapping page and wrote code that gets/sets some parameters
2013-09-20Tissue correlation results work for sample r/rho correlation pageLei Yan
and are written to the template
2013-09-13Merge https://github.com/zsloan/genenetworkLei Yan
Resolved conflicts: wqflask/base/trait.py wqflask/wqflask/correlation/correlationFunction.py wqflask/wqflask/correlation/correlation_function.py wqflask/wqflask/correlation/correlation_functions.py wqflask/wqflask/correlation/show_corr_results.py
2013-08-21Just removed a couple print statementsZachary Sloan
2013-08-15Removed the markers with no variance (and thus no p-values) from theZachary Sloan
manhattan plot
2013-08-13Added several test files and the file with the class thatZachary Sloan
they import (browser_test.py)
2013-08-07Fixed things with the dataset dropdowns and mRNA datasetsZachary Sloan
Improved the templates for a couple pages related to changing user password, etc
2013-08-02Fixed a bug related to groups with genofiles (not sure if it makes senseZachary Sloan
for them not to have genofiles yet)
2013-07-30Just added some print statements to debug an issue with LMM codeZachary Sloan
Also added some to notes
2013-07-23Fixed a couple issues with he quick_search_table.py scriptZachary Sloan
Added notes on using percona to optimise mysql to gn_installation_notes.txt Started moving "get_trait_data" to DataSet since it is the same regardless of the particular DataSet subclass (PhenotypeDataSet, MrnaAssayDataSet, etc)
2013-07-19Finished integrating code that reads sample list from geno filesZachary Sloan
withouot using reaper and caches results so it doesn't need to read the file every single time someone loads a page
2013-07-19Created file gen_group_samplelists that iterates through all genofilesZachary Sloan
and builds each groups' samplelist
2013-07-18Added Amelie's rat data genotypesZachary Sloan
Got human mapping mostly working Fixed dataset dropdown menus
2013-07-18Merge branch 'master' of https://github.com/zsloan/genenetworkZachary Sloan
Conflicts: wqflask/base/webqtlConfigLocal.py wqflask/maintenance/gen_select_dataset.py wqflask/wqflask/static/new/javascript/dataset_menu_structure.json
2013-07-18Added to installation notesZachary Sloan
Removed webqtlConfigLocal file containing passwords Updated main page dropdown menus (dataset_menu_structure.json)
2013-07-17Fixed gen_select_dataset.pyZachary Sloan
Appended redis installation info to notes
2013-07-16Wrote code that can get a dataset's type for every single GNZachary Sloan
dataset; previously we could not view traits in datasets that were not in the DBType table in the database
2013-07-12Rewrote code related to getting the tissue correlation column to displayLei Yan
Created new files for mrna assay tissue data and commonly used db query related functions
2013-07-03Merge /home/zas1024/geneLei Yan
2013-06-27Created a group manager page where user administrators can createZachary Sloan
groups of datasets to give/add read privileges to
2013-06-26Moved code creating DataSets object to a function in dataset.pyZachary Sloan
Added caching to creating DataSets object
2013-06-26Got code that creates DataSets object runningZachary Sloan
Fixed one genofile that had extra quotation marks in the comments that caused an error Defaults mb_graph_interval to 1 for species without chromosome lengths in megabases
2013-06-25Added DataSets class to dataset.py that will be used to create list ofZachary Sloan
confidential datasets
2013-06-25Merge git://github.com/zsloan/genenetwork into flaskLei Yan
2013-06-21Fixed bug where cursor was still being used in queryZachary Sloan
2013-06-20Merge branch 'flask' of git://github.com/leiyan/GeneNetwork2-Python into flaskZachary Sloan
Conflicts: wqflask/requirements.txt wqflask/wqflask/correlation/show_corr_results.py
2013-06-19Moved the normalize_values function to separate file corr_result_helpers.pyLei Yan
Added docstring test to normalize_values Number of overlapping samples column now displays correctly in the correlation results page
2013-06-19Fixed issue where the Mean Expr, Max LRS, and Max LRS Location columnsLei Yan
in the correlation page weren't displaying
2013-06-19Merge branch 'flask' of git://github.com/zsloan/genenetwork into flaskLei Yan
Conflicts: wqflask/base/data_set.py
2013-06-19Changed QTL parameter name to "get_qtl_info" on trait.py andLei Yan
other places it's called, like search_results.py Added other trait info fields to correlation results page
2013-06-19Merge branch 'flask' of git://github.com/leiyan/GeneNetwork2-Python into flaskZachary Sloan
Conflicts: wqflask/base/data_set.py wqflask/wqflask/views.py Fixed a couple conflicts to merge Lei's code related to the correlation page
2013-06-13Merge /home/sam/gene into flaskZachary Sloan
Conflicts: wqflask/wqflask/templates/index_page.html Merging the code on Sam's branch onto my own
2013-06-13Fixed issue where too much memory was used as a result of creating aLei Yan
dataset object for each trait in the correlation results Added new fields/columns for each trait in the correlation result table (max LRS, max LRS location, mean expression) Fixed error if trait doesn't have these fields
2013-06-12Fixed a couple issues with the template that caused theZachary Sloan
regular search results and show trait page to not display
2013-06-11Put trait info for correlation results page into a dictionary insteadLei Yan
of storing list of GeneralTrait objects Added print statements to track memory usage
2013-05-31Fixed the location column for the quick search pageZachary Sloan
Began writing some jquery to automatically open the first tab within each species tab on the quick search page (not done yet)
2013-05-30Rewrote some code in get_trait_info in dataset.pyLei Yan
Added spearman correlation to show_corr_results and template
2013-05-28Have correlation values appearing in a table in the templateLei Yan
Use scipy to calculate pearson correlation instead of old GN code