Fixed drop-down group order

2 files changed, 60 insertions, 40 deletions

diff --git a/wqflask/maintenance/gen_select_dataset.py b/wqflask/maintenance/gen_select_dataset.py
index 1123f997..f62d0cc1 100644
--- a/wqflask/maintenance/gen_select_dataset.py
+++ b/wqflask/maintenance/gen_select_dataset.py
@@ -101,7 +101,7 @@ def get_groups(species):
                         or GenoFreeze.InbredSetId = InbredSet.Id
                         or ProbeFreeze.InbredSetId = InbredSet.Id)
                         group by InbredSet.Name
-                        order by InbredSet.Name""" % species_name)
+                        order by InbredSet.FullName""" % species_name)
         results = Cursor.fetchall()
         groups[species_name] = list(results)
     return groups
diff --git a/wqflask/wqflask/static/new/javascript/dataset_menu_structure.json b/wqflask/wqflask/static/new/javascript/dataset_menu_structure.json
index 8bdd91db..eabddbc4 100644
--- a/wqflask/wqflask/static/new/javascript/dataset_menu_structure.json
+++ b/wqflask/wqflask/static/new/javascript/dataset_menu_structure.json
@@ -2218,6 +2218,26 @@
                   "819",
                   "UCLA_BXD_Aor_Jan16",
                   "UCLA BXD Aorta Affy M430 2.0 (Jan16) RMA"
+               ],
+               [
+                  "485",
+                  "EPFL-LISPBXDHeCD0114",
+                  "EPFL/LISP BXD CD Heart Affy Mouse Gene 2.0 ST Gene Level (Jan14) RMA"
+               ],
+               [
+                  "486",
+                  "EPFL-LISPBXDHeHFD0114",
+                  "EPFL/LISP BXD HFD Heart Affy Mouse Gene 2.0 ST Gene Level (Jan14) RMA"
+               ],
+               [
+                  "487",
+                  "EPFL-LISPBXDHeCDEx0114",
+                  "EPFL/LISP BXD CD Heart Affy Mouse Gene 2.0 ST Exon Level (Jan14) RMA"
+               ],
+               [
+                  "488",
+                  "EPFL-LISPBXDHeHFDEx0114",
+                  "EPFL/LISP BXD HFD Heart Affy Mouse Gene 2.0 ST Exon Level (Jan14) RMA"
                ]
             ],
             "Hematopoietic Cells mRNA": [
@@ -3730,6 +3750,10 @@
       ],
       "human": [
          [
+            "HB",
+            "Brain, Aging: AD, HD, Normal Gene Expression (Harvard/Merck)"
+         ],
+         [
             "AD-cases-controls",
             "Brain, Aging: AD, Normal Gene Expression (Liang)"
          ],
@@ -3742,6 +3766,14 @@
             "Brain, Aging: Normal Gene Expression (UCI/Cotman)"
          ],
          [
+            "HCP",
+            "Brain, Cognition, Human Connectome Project"
+         ],
+         [
+            "HSB",
+            "Brain, Development: Normal Gene Expression (Yale/Sestan)"
+         ],
+         [
             "Brain-Normal-NIH-Gibbs",
             "Brain: Normal Gene Expression (NIH/Gibbs)"
          ],
@@ -3750,10 +3782,6 @@
             "Child Development: CANDLE Cohort with Genotypes (TUCI/UTHSC)"
          ],
          [
-            "CEPH-2004",
-            "Lymphoblastoid Cells: Gene Expression (CEPH, Williams)"
-         ],
-         [
             "GTEx",
             "GTEx v3 All Tissues, RNA-Seq with Genotypes"
          ],
@@ -3762,14 +3790,6 @@
             "GTEx v5 All Tissues, RNA-Seq with Genotypes"
          ],
          [
-            "HB",
-            "Brain, Aging: AD, HD, Normal Gene Expression (Harvard/Merck)"
-         ],
-         [
-            "HCP",
-            "Brain, Cognition, Human Connectome Project"
-         ],
-         [
             "HLC",
             "Liver: Normal Gene Expression with Genotypes (Merck)"
          ],
@@ -3778,8 +3798,8 @@
             "Lung: Normal Gene Expression (Merck)"
          ],
          [
-            "HSB",
-            "Brain, Development: Normal Gene Expression (Yale/Sestan)"
+            "CEPH-2004",
+            "Lymphoblastoid Cells: Gene Expression (CEPH, Williams)"
          ],
          [
             "Islets-Gerling",
@@ -3804,8 +3824,8 @@
             "B6BTBRF2"
          ],
          [
-            "B6D2",
-            "Glaucoma and Aged Retina, UTHSC"
+            "Linsenbardt-Boehm",
+            "B6D2 EtOH Selected Advanced Intercross"
          ],
          [
             "B6D2F2",
@@ -3816,10 +3836,6 @@
             "B6D2F2 PSU"
          ],
          [
-            "B6D2RI",
-            "BXD Aged"
-         ],
-         [
             "BDF2-1999",
             "BDF2 UCLA"
          ],
@@ -3828,18 +3844,22 @@
             "BDF2-2005"
          ],
          [
-            "BHF2",
-            "BHF2 (Apoe Null) UCLA"
-         ],
-         [
             "BHHBF2",
             "BH/HB F2 UCLA"
          ],
          [
+            "BHF2",
+            "BHF2 (Apoe Null) UCLA"
+         ],
+         [
             "BXD",
             "BXD"
          ],
          [
+            "B6D2RI",
+            "BXD Aged"
+         ],
+         [
             "BXD-Bone",
             "BXD Bone"
          ],
@@ -3852,8 +3872,8 @@
             "BXH"
          ],
          [
-            "C57BL-6JxC57BL-6NJF2",
-            "Reduced Complexity Cross (B6JxB6N F2)"
+            "CTB6F2",
+            "CastB6/B6Cast F2 UCLA"
          ],
          [
             "CFW",
@@ -3872,10 +3892,6 @@
             "Chronic Mild Stress"
          ],
          [
-            "CTB6F2",
-            "CastB6/B6Cast F2 UCLA"
-         ],
-         [
             "CXB",
             "CXB"
          ],
@@ -3884,6 +3900,10 @@
             "Ethanol-Medicated Stress Reduction"
          ],
          [
+            "B6D2",
+            "Glaucoma and Aged Retina, UTHSC"
+         ],
+         [
             "HS",
             "Heterogeneous Stock"
          ],
@@ -3892,10 +3912,6 @@
             "Heterogeneous Stock Collaborative Cross"
          ],
          [
-            "Linsenbardt-Boehm",
-            "B6D2 EtOH Selected Advanced Intercross"
-         ],
-         [
             "LXS",
             "LXS"
          ],
@@ -3908,6 +3924,10 @@
             "NZB/FVB N2 NCI"
          ],
          [
+            "C57BL-6JxC57BL-6NJF2",
+            "Reduced Complexity Cross (B6JxB6N F2)"
+         ],
+         [
             "Scripps-2013",
             "Scripps C57BL/6J"
          ],
@@ -3924,6 +3944,10 @@
       ],
       "rat": [
          [
+            "HXBBXH",
+            "HXB/BXH"
+         ],
+         [
             "HSNIH-Palmer",
             "NIH Heterogeneous Stock (Palmer)"
          ],
@@ -3932,10 +3956,6 @@
             "NIH Heterogeneous Stock (RGSMC 2013)"
          ],
          [
-            "HXBBXH",
-            "HXB/BXH"
-         ],
-         [
             "SRxSHRSPF2",
             "UIOWA SRxSHRSP F2"
          ]
@@ -3968,7 +3988,7 @@
       ],
       [
          "rat",
-         "Rat (rn3)"
+         "Rat (rn6)"
       ],
       [
          "drosophila",