Merge branch 'main' into version_4.72.3

Clinical-Genomics · Oct 25, 2023 · b8e0149 · b8e0149
2 parents a5c5739 + e4bd724
commit b8e0149
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@ About changelog [here](https://keepachangelog.com/en/1.0.0/)
 
 ## [4.72.3]
 ### Fixed
-- Whichever fix for the crashing case report
+- Somatic general case report small variant table can crash with unclassified variants
 
 ## [4.72.2]
 ### Changed

diff --git a/scout/server/blueprints/cases/templates/cases/case_report.html b/scout/server/blueprints/cases/templates/cases/case_report.html
@@ -1334,12 +1334,16 @@ <h6 class="card-subtitle mb-2 text-muted"><span class="badge badge-warning">Part
           </tr>
         </thead>
         <tbody>
+
         {% for acmg in ["P","LP", "VUS", "LB", "B", ] %}
-          {% for variant in variants|selectattr("acmg_classification.short", "equalto", acmg)|selectattr("first_rep_gene.hgnc_symbol", "defined")|sort(attribute='first_rep_gene.hgnc_symbol')%}
+          {% for variant in variants|selectattr("acmg_classification", "defined")|selectattr("acmg_classification.short", "equalto", acmg)|selectattr("first_rep_gene.hgnc_symbol", "defined")|sort(attribute='first_rep_gene.hgnc_symbol') %}
             {{ variant_table_line(variant) }}
           {% endfor %}
         {% endfor %}
-        {% for variant in variants|selectattr("acmg_classification.short", "undefined")|selectattr("first_rep_gene.hgnc_symbol", "defined")|sort(attribute='first_rep_gene.hgnc_symbol') %}
+        {% for variant in variants|selectattr("acmg_classification", "defined")|selectattr("acmg_classification.short", "undefined")|selectattr("first_rep_gene.hgnc_symbol", "defined")|sort(attribute='first_rep_gene.hgnc_symbol') %}
+          {{ variant_table_line(variant) }}
+        {% endfor %}
+        {% for variant in variants|selectattr("acmg_classification", "undefined")|selectattr("first_rep_gene.hgnc_symbol", "defined")|sort(attribute='first_rep_gene.hgnc_symbol') %}
           {{ variant_table_line(variant) }}
         {% endfor %}
         {% for variant in variants|selectattr("first_rep_gene.hgnc_symbol", "undefined") %}
@@ -1382,13 +1386,13 @@ <h6 class="card-subtitle mb-2 text-muted"><span class="badge badge-warning">Part
     {% if variant.category in ['cancer_sv', 'sv'] %}
       chr {{ variant.end_chrom }}
     {% else %}
-      {{ variant.reference }}
+      {{ variant.reference|truncate(20, True) }}
     {% endif %}
   </td>
   <td>{% if variant.category in ['cancer_sv', 'sv'] %}
     end {{ variant.end }}
   {% else %}
-    {{ variant.alternative }}
+    {{ variant.alternative|truncate(20, True) }}
   {% endif %}
   </td>