Skip to content

Commit

Permalink
Merge 448ce48 into 2e34f88
Browse files Browse the repository at this point in the history
  • Loading branch information
holtgrewe committed Apr 1, 2021
2 parents 2e34f88 + 448ce48 commit 614c1a3
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 0 deletions.
2 changes: 2 additions & 0 deletions HISTORY.rst
Expand Up @@ -30,6 +30,7 @@ End-User Summary
- Rebuild of variant summary database table happens every Sunday at 2:22am.
- Added celery queues ``maintenance`` and ``export``.
- Adding support for connecting two sites via the GAGH Beacon protocol.
- Adding link-out to "GenCC"

Full Change List
================
Expand Down Expand Up @@ -58,6 +59,7 @@ Full Change List
- Added celery queues ``maintenance`` and ``export``.
- Adding support for connecting two sites via the GAGH Beacon protocol.
- Making CADD version behind CADD REST API configurable.
- Adding link-out to "GenCC"

-------
v0.22.1
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Expand Up @@ -5,6 +5,10 @@ MANAGE = time python manage.py
black:
black -l 100 --exclude '/(\.eggs|\.git|\.hg|\.mypy_cache|\.nox|\.tox|\.?v?env|_build|buck-out|build|dist|src)/' $(arg) .

.PHONY: npm-install
npm-install:
cd varfish/vueapp && npm ci

.PHONY: serve
serve:
$(MANAGE) runserver
Expand Down
4 changes: 4 additions & 0 deletions variants/queries.py
Expand Up @@ -223,6 +223,8 @@ def __init__(self, *args, **kwargs):
func.max(Hgnc.sa.gene_family).label("gene_family"),
func.max(Hgnc.sa.pubmed_id).label("pubmed_id"),
func.max(Hgnc.sa.ucsc_id_novers).label("ucsc_id_novers"),
func.max(Hgnc.sa.hgnc_id).label("hgnc_id"),
func.max(Hgnc.sa.uniprot_ids).label("uniprot_ids"),
]
)
.select_from(Hgnc.sa)
Expand All @@ -242,6 +244,8 @@ def extend_fields(self, _query_parts):
func.coalesce(self.subquery_hgnc.c.name, "").label("gene_name"),
func.coalesce(self.subquery_hgnc.c.gene_family, "").label("gene_family"),
func.coalesce(self.subquery_hgnc.c.pubmed_id, "").label("pubmed_id"),
func.coalesce(self.subquery_hgnc.c.hgnc_id, "").label("hgnc_id"),
func.coalesce(self.subquery_hgnc.c.uniprot_ids, "").label("uniprot_ids"),
]


Expand Down
18 changes: 18 additions & 0 deletions variants/templates/variants/filter_result/row.html
Expand Up @@ -322,6 +322,24 @@
Gene @MGI
</span>
{% endif %}
{% if entry.hgnc_id %}
<a class="dropdown-item" href="https://search.thegencc.org/genes/{{ entry.hgnc_id }}" target="_blank">
Gene @GenCC
</a>
{% else %}
<span class="dropdown-item disabled">
Gene @GenCC
</span>
{% endif %}
{% if entry.uniprot_ids %}
<a class="dropdown-item" href="http://missense3d.bc.ic.ac.uk:8080/search_direct?uniprot={{ entry.uniprot_ids }}" target="_blank">
Gene @Missense3D-DB
</a>
{% else %}
<span class="dropdown-item disabled">
Gene @Missense3D-DB
</span>
{% endif %}
{% if hpoterms %}
<a class="dropdown-item" href="https://www.ncbi.nlm.nih.gov/pubmed/?term={{ entry|get_pubmed_linkout:hpoterms }}" target="_blank">
Gene+Phenotypes @PubMed
Expand Down

0 comments on commit 614c1a3

Please sign in to comment.