diff options
| author | zsloan | 2019-10-24 11:53:55 -0500 |
|---|---|---|
| committer | zsloan | 2019-10-24 11:53:55 -0500 |
| commit | 88e56cb99243082ba609290c8eba61e08c02eb2c (patch) | |
| tree | 4af5ddf7ce7c65e7deae2b680b2315880f07b6fe | |
| parent | acf114fb60ce493287dc852265a91ef12c854b0b (diff) | |
| download | genenetwork2-88e56cb99243082ba609290c8eba61e08c02eb2c.tar.gz | |
Changed logic for generating drop-downs such that it shows the correct Phenotypes name when there's no accession ID
| -rw-r--r-- | wqflask/base/data_set.py | 2 | ||||
| -rw-r--r-- | wqflask/wqflask/api/gen_menu.py | 10 | ||||
| -rw-r--r-- | wqflask/wqflask/static/new/javascript/dataset_menu_structure.json | 36 |
3 files changed, 42 insertions, 6 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py index 4df47083..16720656 100644 --- a/wqflask/base/data_set.py +++ b/wqflask/base/data_set.py @@ -346,7 +346,7 @@ class DatasetGroup(object): def get_samplelist(self): result = None - key = "samplelist:v2:" + self.name + key = "samplelist:v3:" + self.name if USE_REDIS: result = Redis.get(key) diff --git a/wqflask/wqflask/api/gen_menu.py b/wqflask/wqflask/api/gen_menu.py index 77ca6525..078e3782 100644 --- a/wqflask/wqflask/api/gen_menu.py +++ b/wqflask/wqflask/api/gen_menu.py @@ -201,9 +201,15 @@ def build_datasets(species, group, type_name): dataset_text = str(result[2]) datasets.append([dataset_id, dataset_value, dataset_text]) else: + result = g.db.execute("""SELECT PublishFreeze.Name, PublishFreeze.FullName + FROM PublishFreeze, InbredSet + WHERE InbredSet.Name = '{}' AND + PublishFreeze.InbredSetId = InbredSet.Id + ORDER BY PublishFreeze.CreateTime ASC""".format(group)).fetchone() + dataset_id = "None" - dataset_value = "%sPublish" % group - dataset_text = "%s Phenotypes" % group + dataset_value = str(result[0]) + dataset_text = str(result[1]) datasets.append([dataset_id, dataset_value, dataset_text]) elif type_name == "Genotypes": diff --git a/wqflask/wqflask/static/new/javascript/dataset_menu_structure.json b/wqflask/wqflask/static/new/javascript/dataset_menu_structure.json index 0fd9321c..f9bce083 100644 --- a/wqflask/wqflask/static/new/javascript/dataset_menu_structure.json +++ b/wqflask/wqflask/static/new/javascript/dataset_menu_structure.json @@ -1518,6 +1518,13 @@ }, "mouse": { "AIL": { + "Genotypes": [ + [ + "None", + "AILGeno", + "AIL Genotypes" + ] + ], "Hippocampus mRNA": [ [ "874", @@ -1768,7 +1775,7 @@ [ "None", "B6D2F2-PSUPublish", - "B6D2F2-PSU Phenotypes" + "B6D2F2 PSU Phenotypes" ] ] }, @@ -3189,7 +3196,7 @@ [ "None", "BXD300Publish", - "BXD300 Phenotypes" + "BXD300 Published Phenotypes" ] ] }, @@ -3323,7 +3330,7 @@ [ "None", "CIE-INIAPublish", - "CIE-INIA Phenotypes" + "LCM Phenotypes" ] ] }, @@ -3552,6 +3559,15 @@ ] ] }, + "LGSM-AIG34_50-56-GBS": { + "Phenotypes": [ + [ + "None", + "LGSM-AIG34_50-56-GBSPublish", + "LGSM AIG34/50-56 GBS Phenotypes" + ] + ] + }, "LXS": { "Genotypes": [ [ @@ -4218,6 +4234,10 @@ "ILSXISS (LXS) RI Family (strain means)" ], [ + "LGSM-AIG34_50-56-GBS", + "LGSM AI G34/50-56 Lionikas (GBS)" + ], + [ "MDP", "Mouse Diversity Panel (strain means)" ], @@ -5009,6 +5029,10 @@ "Phenotypes" ], [ + "Genotypes", + "Genotypes" + ], + [ "Hippocampus mRNA", "Hippocampus mRNA" ], @@ -5541,6 +5565,12 @@ "Striatum mRNA" ] ], + "LGSM-AIG34_50-56-GBS": [ + [ + "Phenotypes", + "Phenotypes" + ] + ], "LXS": [ [ "Phenotypes", |