aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzsloan2017-02-09 16:39:06 -0600
committerGitHub2017-02-09 16:39:06 -0600
commitdab2425d6395c900b1d90ae224f039edfc560061 (patch)
tree8538f2e1d3f917da7548bbd476f97645b67fa681
parent048596e5ffb0323b0ebf3cc1a837b26b8774504e (diff)
parent2b14b0d04387a262f9895ddd87ce465c6835fa8c (diff)
downloadgenenetwork2-dab2425d6395c900b1d90ae224f039edfc560061.tar.gz
Merge pull request #247 from zsloan/master
A couple minor commits
-rw-r--r--wqflask/base/data_set.py4
-rw-r--r--wqflask/wqflask/static/new/javascript/show_trait.js21
2 files changed, 15 insertions, 10 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 19955b07..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
}
];
@@ -179,8 +179,13 @@
if (!__hasProp.call(_ref, key)) continue;
value = _ref[key];
the_id = process_id("column", key);
- header += "<th id=\"" + the_id + "\" style=\"padding-left: 5px;\">" + value + "</th>";
+ if (Object.keys(_ref).length > 1) {
+ header += "<th id=\"" + the_id + "\" style=\"padding-left: 5px;\">" + value + "</th>";
+ } else {
+ header += "<th id=\"" + the_id + "\" style=\"padding-left: 5px;\">Value</th>";
+ }
}
+
header += "</thead>";
the_rows = "<tbody>";
for (_i = 0, _len = Stat_Table_Rows.length; _i < _len; _i++) {