From e36ffce0d972334b07ee91b817fc3f30ed3598c4 Mon Sep 17 00:00:00 2001 From: zsloan Date: Wed, 18 May 2016 20:05:51 +0000 Subject: Updated dataset selection dropdown menus and fixed error caused by traits with no description --- wqflask/base/trait.py | 2 +- .../new/javascript/dataset_menu_structure.json | 187 ++++++++++++++++----- 2 files changed, 143 insertions(+), 46 deletions(-) (limited to 'wqflask') diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py index 6c5ca8b2..6b4fff20 100644 --- a/wqflask/base/trait.py +++ b/wqflask/base/trait.py @@ -329,7 +329,7 @@ class GeneralTrait(object): # # description = self.pre_publication_description - if len(description) > 0: + if description: self.description_display = description.strip() else: self.description_display = "" diff --git a/wqflask/wqflask/static/new/javascript/dataset_menu_structure.json b/wqflask/wqflask/static/new/javascript/dataset_menu_structure.json index 2b16383f..12a30e84 100755 --- a/wqflask/wqflask/static/new/javascript/dataset_menu_structure.json +++ b/wqflask/wqflask/static/new/javascript/dataset_menu_structure.json @@ -1595,6 +1595,11 @@ }, "B6D2F2": { "Brain mRNA": [ + [ + "76", + "BRF2_M_0805_M", + "OHSU/VA B6D2F2 Brain mRNA M430 (Aug05) MAS5" + ], [ "78", "BRF2_M_0805_P", @@ -1605,11 +1610,6 @@ "BRF2_M_0805_R", "OHSU/VA B6D2F2 Brain mRNA M430 (Aug05) RMA" ], - [ - "76", - "BRF2_M_0805_M", - "OHSU/VA B6D2F2 Brain mRNA M430 (Aug05) MAS5" - ], [ "33", "BRF2_M_0304_P", @@ -1846,6 +1846,18 @@ ] }, "BXD": { + "Adipose Proteome": [ + [ + "797", + "EPFL_AdiPro0416", + "EPFL/ETHZ BXD Brown Adipose, Total Tissue Proteome, Chow Diet (Apr16) Light SWATH **" + ], + [ + "798", + "EPFL_AdiMitPro0416", + "EPFL/ETHZ BXD Brown Adipose, Isolated Mitochondria Proteome, Chow Diet (Apr16) Light SWATH **" + ] + ], "Adipose mRNA": [ [ "469", @@ -1916,20 +1928,20 @@ [ "414", "UCLA_BXD-on_Femur_0113_RSN", - "UCLA GSE27483 BXD Only Bone Femur ILM Mouse WG-6 v2.0 (Jan13) RSN" + "UCLA GSE27483 BXD Only Bone Femur ILM Mouse WG-6 v1.1 (Jan13) RSN" ] ], "Brain mRNA": [ - [ - "164", - "UTHSC_BXD_WB_RNASeq1112", - "UTHSC Mouse BXD Whole Brain RNA Sequence (Nov12) RPKM Untrimmed" - ], [ "590", "UTHSC_BXD_WB_RNASeqtrim1_1112", "UTHSC Mouse BXD Whole Brain RNA Sequence (Nov12) RPKM Trimmed 1.0" ], + [ + "164", + "UTHSC_BXD_WB_RNASeq1112", + "UTHSC Mouse BXD Whole Brain RNA Sequence (Nov12) RPKM Untrimmed" + ], [ "394", "UTHSC_BXD_WB_RNASeqEx1112", @@ -1945,6 +1957,11 @@ "BR_U_1105_P", "UTHSC Brain mRNA U74Av2 (Nov05) PDNN" ], + [ + "82", + "BR_U_0805_R", + "UTHSC Brain mRNA U74Av2 (Aug05) RMA" + ], [ "81", "BR_U_0805_P", @@ -1955,11 +1972,6 @@ "BR_U_0805_M", "UTHSC Brain mRNA U74Av2 (Aug05) MAS5" ], - [ - "82", - "BR_U_0805_R", - "UTHSC Brain mRNA U74Av2 (Aug05) RMA" - ], [ "42", "CB_M_0204_P", @@ -2026,6 +2038,11 @@ "Eye_M2_0908_R_ND", "Eye M430v2 WT Gpnmb (Sep08) RMA" ], + [ + "278", + "Eye_M2_0908_R_MT", + "Eye M430v2 Mutant Tyrp1 (Sep08) RMA" + ], [ "382", "Eye_M2_0908_WTWT", @@ -2036,11 +2053,6 @@ "Eye_M2_0908_R_WT", "Eye M430v2 WT Tyrp1 (Sep08) RMA" ], - [ - "278", - "Eye_M2_0908_R_MT", - "Eye M430v2 Mutant Tyrp1 (Sep08) RMA" - ], [ "400", "DBA2J-ONH-1212", @@ -2556,30 +2568,30 @@ ] ], "Retina mRNA": [ + [ + "267", + "Illum_Retina_BXD_RankInv0410", + "Full HEI Retina Illumina V6.2 (Apr10) RankInv" + ], + [ + "302", + "G2NEI_ILM_Retina_BXD_RI0410", + "HEI Retina Normal Illumina V6.2 (Apr10) RankInv" + ], [ "709", "DoDCMMRPRetMoGene2_0515", - "DoD CDMRP Retina Affy MoGene 2.0 ST (May15) RMA Gene Level" + "DoD Retina Normal Affy MoGene 2.0 ST (May15) RMA Gene Level" ], [ "710", "DoDCMMRPRetMoGene2Ex_0515", - "DoD CDMRP Retina Affy MoGene 2.0 ST (May15) RMA Exon Level" + "DoD Retina Normal Affy MoGene 2.0 ST (May15) RMA Exon Level" ], [ "385", "ONCRetILM6_0412", "ONC HEI Retina (April 2012) RankInv" - ], - [ - "302", - "G2NEI_ILM_Retina_BXD_RI0410", - "Normal HEI Retina (April 2010) RankInv" - ], - [ - "267", - "Illum_Retina_BXD_RankInv0410", - "Full HEI Retina (April 2010) RankInv" ] ], "Spleen mRNA": [ @@ -2704,6 +2716,23 @@ "RTC_1106_R", "HZI Treg M430v2 (Feb11) RMA" ] + ], + "Ventral Tegmental Area mRNA": [ + [ + "228", + "VCUSal_0609_R", + "VCU BXD VTA Sal M430 2.0 (Jun09) RMA" + ], + [ + "230", + "VCUEtvsSal_0609_R", + "VCU BXD VTA Et vs Sal M430 2.0 (Jun09) RMA" + ], + [ + "229", + "VCUEtOH_0609_R", + "VCU BXD VTA EtOH M430 2.0 (Jun09) RMA" + ] ] }, "BXH": { @@ -2810,6 +2839,16 @@ "170", "UCLA_CTB6B6CTF2_ADIPOSE_2005", "UCLA CTB6/B6CTF2 Adipose (2005) mlratio" + ], + [ + "189", + "UCLA_CTB6B6CTF2_ADIPOSE_FEMALE", + "UCLA CTB6B6CTF2 Adipose Female mlratio" + ], + [ + "188", + "UCLA_CTB6B6CTF2_ADIPOSE_MALE", + "UCLA CTB6B6CTF2 Adipose Male mlratio" ] ], "Brain mRNA": [ @@ -2841,6 +2880,16 @@ "172", "UCLA_CTB6B6CTF2_LIVER_2005", "UCLA CTB6/B6CTF2 Liver (2005) mlratio" + ], + [ + "193", + "UCLA_CTB6B6CTF2_LIVER_FEMALE", + "UCLA CTB6B6CTF2 Liver Female mlratio" + ], + [ + "192", + "UCLA_CTB6B6CTF2_LIVER_MALE", + "UCLA CTB6B6CTF2 Liver Male mlratio" ] ], "Muscle mRNA": [ @@ -2848,6 +2897,16 @@ "173", "UCLA_CTB6B6CTF2_MUSCLE_2005", "UCLA CTB6/B6CTF2 Muscle (2005) mlratio" + ], + [ + "195", + "UCLA_CTB6B6CTF2_MUSCLE_FEMALE", + "UCLA CTB6B6CTF2 Muscle Female mlratio" + ], + [ + "194", + "UCLA_CTB6B6CTF2_MUSCLE_MALE", + "UCLA CTB6B6CTF2 Muscle Male mlratio" ] ], "Phenotypes": [ @@ -2941,6 +3000,11 @@ ] ], "Hippocampus mRNA": [ + [ + "212", + "Illum_LXS_Hipp_RSE_1008", + "Hippocampus Illumina RSE (Oct08) RankInv beta" + ], [ "214", "Illum_LXS_Hipp_NOE_1008", @@ -2961,11 +3025,6 @@ "Illum_LXS_Hipp_NON_1008", "Hippocampus Illumina NON (Oct08) RankInv beta" ], - [ - "212", - "Illum_LXS_Hipp_RSE_1008", - "Hippocampus Illumina RSE (Oct08) RankInv beta" - ], [ "143", "Illum_LXS_Hipp_loess0807", @@ -3130,16 +3189,32 @@ "Scripps-2013": {} }, "rat": { - "HSNIH": { + "HSNIH-Palmer": { "Phenotypes": [ [ - "619", - "HSNIHPublish", - "HSNIH Published Phenotypes" + "None", + "HSNIH-PalmerPublish", + "HSNIH-Palmer Published Phenotypes" + ] + ] + }, + "HSNIH-RGSMC": { + "Phenotypes": [ + [ + "None", + "HSNIH-RGSMCPublish", + "HSNIH-RGSMC Published Phenotypes" ] ] }, "HXBBXH": { + "Adipose mRNA": [ + [ + "799", + "FGUCAS_BAdip0516", + "FGUCAS BXH/HXB Brown Adipose Affy Rat Gene 2.0 ST (May16) log2 **" + ] + ], "Adrenal Gland mRNA": [ [ "220", @@ -3460,8 +3535,12 @@ ], "rat": [ [ - "HSNIH", - "NIH Heterogeneous Stock" + "HSNIH-Palmer", + "NIH Heterogeneous Stock (Palmer)" + ], + [ + "HSNIH-RGSMC", + "NIH Heterogeneous Stock (RGSMC 2013)" ], [ "HXBBXH", @@ -4350,6 +4429,10 @@ "Adipose mRNA", "Adipose mRNA" ], + [ + "Adipose Proteome", + "Adipose Proteome" + ], [ "Adrenal Gland mRNA", "Adrenal Gland mRNA" @@ -4465,6 +4548,10 @@ [ "T Cell (regulatory) mRNA", "T Cell (regulatory) mRNA" + ], + [ + "Ventral Tegmental Area mRNA", + "Ventral Tegmental Area mRNA" ] ], "BXH": [ @@ -4656,7 +4743,13 @@ "Scripps-2013": [] }, "rat": { - "HSNIH": [ + "HSNIH-Palmer": [ + [ + "Phenotypes", + "Phenotypes" + ] + ], + "HSNIH-RGSMC": [ [ "Phenotypes", "Phenotypes" @@ -4671,6 +4764,10 @@ "Genotypes", "Genotypes" ], + [ + "Adipose mRNA", + "Adipose mRNA" + ], [ "Adrenal Gland mRNA", "Adrenal Gland mRNA" -- cgit v1.2.3