From 434ce88d3b7bf29a65e738aa171a7bba6a887471 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Thu, 9 Feb 2017 21:50:54 +0000
Subject: Added genetic_type to DatasetGroup object to differentiate between
 which groups should show dominance effect

Minor changes/improvements for trait page

Updated dataset_menu_structure.json
---
 wqflask/base/data_set.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'wqflask/base')

diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 02b5e07c..4b3ee4ca 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -264,7 +264,7 @@ class DatasetGroup(object):
     def __init__(self, dataset):
         """This sets self.group and self.group_id"""
         #logger.debug("DATASET NAME2:", dataset.name)
-        self.name, self.id = fetchone(dataset.query_for_group)
+        self.name, self.id, self.genetic_type = fetchone(dataset.query_for_group)
         if self.name == 'BXD300':
             self.name = "BXD"
 
@@ -965,7 +965,7 @@ class MrnaAssayDataSet(DataSet):
 
         self.query_for_group = '''
                         SELECT
-                                InbredSet.Name, InbredSet.Id
+                                InbredSet.Name, InbredSet.Id, InbredSet.GeneticType
                         FROM
                                 InbredSet, ProbeSetFreeze, ProbeFreeze
                         WHERE
-- 
cgit v1.2.3