Merge pull request #909 from aanil/samples_tab

Link to flowcells on instrument type
NationalGenomicsInfrastructure · Jan 8, 2025 · 9c4efc6 · 9c4efc6
2 parents 02502ff + 0752c48
commit 9c4efc6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/run_dir/design/deliveries.html b/run_dir/design/deliveries.html
@@ -145,7 +145,13 @@ <h3>
                 <td class="bioinfo-status-expand"><a href="#bioinfo-fc-{{ project_id }}-{{ flowcell_id }}" class="bioinfo-expand">
                     <span class="fa fa-chevron-right"></span></a></td>
                 <td></td>
-                <td class="bioinfo-granularity"><samp><a class="text-decoration-none" href="/flowcells/{{ flowcell_id }}">{{ flowcell_id }}</a></samp></td>
+                {% set url_addition = "" %}
+                {% if flowcell.get("instrument_type") == "element"%}
+                  {% set url_addition = "_element" %}
+                {% elif flowcell.get("instrument_type") == "ont"%}
+                  {% set url_addition = "_ont" %}
+                {% end %}
+                <td class="bioinfo-granularity"><samp><a class="text-decoration-none" href="/flowcells{{url_addition}}/{{ flowcell_id }}">{{ flowcell_id }}</a></samp></td>
                 <td><span class="bioinfo-status badge {{ status_css.get(flowcell['flowcell_status'], 'bg-primary') }}">{{ flowcell['flowcell_status'] }}</span></td>
                   <td class="bi-run-pwf hide-incoming {% if flowcell['checklist']['total'] == flowcell['checklist']['completed'] %} table-success {% else %} table-warning {% end %}">
                     <div class="progress">

diff --git a/status/deliveries.py b/status/deliveries.py
@@ -159,6 +159,7 @@ def get(self):
 
                             # define bioinfo checklist
                             sample_data = flowcells[flowcell_id][lane_id][sample_id]
+                            instrument_type = sample_data.get("instrument_type")
                             checklist = self.__fill_checklist(sample_data)
                             if checklist["total"] and len(checklist["total"]) == len(
                                 checklist["passed"]
@@ -233,6 +234,7 @@ def get(self):
                     flowcell_status = self.__aggregate_status(flowcell_statuses)
                     runs_bioinfo[flowcell_id]["flowcell_status"] = flowcell_status
                     runs_bioinfo[flowcell_id]["checklist"] = flowcell_checklists
+                    runs_bioinfo[flowcell_id]["instrument_type"] = instrument_type
 
                     # add flowcell_status to the status_list (needed for filtering)
                     if flowcell_status not in status_list:

diff --git a/status/running_notes.py b/status/running_notes.py
@@ -328,7 +328,7 @@ def notify_tagged_user(
                     html = '<html>\
                     <body>\
                     <p> \
-                    {} in the project <a href="{}/project/{}#{}">{}, {}</a>! The note is as follows</p>\
+                    {} in the project <a href="{}/project/{}#{}">{}, {}</a><br>The note is as follows</p>\
                     <blockquote>\
                     <div class="panel panel-default" style="border: 1px solid #e4e0e0; border-radius: 4px;">\
                     <div class="panel-heading" style="background-color: #f5f5f5; padding: 10px 15px;">\