From 8c45fcf1e9228108034fab96bc7e7eaa7740f06c Mon Sep 17 00:00:00 2001
From: Zachary Sloan
Date: Fri, 18 Jul 2014 17:31:41 +0000
Subject: Added outlier highlighting

Changed order of tabs in statistics panel on trait page

Started working on heatmap
---
 wqflask/base/data_set.py       | 13 ++++++++-----
 wqflask/base/webqtlCaseData.py |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'wqflask/base')

diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 2a79dc9c..e6bd61c1 100755
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -563,12 +563,15 @@ class DataSet(object):
                         """.format(*mescape(self.type, item, item, self.type, item, item))
                         
             if self.type == "Publish":
+                #query += """
+                #        WHERE {}XRef.InbredSetId = '{}'
+                #        """.format(*mescape(self.type, self.group.name))
+                
                 query += """
-                        WHERE {}XRef.PublicationId = {}Freeze.Id
-                        and {}Freeze.Name = '{}'
+                        WHERE {}XRef.InbredSetId = '{}'
                         and {}.Id = {}XRef.{}Id
                         order by {}.Id
-                        """.format(*mescape(self.type, self.type, self.type, self.name, 
+                        """.format(*mescape(self.type, self.group.name, 
                                     dataset_type, self.type, dataset_type, dataset_type))
             else:
                 query += """
@@ -579,10 +582,10 @@ class DataSet(object):
                         """.format(*mescape(self.type, self.type, self.type, self.type,
                                    self.name, dataset_type, self.type, self.type, dataset_type))
                         
-            #print("trait data query: ", query)
+            print("trait data query: ", query)
             
             results = g.db.execute(query).fetchall()
-            #print("query results:", results)
+            print("query results:", results)
             trait_sample_data.append(results)
 
         trait_count = len(trait_sample_data[0])
diff --git a/wqflask/base/webqtlCaseData.py b/wqflask/base/webqtlCaseData.py
index 42763aed..6dc0c145 100755
--- a/wqflask/base/webqtlCaseData.py
+++ b/wqflask/base/webqtlCaseData.py
@@ -34,6 +34,7 @@ class webqtlCaseData(object):
         self.value = value                  # Trait Value
         self.variance = variance            # Trait Variance
         self.num_cases = num_cases          # Number of individuals/cases
+        self.z_score = None
         self.extra_attributes = None
         self.this_id = None   # Set a sane default (can't be just "id" cause that's a reserved word)
         self.outlier = None   # Not set to True/False until later
-- 
cgit v1.2.3