diff options
| author | Pjotr Prins | 2016-10-25 19:16:57 +0000 |
|---|---|---|
| committer | GitHub | 2016-10-25 19:16:57 +0000 |
| commit | 72cbf70ee82a5a4afabc37809530f70fc6d7ea2d (patch) | |
| tree | ab9cd7955e02c1b66a0e68eebe59b52ed9ce96bf /wqflask/base | |
| parent | 66052e6e996439f7a4a2d8c0a2c063526f3c7ace (diff) | |
| parent | 684f461b815e3920419874fccb036c359cae35d8 (diff) | |
| download | genenetwork2-72cbf70ee82a5a4afabc37809530f70fc6d7ea2d.tar.gz | |
Merge pull request #216 from zsloan/master
Replaced Download Table in view_collection page with python version
Diffstat (limited to 'wqflask/base')
| -rw-r--r-- | wqflask/base/trait.py | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py index 32032ba7..276c624a 100644 --- a/wqflask/base/trait.py +++ b/wqflask/base/trait.py @@ -78,11 +78,37 @@ class GeneralTrait(object): """Return a dict suitable for using as json Actual turning into json doesn't happen here though""" - return dict(name=self.name, - dataset=self.dataset.name, - description=self.description_display, - mean=self.mean) - + + if self.dataset.type == "ProbeSet": + return dict(name=self.name, + symbol=self.symbol, + dataset=self.dataset.name, + description=self.description_display, + mean=self.mean, + location=self.location_repr, + lrs_score=self.LRS_score_repr, + lrs_location=self.LRS_location_repr, + additive=self.additive + ) + elif self.dataset.type == "Publish": + return dict(name=self.name, + dataset=self.dataset.name, + description=self.description_display, + authors=self.authors, + pubmed_text=self.pubmed_text, + pubmed_link=self.pubmed_link, + lrs_score=self.LRS_score_repr, + lrs_location=self.LRS_location_repr, + additive=self.additive + ) + elif self.dataset.type == "Geno": + return dict(name=self.name, + dataset=self.dataset.name, + location=self.location_repr + ) + else: + return dict() + def get_name(self): stringy = "" |