aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzsloan2022-06-23 20:10:13 +0000
committerzsloan2022-06-23 20:10:13 +0000
commit65768f80a4d5ec0320ca62355e5dec8e112b85c8 (patch)
treed9ed882adce4240f18989c8ae892401c44846598
parent895ae3ae28703d939d218429d15768649a53f18a (diff)
downloadgenenetwork2-65768f80a4d5ec0320ca62355e5dec8e112b85c8.tar.gz
Change jsonable in GeneralTrait so that it passes all necessary table
information
-rw-r--r--wqflask/base/trait.py18
1 files changed, 17 insertions, 1 deletions
diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py
index 0333e429..b02c6033 100644
--- a/wqflask/base/trait.py
+++ b/wqflask/base/trait.py
@@ -300,10 +300,16 @@ def jsonable(trait, dataset=None):
dataset_type=trait.dataset.type,
group_name=trait.dataset.group.name)
+ trait_symbol = "N/A"
+ if trait.symbol:
+ trait_symbol = trait.symbol
+
if dataset.type == "ProbeSet":
return dict(name=trait.name,
+ display_name=trait.display_name,
+ hmac=hmac.data_hmac('{}:{}'.format(trait.display_name, dataset.name)),
view=str(trait.view),
- symbol=trait.symbol,
+ symbol=trait_symbol,
dataset=dataset.name,
dataset_name=dataset.shortname,
description=trait.description_display,
@@ -316,7 +322,10 @@ def jsonable(trait, dataset=None):
elif dataset.type == "Publish":
if trait.pubmed_id:
return dict(name=trait.name,
+ display_name=trait.display_name,
+ hmac=hmac.data_hmac('{}:{}'.format(trait.display_name, dataset.name)),
view=str(trait.view),
+ symbol=trait_symbol,
dataset=dataset.name,
dataset_name=dataset.shortname,
description=trait.description_display,
@@ -332,7 +341,10 @@ def jsonable(trait, dataset=None):
)
else:
return dict(name=trait.name,
+ display_name=trait.display_name,
+ hmac=hmac.data_hmac('{}:{}'.format(trait.display_name, dataset.name)),
view=str(trait.view),
+ symbol=trait_symbol,
dataset=dataset.name,
dataset_name=dataset.shortname,
description=trait.description_display,
@@ -346,6 +358,8 @@ def jsonable(trait, dataset=None):
)
elif dataset.type == "Geno":
return dict(name=trait.name,
+ display_name=trait.display_name,
+ hmac=hmac.data_hmac('{}:{}'.format(trait.display_name, dataset.name)),
view=str(trait.view),
dataset=dataset.name,
dataset_name=dataset.shortname,
@@ -353,6 +367,8 @@ def jsonable(trait, dataset=None):
)
elif dataset.name == "Temp":
return dict(name=trait.name,
+ display_name=trait.display_name,
+ hmac=hmac.data_hmac('{}:{}'.format(trait.display_name, dataset.name)),
view=str(trait.view),
dataset="Temp",
dataset_name="Temp")