about summary refs log tree commit diff
path: root/wqflask/base
diff options
context:
space:
mode:
authorzsloan2019-01-11 10:46:38 -0600
committerzsloan2019-01-11 10:46:38 -0600
commitf1ea496ae71388810f0e6dffe36b005ceabaed6c (patch)
tree8862dd0d771101dc44f0ec553f8ee2fde9db0eb5 /wqflask/base
parentee1e49b90663be72032c8dee32748e97bc28e1e9 (diff)
downloadgenenetwork2-f1ea496ae71388810f0e6dffe36b005ceabaed6c.tar.gz
Got InDel working for Variant Browser
Changed Variant Browser to display gene name under "Domain" when the user searches a gene term and rows are mislabeled "Intergenic"

Fixed Chr option to display correct chromosomes for different species

Fixed order for correlation drop-down on trait page

Fixed some appearance issues with the mapping results table

Improved appearance of correlation scatterplot page
Diffstat (limited to 'wqflask/base')
-rw-r--r--wqflask/base/data_set.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 55782576..2acb3b61 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -109,6 +109,7 @@ Publish or ProbeSet. E.g.
                         else:
                             new_type = "ProbeSet"
                         self.datasets[short_dataset_name] = new_type
+
         # Set LOG_LEVEL_DEBUG=5 to see the following:
         logger.debugf(5, "datasets",self.datasets)
 
@@ -450,12 +451,14 @@ def datasets(group_name, this_group = None):
             and InbredSet.Name like %s
             and ProbeSetFreeze.public > %s
             and ProbeSetFreeze.confidentiality < 1
-          ORDER BY Tissue.Name, ProbeSetFreeze.CreateTime desc, ProbeSetFreeze.AvgId)
+          ORDER BY Tissue.Name)
         ''' % (group_name, webqtlConfig.PUBLICTHRESH,
               group_name, webqtlConfig.PUBLICTHRESH,
               "'" + group_name + "'", webqtlConfig.PUBLICTHRESH))
 
-    for dataset_item in the_results:
+    sorted_results = sorted(the_results, key=lambda kv: kv[0])
+
+    for dataset_item in sorted_results:
         tissue_name = dataset_item[0]
         dataset = dataset_item[1]
         dataset_short = dataset_item[2]