scout-browser 4.82.2__py3-none-any.whl → 4.83__py3-none-any.whl

scout/server/blueprints/cases/controllers.py

@@ -48,6 +48,7 @@ from scout.server.utils import (
     case_has_chanjo2_coverage,
     case_has_chanjo_coverage,
     case_has_mt_alignments,
+    case_has_mtdna_report,
     case_has_rna_tracks,
     institute_and_case,
 )
@@ -62,6 +63,8 @@ JSON_HEADERS = {
 
 COVERAGE_REPORT_TIMEOUT = 20
 
+PANEL_PROJECTION = {"version": 1, "display_name": 1, "genes": 1}
+
 
 def phenomizer_diseases(hpo_ids, case_obj, p_value_treshold=1):
     """Return the list of HGNC symbols that match annotated HPO terms on Phenomizer
@@ -278,22 +281,16 @@ def sma_case(store, institute_obj, case_obj):
     return data
 
 
-def case(store, institute_obj, case_obj):
+def case(
+    store: MongoAdapter, institute_obj: dict, case_obj: dict, hide_matching: bool = True
+) -> dict:
     """Preprocess a single case.
 
     Prepare the case to be displayed in the case view.
 
-    Args:
-        store(adapter.MongoAdapter)
-        institute_obj(models.Institute)
-        case_obj(models.Case)
-
-    Returns:
-        data(dict): includes the cases, how many there are and the limit.
-
+    The return data dict includes the cases, how many there are and the limit.
     """
     # Convert individual information to more readable format
-
     _populate_case_individuals(case_obj)
 
     case_obj["assignees"] = [
@@ -305,6 +302,7 @@ def case(store, institute_obj, case_obj):
     case_has_mt_alignments(case_obj)
     case_has_chanjo_coverage(case_obj)
     case_has_chanjo2_coverage(case_obj)
+    case_has_mtdna_report(case_obj)
 
     case_groups = {}
     case_group_label = {}
@@ -395,31 +393,40 @@ def case(store, institute_obj, case_obj):
             "case_images", case_obj["custom_images"].get("case", {})
         )
 
-    # Limit secondary findings according to institute settings
-    limit_genes = store.safe_genes_filter(institute_obj["_id"])
+    other_causatives = []
+    other_causatives_in_default_panels = []
+    default_managed_variants = []
+    managed_variants = []
 
-    limit_genes_default_panels = _limit_genes_on_default_panels(
-        case_obj["default_genes"], limit_genes
-    )
+    if hide_matching is False:
+        # Limit secondary findings according to institute settings
+        limit_genes = store.safe_genes_filter(institute_obj["_id"])
 
-    other_causatives, other_causatives_in_default_panels = _matching_causatives(
-        store, case_obj, limit_genes, limit_genes_default_panels
-    )
+        limit_genes_default_panels = _limit_genes_on_default_panels(
+            case_obj["default_genes"], limit_genes
+        )
 
-    data = {
-        "institute": institute_obj,
-        "case": case_obj,
-        "other_causatives": other_causatives,
-        "default_other_causatives": other_causatives_in_default_panels,
-        "managed_variants": [
+        other_causatives, other_causatives_in_default_panels = _matching_causatives(
+            store, case_obj, limit_genes, limit_genes_default_panels
+        )
+
+        managed_variants = [
             var for var in store.check_managed(case_obj=case_obj, limit_genes=limit_genes)
-        ],
-        "default_managed_variants": [
+        ]
+        default_managed_variants = [
             var
             for var in store.check_managed(
                 case_obj=case_obj, limit_genes=limit_genes_default_panels
             )
-        ],
+        ]
+
+    data = {
+        "institute": institute_obj,
+        "case": case_obj,
+        "other_causatives": other_causatives,
+        "default_other_causatives": other_causatives_in_default_panels,
+        "managed_variants": managed_variants,
+        "default_managed_variants": default_managed_variants,
         "comments": store.events(institute_obj, case=case_obj, comments=True),
         "hpo_groups": pheno_groups,
         "case_groups": case_groups,
@@ -441,6 +448,7 @@ def case(store, institute_obj, case_obj):
         "mme_nodes": matchmaker.connected_nodes,
         "gens_info": gens.connection_settings(case_obj.get("genome_build")),
         "display_rerunner": rerunner.connection_settings.get("display", False),
+        "hide_matching": hide_matching,
     }
 
     return data
@@ -496,8 +504,12 @@ def _get_default_panel_genes(store: MongoAdapter, case_obj: dict) -> list:
             continue
         panel_name = panel_info["panel_name"]
         panel_version = panel_info.get("version")
-        panel_obj = store.gene_panel(panel_name, version=panel_version)
-        latest_panel = store.gene_panel(panel_name)
+        panel_obj = store.gene_panel(
+            panel_name,
+            version=panel_version,
+            projection=PANEL_PROJECTION,
+        )
+        latest_panel = store.gene_panel(panel_name, projection=PANEL_PROJECTION)
         panel_info["removed"] = False if latest_panel is None else latest_panel.get("hidden", False)
         if not panel_obj:
             panel_obj = latest_panel
@@ -555,19 +567,17 @@ def check_outdated_gene_panel(panel_obj, latest_panel):
         missing_genes, extra_genes
     """
     # Create a list of minified gene object for the case panel {hgnc_id, gene_symbol}
-    case_panel_genes = [
-        {"hgnc_id": gene["hgnc_id"], "symbol": gene.get("symbol", gene["hgnc_id"])}
-        for gene in panel_obj["genes"]
-    ]
+    case_panel_genes = set([gene.get("symbol", gene["hgnc_id"]) for gene in panel_obj["genes"]])
     # And for the latest panel
-    latest_panel_genes = [
-        {"hgnc_id": gene["hgnc_id"], "symbol": gene.get("symbol", gene["hgnc_id"])}
-        for gene in latest_panel["genes"]
-    ]
+    latest_panel_genes = set(
+        [gene.get("symbol", gene["hgnc_id"]) for gene in latest_panel["genes"]]
+    )
     # Extract the genes unique to case panel
-    extra_genes = [gene["symbol"] for gene in case_panel_genes if gene not in latest_panel_genes]
+    extra_genes = case_panel_genes.difference(latest_panel_genes)
+
     # Extract the genes unique to latest panel
-    missing_genes = [gene["symbol"] for gene in latest_panel_genes if gene not in case_panel_genes]
+    missing_genes = latest_panel_genes.difference(case_panel_genes)
+
     return extra_genes, missing_genes
 
 
@@ -674,7 +684,7 @@ def case_report_content(store: MongoAdapter, institute_obj: dict, case_obj: dict
     return data
 
 
-def mt_coverage_stats(individuals, ref_chrom="14"):
+def mt_coverage_stats(individuals, ref_chrom="14") -> dict:
     """Send a request to chanjo report endpoint to retrieve MT vs autosome coverage stats
 
     Args:
@@ -732,10 +742,9 @@ def mt_excel_files(store, case_obj, temp_excel_dir):
     """
     today = datetime.datetime.now().strftime(DATE_DAY_FORMATTER)
     samples = case_obj.get("individuals")
-    file_header = MT_EXPORT_HEADER
     coverage_stats = None
     # if chanjo connection is established, include MT vs AUTOSOME coverage stats
-    if current_app.config.get("SQLALCHEMY_DATABASE_URI"):
+    if current_app.config.get("chanjo_report"):
         coverage_stats = mt_coverage_stats(samples)
 
     query = {"chrom": "MT"}
@@ -765,9 +774,8 @@ def mt_excel_files(store, case_obj, temp_excel_dir):
             for col, field in enumerate(line):  # each field in line becomes a cell
                 Report_Sheet.write(row, col, field)
 
-        if bool(
-            coverage_stats
-        ):  # it's None if app is not connected to Chanjo or {} if samples are not in Chanjo db
+        # coverage_stats is None if app is not connected to Chanjo or {} if samples are not in Chanjo db
+        if coverage_stats and sample_id in coverage_stats:
             # Write coverage stats header after introducing 2 empty lines
             for col, field in enumerate(MT_COV_STATS_HEADER):
                 Report_Sheet.write(row + 3, col, field)
@@ -805,27 +813,6 @@ def update_synopsis(store, institute_obj, case_obj, user_obj, new_synopsis):
         store.update_synopsis(institute_obj, case_obj, user_obj, link, content=new_synopsis)
 
 
-def _update_case(store, case_obj, user_obj, institute_obj, verb):
-    """Update case with new sample data, and create an associated event"""
-    store.update_case(case_obj, keep_date=True)
-
-    link = url_for(
-        "cases.case",
-        institute_id=institute_obj["_id"],
-        case_name=case_obj["display_name"],
-    )
-
-    store.create_event(
-        institute=institute_obj,
-        case=case_obj,
-        user=user_obj,
-        link=link,
-        category="case",
-        verb=verb,
-        subject=case_obj["display_name"],
-    )
-
-
 def update_individuals(store, institute_obj, case_obj, user_obj, ind, age, tissue):
     """Handle update of individual data (age and/or Tissue type) for a case"""
 
@@ -841,8 +828,13 @@ def update_individuals(store, institute_obj, case_obj, user_obj, ind, age, tissu
 
     case_obj["individuals"] = case_individuals
 
-    verb = "update_individual"
-    _update_case(store, case_obj, user_obj, institute_obj, verb)
+    link = url_for(
+        "cases.case",
+        institute_id=institute_obj["_id"],
+        case_name=case_obj["display_name"],
+    )
+
+    store.update_case_individual(case_obj, user_obj, institute_obj, link)
 
 
 def update_cancer_samples(
@@ -866,8 +858,13 @@ def update_cancer_samples(
 
     case_obj["individuals"] = case_samples
 
-    verb = "update_sample"
-    _update_case(store, case_obj, user_obj, institute_obj, verb)
+    link = url_for(
+        "cases.case",
+        institute_id=institute_obj["_id"],
+        case_name=case_obj["display_name"],
+    )
+
+    store.update_case_sample(case_obj, user_obj, institute_obj, link)
 
 
 def _all_hpo_gene_list_genes(
@@ -1431,13 +1428,13 @@ def _matching_causatives(
     other_causatives_in_default_panels = []
 
     for causative in matching_causatives:
-        hgnc_ids = [gene.get("hgnc_id") for gene in causative.get("genes", [])]
+        hgnc_ids = {gene.get("hgnc_id") for gene in causative.get("genes", [])}
         # Fetch all matching causatives if no causatives_filter defined
         # or only causatives matching the filter:
-        if not other_causatives_filter or (set(hgnc_ids) & set(other_causatives_filter)):
+        if not other_causatives_filter or (hgnc_ids & set(other_causatives_filter)):
             other_causatives.append(causative)
         # Only matching causatives in default gene panels:
-        if set(hgnc_ids) & set(other_causatives_in_default_panels_filter):
+        if hgnc_ids & set(other_causatives_in_default_panels_filter):
             other_causatives_in_default_panels.append(causative)
 
     return other_causatives, other_causatives_in_default_panels

scout/server/blueprints/cases/templates/cases/case.html

@@ -120,30 +120,46 @@
       </div>
 
       <div class="card panel-default" >
-      {% if other_causatives|length > 0%}
         <div class="row mt-0">
-          <div class="col-xs-12 col-md-12">{{ matching_causatives(other_causatives, institute, case) }}</div>
-        </div>
-      {% endif %}
-      {% if default_other_causatives|length > 0%}
-        <div class="row mt-0">
-          <div class="col-xs-12 col-md-12">{{ matching_causatives(default_other_causatives, institute, case, default=True) }}</div>
-        </div>
-      {% endif %}
-
-      {% if managed_variants|length > 0%}
-        <div class="row mt-0">
-          <div class="col-sm-12 col-md-12">{{ matching_managed_variants(managed_variants, institute, case) }}</div>
-        </div>
-      {% endif %}
-
-      {% if default_managed_variants|length > 0%}
-        <div class="row mt-0">
-          <div class="col-sm-12 col-md-12">{{ matching_managed_variants(default_managed_variants, institute, case, default=True) }}</div>
+          <div class="col-sm-12 col-md-12 ms-3">
+           <div data-bs-toggle='tooltip' class="panel-heading" title="Check if there are any variants in this case
+              marked as causative in another case for this institute, or are on the managed variants list.">
+             <strong>{% if hide_matching == false %}
+               <a href="{{ url_for('cases.case', institute_id=institute._id, case_name=case.display_name, hide_matching='True') }}" class="text-body"><span class="me-1 fa fa-caret-right"></span>Search for matching causatives and managed variants</a>
+             {% else %}
+               <a href="{{ url_for('cases.case', institute_id=institute._id, case_name=case.display_name, hide_matching='False') }}" class="text-body"><span class="me-1 fa fa-caret-down"></span>Search for matching causatives and managed variants</a>
+             {% endif %}
+             </strong>
+           </div>
+          </div>
         </div>
+        {% if hide_matching == false %}
+        {% if other_causatives|length > 0 %}
+          <div class="row mt-0 ms-3">
+            <div class="col-xs-12 col-md-12 ms-3">{{ matching_causatives(other_causatives, institute, case) }}</div>
+          </div>
+        {% endif %}
+        {% if default_other_causatives|length > 0%}
+          <div class="row mt-0 ms-3">
+            <div class="col-xs-12 col-md-12 ms-3">{{ matching_causatives(default_other_causatives, institute, case, default=True) }}</div>
+          </div>
+        {% endif %}
+        {% if managed_variants|length > 0%}
+          <div class="row mt-0 ms-3">
+            <div class="col-sm-12 col-md-12 ms-3">{{ matching_managed_variants(managed_variants, institute, case) }}</div>
+          </div>
+        {% endif %}
+        {% if default_managed_variants|length > 0%}
+          <div class="row mt-0 ms-3">
+            <div class="col-sm-12 col-md-12 ms-3">{{ matching_managed_variants(default_managed_variants, institute, case, default=True) }}</div>
+          </div>
+        {% endif %}
+        {% if other_causatives|length == 0 and default_other_causatives|length == 0 and managed_variants|length == 0 and default_managed_variants|length == 0%}
+          <div class="row mt-0 ms-3">
+            <div class="col-sm-12 col-md-12 ms-3">No matching causatives or managed variants found</div>
+          </div>
+        {% endif %}
       {% endif %}
-      </div>
-
       <div class="row">
         <div class="col">{{ causatives_list(causatives, partial_causatives, evaluated_variants, institute, case, manual_rank_options, cancer_tier_options) }}</div>
         <div class="col">{{ suspects_list(suspects, institute, case, manual_rank_options, cancer_tier_options) }}</div>

scout/server/blueprints/cases/templates/cases/collapsible_actionbar.html

@@ -108,7 +108,7 @@
     {% endif %}
 
     <!-- Display mtDNA report for non-cancer cases -->
-    {% if case.track != "cancer" %}
+    {% if case.mtdna_report %}
     <div href="#" class="bg-dark list-group-item text-white">
       <div class="d-flex flex-row flex-fill bd-highlight">
         <div>

scout/server/blueprints/cases/templates/cases/phenotype.html

@@ -236,11 +236,13 @@
       <!-- Display and remove added HPO terms -->
       <div class="row mt-3">
         <div class="col-12 ms-3">
-          {% for hpo_term in case.phenotype_terms %}
-            {{ hpo_item(hpo_term, case) }}
-          {% else %}
-            <span class="text-mute">No phenotypes added yet</span>
-          {% endfor %}
+         {% if "phenotype_terms" in case and case.phenotype_terms|length > 0 %}
+           {% for hpo_term in case.phenotype_terms %}
+             {{ hpo_item(hpo_term, case) }}
+           {% endfor %}
+         {% else %}
+           <span class="text-mute">No phenotypes added yet</span>
+         {% endif %}
         </div>
       </div>
 
@@ -251,7 +253,7 @@
             <input class="ms-3" name="min_match" type="number" min="0" step="1" placeholder="Min matches" style="width:130px"/>
             {% if config.PHENOMIZER_USERNAME %}
               <button class="btn btn-secondary btn-sm" type="submit" name="action" value="PHENOMIZER"
-              {%if case.phenotype_terms|length == 0 %} disabled {%endif%}>Phenomizer</button>
+              {% if "phenotype_terms" not in case or case.phenotype_terms|length == 0 %} disabled {% endif %}>Phenomizer</button>
             {% endif %}
           </div>
           <div class="col-1">

scout/server/blueprints/cases/templates/cases/utils.html

@@ -633,8 +633,8 @@
 
 {% macro matching_causatives(other_causatives, institute, case, default=False) %}
     <div data-bs-toggle='tooltip' class="panel-heading" title="If there are any variants in this case
-      that have been marked as causative in another case for this insitute. {% if default %}Variants in default panels for the case only.{% endif %}">
-      <strong><a data-bs-toggle="collapse" href="#matchingCausatives{% if default %}Default{% endif %}" class="text-body">Matching causatives {% if default %}in case default panels{% endif %}({{other_causatives|length}})</a></strong>
+      matching a causative in another case for this institute. {% if default %}Variants in default panels for the case only.{% endif %}">
+      <strong><a data-bs-toggle="collapse" href="#matchingCausatives{% if default %}Default{% endif %}" class="text-body" aria-expanded="false"><span class="collapse-icon me-1"></span>Matching causatives {% if default %}in case default panels{% endif %}({{other_causatives|length}})</a></strong>
     </div>
     <ul class="list-group collapse" id="matchingCausatives{% if default %}Default{% endif %}">
       {% for variant in other_causatives %}
@@ -650,7 +650,7 @@
 {% macro matching_managed_variants(managed_variants, institute, case, default=False) %}
     <div data-bs-toggle='tooltip' class="panel-heading" title="Any variants in this case
       that have been marked as managed. {% if default %}Variants in default panels for the case only.{% endif %}">
-      <strong><a data-bs-toggle="collapse" class="text-body" href="#matchingManaged{% if default %}Default{% endif %}">Managed variants {% if default %}in case default panels{% endif %}({{managed_variants|length}})</a></strong>
+      <strong><a data-bs-toggle="collapse" class="text-body" href="#matchingManaged{% if default %}Default{% endif %}" aria-expanded="false"><span class="collapse-icon me-1"></span>Managed variants {% if default %}in case default panels{% endif %}({{managed_variants|length}})</a></strong>
     </div>
     <ul class="list-group">
       {% for variant in managed_variants %}

scout/server/blueprints/cases/views.py

@@ -4,6 +4,7 @@ import json
 import logging
 import os.path
 import shutil
+from ast import literal_eval
 from io import BytesIO
 from operator import itemgetter
 from typing import Generator, Optional, Union
@@ -86,7 +87,6 @@ def case(
     So do case_id, but we still call institute_and_case again to fetch institute
     and reuse its user access verification.
     """
-
     if case_id:
         case_obj = store.case(case_id=case_id, projection={"display_name": 1, "owner": 1})
 
@@ -102,7 +102,12 @@ def case(
         flash("Case {} does not exist in database!".format(case_name))
         return redirect(request.referrer)
 
-    data = controllers.case(store, institute_obj, case_obj)
+    hide_matching = (
+        literal_eval(request.args.get("hide_matching"))
+        if request.args.get("hide_matching")
+        else True
+    )
+    data = controllers.case(store, institute_obj, case_obj, hide_matching)
 
     return dict(
         **data,
@@ -271,10 +276,7 @@ def pdf_case_report(institute_id, case_name):
         store=store, institute_obj=institute_obj, case_obj=case_obj
     )
     # add coverage report on the bottom of this report
-    if (
-        current_app.config.get("SQLALCHEMY_DATABASE_URI")
-        and case_obj.get("track", "rare") != "cancer"
-    ):
+    if current_app.config.get("chanjo_report") and case_obj.get("track", "rare") != "cancer":
         data["coverage_report"] = controllers.coverage_report_contents(
             request.url_root, institute_obj, case_obj
         )

scout/server/blueprints/variant/controllers.py

@@ -28,7 +28,7 @@ from scout.server.blueprints.variant.utils import (
     update_variant_case_panels,
 )
 from scout.server.blueprints.variants.utils import update_case_panels
-from scout.server.extensions import LoqusDB, cloud_tracks, gens
+from scout.server.extensions import LoqusDB, config_igv_tracks, gens
 from scout.server.links import disease_link, get_variant_links
 from scout.server.utils import (
     case_has_alignments,
@@ -142,9 +142,9 @@ def get_igv_tracks(build: str = "37") -> set:
     # Collect hardcoded tracks, common for all Scout instances
     for track in IGV_TRACKS.get(build, []):
         igv_tracks.add(track.get("name"))
-    # Collect instance-specif cloud public tracks, if available
-    if hasattr(cloud_tracks, "public_tracks"):
-        for track in cloud_tracks.public_tracks.get(build, []):
+    # Collect instance-specific public tracks, if available
+    if hasattr(config_igv_tracks, "tracks"):
+        for track in config_igv_tracks.tracks.get(build, []):
             igv_tracks.add(track.get("name"))
     return igv_tracks
 
@@ -372,7 +372,7 @@ def variant(
         "ACMG_OPTIONS": ACMG_OPTIONS,
         "case_tag_options": CASE_TAGS,
         "inherit_palette": INHERITANCE_PALETTE,
-        "igv_tracks": get_igv_tracks(genome_build),
+        "igv_tracks": get_igv_tracks("38" if variant_obj["is_mitochondrial"] else genome_build),
         "has_rna_tracks": case_has_rna_tracks(case_obj),
         "gens_info": gens.connection_settings(genome_build),
         "evaluations": evaluations,

scout/server/blueprints/variant/templates/variant/acmg.html

@@ -29,22 +29,27 @@
     <form action="{{ url_for('variant.variant_acmg', institute_id=institute._id, case_name=case.display_name, variant_id=variant._id) }}" method="POST">
       <div class="card panel-default mt-3">
         <div class="card-body">
-          {% if not evaluation %}
-              <div class="mt-3 fixed-bottom bg-light border">
-                <div class="text-center">
-                  {% for option in ACMG_OPTIONS %}
-                    <a id="acmg-{{ option.code }}" class="btn acmg-preview">{{ option.label }}</a>
-                  {% endfor %}
-                </div>
-              </div>
-            <button class="btn btn-primary form-control">Submit</button>
-          {% else %}
-            <h4>
+          {% if evaluation %}
+             <h4>
               {{ evaluation.classification.label }}
               <span class="badge bg-info">{{ evaluation.classification.short }}</span>
             </h4>
             By {{ evaluation.user_name }} on {{ evaluation.created_at.date() }}
+            {% if edit %}
+              <br><br>
+              <button class="btn btn-primary form-control" data-bs-toggle="tooltip" title="Editing this classification will result in a new classification">Reclassify</button>
+            {% endif %}
+          {% elif not evaluation %}
+            <button class="btn btn-primary form-control">Submit</button>
           {% endif %}
+          <!-- classification preview in the footer-->
+          <div class="mt-3 fixed-bottom bg-light border">
+              <div class="text-center">
+                {% for option in ACMG_OPTIONS %}
+                  <a id="acmg-{{ option.code }}" class="btn acmg-preview">{{ option.label }}</a>
+                {% endfor %}
+              </div>
+          </div>
         </div>
       </div>
 
@@ -72,14 +77,14 @@
                         {{ criterion.short }}
                       </div>
                       <div class="form-check form-switch">
-                        <input type="checkbox" class="form-check-input" id="checkbox-{{ criterion_code }}" name="criteria" value="{{ criterion_code }}" {{ 'checked' if evaluation and criterion_code in evaluation.criteria }} {{ 'disabled' if evaluation }}>
+                        <input type="checkbox" class="form-check-input" id="checkbox-{{ criterion_code }}" name="criteria" value="{{ criterion_code }}" {{ 'checked' if evaluation and criterion_code in evaluation.criteria }} {{ 'disabled' if evaluation and edit is false}}>
                         <label class="form-check-label" for="checkbox-{{ criterion_code }}"></label>
                       </div>
                     </div>
                     <div id="comment-{{ criterion_code }}" class="{{ 'collapse' if not (comment or link or modifier) }} mt-2">
                       {% if criterion.documentation %}<div class="row"><span class="me-1 fw-light text-wrap">{{ criterion.documentation | safe}}</span></div>{% endif %}
                       <div class="row">
-                        <select {{ 'disabled' if evaluation }} id="modifier-{{ criterion_code }}" name="modifier-{{ criterion_code }}" class="form-control form-select">
+                        <select {{ 'disabled' if evaluation and edit is false}} id="modifier-{{ criterion_code }}" name="modifier-{{ criterion_code }}" class="form-control form-select">
                           <option value="" {% if not modifier %}selected{% endif %}>Strength modifier...</option>
                           {% for level in "Strong", "Moderate", "Supporting" %}
                             {% if(level != evidence) %}
@@ -89,10 +94,10 @@
                         </select>
                       </div>
                       <div class="row">
-                        <textarea {{ 'disabled' if evaluation }} class="form-control"
+                        <textarea {{ 'disabled' if evaluation and edit is false }} class="form-control"
                           name="comment-{{ criterion_code }}" rows="3" placeholder="Comment (optional)">{{ comment }}</textarea>
                       </div>
-                      <input type="url" {{ 'disabled' if evaluation }} class="form-control" name="link-{{ criterion_code }}"
+                      <input type="url" {{ 'disabled' if evaluation and edit is false }} class="form-control" name="link-{{ criterion_code }}"
                         placeholder="{{ link or 'Supporting link (optional)' }}" value="">
                     </div>
                   </div>
@@ -120,6 +125,11 @@
   {{ super() }}
 
   <script>
+
+    window.onload=function() {
+        update_classification();
+    }
+
     $(function () {
       $('[data-bs-toggle="tooltip"]').tooltip();
 
@@ -130,7 +140,6 @@
         } else {
           el.collapse('hide');
         }
-
         update_classification()
       });
 

scout/server/blueprints/variant/templates/variant/components.html

@@ -49,14 +49,19 @@
         {% endif %}
       </span>
     </div>
-    <small class="text-muted">
-      <form action="{{ url_for('variant.evaluation', evaluation_id=data._id) }}" method="POST">
+    <span>
+      <small class="text-muted">
       {{ data.user_name }} on {{ data.created_at.date() }}
       {% if current_variant %}
-        <button class="btn btn-xs btn-link">Delete</button>
+          <form action="{{ url_for('variant.evaluation', evaluation_id=data._id) }}" method="POST" style="display: inline-block;">
+            <button class="btn btn-xs btn-link" >Delete</button>
+          </form>
+          {% if data.criteria %}
+            <a class="btn btn-xs btn-link" href="{{ url_for('variant.evaluation', evaluation_id=data._id, edit=True) }}" data-bs-toggle="tooltip" title="Editing this classification will result in a new classification">Edit</a>
+          {% endif %}
       {% endif %}
-      </form>
-    </small>
+      </small>
+    </span>
   </li>
 {% endmacro %}
 
@@ -90,7 +95,7 @@
             {% endif %}
             </div>
           {% endfor %}
-          {% if config.SQLALCHEMY_DATABASE_URI %}
+          {% if config.chanjo_report %}
             <div class="d-flex flex-wrap ms-1">
               {% for gene in variant.genes %}
                 <a class="btn btn-sm btn-secondary text-white" rel="noopener noreferrer" target="_blank" href="{{ url_for('report.gene', gene_id=gene.hgnc_id, sample_id=variant.samples|map(attribute='sample_id')|list) }}">

scout/server/blueprints/variant/views.py

@@ -13,7 +13,7 @@ from flask import (
 from flask_login import current_user
 from markupsafe import Markup
 
-from scout.constants import ACMG_CRITERIA, ACMG_MAP
+from scout.constants import ACMG_CRITERIA, ACMG_MAP, ACMG_OPTIONS
 from scout.server.blueprints.variant.controllers import check_reset_variant_classification
 from scout.server.blueprints.variant.controllers import evaluation as evaluation_controller
 from scout.server.blueprints.variant.controllers import observations, str_variant_reviewer
@@ -308,7 +308,7 @@ def variant_update(institute_id, case_name, variant_id):
 @variant_bp.route("/evaluations/<evaluation_id>", methods=["GET", "POST"])
 @templated("variant/acmg.html")
 def evaluation(evaluation_id):
-    """Show or delete an ACMG evaluation."""
+    """Show, edit or delete an ACMG evaluation."""
 
     evaluation_obj = store.get_evaluation(evaluation_id)
     if evaluation_obj is None:
@@ -328,12 +328,15 @@ def evaluation(evaluation_id):
             flash("Cleared ACMG classification.", "info")
 
         return redirect(link)
+
     return dict(
         evaluation=evaluation_obj,
+        edit=bool(request.args.get("edit")),
         institute=evaluation_obj["institute"],
         case=evaluation_obj["case"],
         variant=evaluation_obj["variant"],
         CRITERIA=ACMG_CRITERIA,
+        ACMG_OPTIONS=ACMG_OPTIONS,
     )
 
 

scout/server/blueprints/variants/controllers.py

@@ -1996,7 +1996,7 @@ def activate_case(store, institute_obj, case_obj, current_user):
         store.update_status(institute_obj, case_obj, user_obj, "active", case_link)
 
 
-def reset_all_dimissed(store, institute_obj, case_obj):
+def reset_all_dismissed(store, institute_obj, case_obj):
     """Reset all dismissed variants for a case.
 
     Args:

scout/server/blueprints/variants/views.py

@@ -47,7 +47,7 @@ variants_bp = Blueprint(
 def reset_dismissed(institute_id, case_name):
     """Reset all dismissed variants for a case"""
     institute_obj, case_obj = institute_and_case(store, institute_id, case_name)
-    controllers.reset_all_dimissed(store, institute_obj, case_obj)
+    controllers.reset_all_dismissed(store, institute_obj, case_obj)
     return redirect(request.referrer)