diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fe7086cdd..669b9ac580 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ About changelog [here](https://keepachangelog.com/en/1.0.0/) ## [4.79.1] ### Fixed - Exporting variants without rank score causing page to crash +- Display custom annotations also on cancer variant page ## [4.79] ### Added diff --git a/scout/server/blueprints/variant/templates/variant/cancer-variant.html b/scout/server/blueprints/variant/templates/variant/cancer-variant.html index b28fa46756..0514d90bbc 100644 --- a/scout/server/blueprints/variant/templates/variant/cancer-variant.html +++ b/scout/server/blueprints/variant/templates/variant/cancer-variant.html @@ -1,6 +1,6 @@ {% extends "layout.html" %} {% from "utils.html" import comments_panel, activity_panel %} -{% from "variant/utils.html" import overlapping_panel, genes_panel, transcripts_panel, proteins_panel, pin_button, causative_button, modal_causative %} +{% from "variant/utils.html" import overlapping_panel, genes_panel, transcripts_panel, proteins_panel, pin_button, causative_button, modal_causative, custom_annotations %} {% from "variant/tx_overview.html" import disease_associated, transcripts_overview %} {% from "variant/variant_details.html" import frequencies, gtcall_panel, observations_panel, old_observations, mappability_list, severity_list %} {% from "variant/buttons.html" import database_buttons, variant_tag_button, variant_tier_button, dismiss_variant_button, mosaic_variant_button, splice_junctions_button %} @@ -279,7 +279,17 @@
Variant callers
Alignment
{{ alignments(institute, case, variant, current_user, config, igv_tracks, rna_tracks) }} - + + + + {% if variant.custom %} + + {% endif %} + {% endmacro %} diff --git a/scout/server/blueprints/variant/templates/variant/sv-variant.html b/scout/server/blueprints/variant/templates/variant/sv-variant.html index 54dbc795fc..3ff4096acd 100644 --- a/scout/server/blueprints/variant/templates/variant/sv-variant.html +++ b/scout/server/blueprints/variant/templates/variant/sv-variant.html @@ -2,7 +2,7 @@ {% from "utils.html" import activity_panel, comments_panel, pedigree_panel %} {% from "variant/variant_details.html" import old_observations %} {% from "variant/components.html" import external_scripts, external_stylesheets, matching_variants, variant_scripts %} -{% from "variant/utils.html" import causative_button, genes_panel, igv_track_selection, modal_causative, overlapping_panel, sv_alignments, pin_button, transcripts_panel %} +{% from "variant/utils.html" import causative_button, genes_panel, igv_track_selection, modal_causative, overlapping_panel, sv_alignments, pin_button, transcripts_panel, custom_annotations %} {% from "variant/rank_score_results.html" import rankscore_panel %} {% from "variant/gene_disease_relations.html" import orpha_omim_phenotypes %} {% from "variant/variant_details.html" import frequencies, gtcall_panel, observations_panel %} @@ -277,16 +277,16 @@ {{ splice_junctions_button(institute._id, case.display_name, variant._id) }} {% endif %} + + {% if variant.custom %} - {% for pair in variant.custom %} -
  • -
    -
    {{pair[0]}}
    {{pair[1]}}
    -
    -
  • - {% endfor %} + + {% endif %} - diff --git a/scout/server/blueprints/variant/templates/variant/utils.html b/scout/server/blueprints/variant/templates/variant/utils.html index ef75d6520d..a853d203d0 100644 --- a/scout/server/blueprints/variant/templates/variant/utils.html +++ b/scout/server/blueprints/variant/templates/variant/utils.html @@ -418,3 +418,26 @@
    Phenotype terms (HPO):
    {% endif %} {% endmacro %} + + +{% macro custom_annotations(variant) %} + + + + + + + + {% for pair in variant.custom %} + + + + + {% endfor %} + +
    Custom annotationValue
    + {{ pair[0] }} + + {{ pair[1] }} +
    +{% endmacro %} diff --git a/scout/server/blueprints/variant/templates/variant/variant.html b/scout/server/blueprints/variant/templates/variant/variant.html index e8713d0936..2cccc24126 100644 --- a/scout/server/blueprints/variant/templates/variant/variant.html +++ b/scout/server/blueprints/variant/templates/variant/variant.html @@ -2,7 +2,7 @@ {% from "variant/buttons.html" import database_buttons %} {% from "utils.html" import activity_panel, comments_panel, pedigree_panel %} {% from "variants/utils.html" import compounds_table %} -{% from "variant/utils.html" import causative_button, genes_panel, modal_causative, overlapping_panel, pin_button, proteins_panel, transcripts_panel %} +{% from "variant/utils.html" import causative_button, genes_panel, modal_causative, overlapping_panel, pin_button, proteins_panel, transcripts_panel, custom_annotations %} {% from "variant/tx_overview.html" import disease_associated, transcripts_overview %} {% from "variant/gene_disease_relations.html" import autozygosity_panel, genemodels_panel, inheritance_panel, orpha_omim_phenotypes %} {% from "variant/variant_details.html" import frequencies, gtcall_panel, old_observations, observations_panel, severity_list, conservations, mappability %} @@ -398,25 +398,14 @@
    {{ image.title }}
    {{ database_buttons(variant) }} {% endif %} {{ alignments(institute, case, variant, current_user, config, igv_tracks, has_rna_tracks) }} + + {% if variant.custom %} - - - - - - - {% for pair in variant.custom %} - - - - - {% endfor %} - -
    Custom annotationValue
    - {{ pair[0] }} - - {{ pair[1] }} -
    + {% endif %}