aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzsloan2017-02-09 22:36:52 +0000
committerzsloan2017-02-09 22:36:52 +0000
commit2b14b0d04387a262f9895ddd87ce465c6835fa8c (patch)
tree8538f2e1d3f917da7548bbd476f97645b67fa681
parent9371ec41dbb9c162084a4aa49f03184ce256cd4c (diff)
downloadgenenetwork2-2b14b0d04387a262f9895ddd87ce465c6835fa8c.tar.gz
Fixed issue where I forgot to add GeneticType to the query_for_group query for non-mRNA Assay datasets
Increased digits of some Basic Statistics values from 2 to 3
-rw-r--r--wqflask/base/data_set.py4
-rw-r--r--wqflask/wqflask/static/new/javascript/show_trait.js14
2 files changed, 9 insertions, 9 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 4b3ee4ca..54dd3c4b 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -696,7 +696,7 @@ class PhenotypeDataSet(DataSet):
self.query_for_group = '''
SELECT
- InbredSet.Name, InbredSet.Id
+ InbredSet.Name, InbredSet.Id, InbredSet.GeneticType
FROM
InbredSet, PublishFreeze
WHERE
@@ -839,7 +839,7 @@ class GenotypeDataSet(DataSet):
self.query_for_group = '''
SELECT
- InbredSet.Name, InbredSet.Id
+ InbredSet.Name, InbredSet.Id, InbredSet.GeneticType
FROM
InbredSet, GenoFreeze
WHERE
diff --git a/wqflask/wqflask/static/new/javascript/show_trait.js b/wqflask/wqflask/static/new/javascript/show_trait.js
index c7f9c562..8223a38c 100644
--- a/wqflask/wqflask/static/new/javascript/show_trait.js
+++ b/wqflask/wqflask/static/new/javascript/show_trait.js
@@ -18,19 +18,19 @@
}, {
vn: "mean",
pretty: "Mean",
- digits: 2
+ digits: 3
}, {
vn: "median",
pretty: "Median",
- digits: 2
+ digits: 3
}, {
vn: "std_error",
pretty: "Standard Error (SE)",
- digits: 2
+ digits: 3
}, {
vn: "std_dev",
pretty: "Standard Deviation (SD)",
- digits: 2
+ digits: 3
}, {
vn: "min",
pretty: "Minimum",
@@ -42,16 +42,16 @@
}, {
vn: "range",
pretty: "Range (log2)",
- digits: 2
+ digits: 3
}, {
vn: "range_fold",
pretty: "Range (fold)",
- digits: 2
+ digits: 3
}, {
vn: "interquartile",
pretty: "Interquartile Range",
url: "http://www.genenetwork.org/glossary.html#Interquartile",
- digits: 2
+ digits: 3
}
];