From 9ed97640d0c5c8f8d46e5c97ee0b0dcd8ca0711d Mon Sep 17 00:00:00 2001
From: Daniel Nilsson <daniel.k.nilsson@gmail.com>
Date: Fri, 22 Nov 2024 10:04:43 +0100
Subject: [PATCH] Fix #5058 - structural variantS header (#5059)

---
 CHANGELOG.md                                           |  3 ++-
 .../templates/variants/cancer-sv-variants.html         |  8 ++++----
 .../variants/templates/variants/sv-variants.html       | 10 +++-------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ac31577b4..70490b8989 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,8 +5,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 About changelog [here](https://keepachangelog.com/en/1.0.0/)
 
 ## [unreleased]
-### Changed
+### Fixed
 - Update IGV.js to v3.1.0
+- Columns/headings on SV variantS shifted
 
 ## [4.91]
 ### Added
diff --git a/scout/server/blueprints/variants/templates/variants/cancer-sv-variants.html b/scout/server/blueprints/variants/templates/variants/cancer-sv-variants.html
index 4741c5b206..9df5775c13 100644
--- a/scout/server/blueprints/variants/templates/variants/cancer-sv-variants.html
+++ b/scout/server/blueprints/variants/templates/variants/cancer-sv-variants.html
@@ -58,8 +58,8 @@
           <tr>
             <th style="width:2%"></th>
             <th style="width:3%">Index</th>
-            <th>Type</th>
             <th style="width:9%">Callers</th>
+            <th>Type</th>
             <th style="width:5%">Chr</th>
             <th>Start</th>
             <th>End</th>
@@ -77,7 +77,7 @@
             {{ variant_row(variant) }}
           {% else %}
             <tr>
-                <td colspan="13">No matching variants</td>
+                <td colspan="14">No matching variants</td>
             </tr>
           {% endfor %}
         </tbody>
@@ -105,10 +105,10 @@
       {{ cell_rank(variant, institute, case, form, manual_rank_options) }}
     </td>
     <td>
-      {{ variant.sub_category|upper }}
+      {{ callers_cell(variant) }}
     </td>
     <td>
-      {{ callers_cell(variant) }}
+      {{ variant.sub_category|upper }}
     </td>
     <td>{{ variant.chromosome if variant.chromosome == variant.end_chrom else variant.chromosome+'-'+variant.end_chrom }}</td>
     <td class="col-2"><span style="white-space: nowrap;">{{ variant.position|human_longint|safe }}</span></td>
diff --git a/scout/server/blueprints/variants/templates/variants/sv-variants.html b/scout/server/blueprints/variants/templates/variants/sv-variants.html
index 63a91ab5b7..8fb96255c6 100644
--- a/scout/server/blueprints/variants/templates/variants/sv-variants.html
+++ b/scout/server/blueprints/variants/templates/variants/sv-variants.html
@@ -59,8 +59,8 @@
             <th style="width:3%"></th>
             <th>Rank</th>
             <th>Score</th>
-            <th>Type</th>
             <th>Callers</th>
+            <th>Type</th>
             <th>Chr</th>
             <th>Start</th>
             <th>End</th>
@@ -76,7 +76,7 @@
             {{ variant_row(variant, inherit_palette) }}
           {% else %}
             <tr>
-                <td colspan="11">No matching variants</td>
+                <td colspan="13">No matching variants</td>
             </tr>
           {% endfor %}
         </tbody>
@@ -103,14 +103,10 @@
       {{ cell_rank(variant, institute, case, form, manual_rank_options) }}
     </td>
     <td class="text-end">{{ variant.rank_score|int }}</td>
-    <td>
-      {{ variant.sub_category|upper }}
-    </td>
     <td>
       {{ callers_cell(variant) }}
     </td>
-    <td><span data-bs-toggle="tooltip" data-bs-html="true" title="{% for name, caller in variant.callers %}{{ name }}: {{ caller }}<br>{% endfor %}">
-      {{ variant.sub_category|upper }}</span></td>
+    <td>{{ variant.sub_category|upper }}</td>
     <td>{{ variant.chromosome if variant.chromosome == variant.end_chrom else variant.chromosome+'-'+variant.end_chrom }}</td>
     <td><span style="white-space: nowrap;">{{ variant.position|human_longint|safe }}</span></td>
 <td><span style="white-space: nowrap;">{{ 'inf' if variant.end == 100000000000 else variant.end|human_longint|safe }}</span></td>