Merge pull request #914 from aanil/revamp_reports

Bugfix for reports path on ONT FC page
NationalGenomicsInfrastructure · Jan 23, 2025 · 3d842f9 · 3d842f9
2 parents 56fa0cf + f92292f
commit 3d842f9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/run_dir/design/project_samples_old.html b/run_dir/design/project_samples_old.html
@@ -141,22 +141,20 @@ <h4>User project description
           <a class="dropdown-item" href="#" disabled>No reports to show</a>
         {% end %}
         {% if 'multiqc' in reports%}
-        <h6 class="dropdown-header">MultiQC Reports</h6>
         {% for key in reports['multiqc'] %}
           {% if 'qc' in key %}
             {% set rep_name = ' QC' %}
           {% else %}
             {% set rep_name = ' '+key.strip('_').capitalize() %}
           {% end %}
-         <a class="dropdown-item" href="/multiqc_report/{{ project }}?type={{ key }}" target="_blank">Open{{ rep_name }} MultiQC report</a>
+         <a class="dropdown-item" href="/multiqc_report/{{ project }}?type={{ key }}" target="_blank">MultiQC {{ rep_name }}</a>
          {% end %}
         {% end %}
         {% if 'project_summary' in reports %}
-          <h6 class="dropdown-header">Project Summary Report</h6>
-          <a class="dropdown-item" href="/proj_summary_report/{{ project }}" target="_blank">Open Project Summary report</a>
+          <a class="dropdown-item" href="/proj_summary_report/{{ project }}" target="_blank">Project Summary</a>
         {% end %}
         {% if 'sample_summary_reports' in reports %}
-        <h6 class="dropdown-header">Single Cell Sample Summary Reports</h6>
+        <h6 class="dropdown-header">Single Cell Sample Summary</h6>
           {% for sample in reports['sample_summary_reports'] %}
           <a class="dropdown-item" href="/singlecell_sample_summary_report/{{ project }}/{{ sample }}" target="_blank"> {{ sample}} </a>
           {% end %}

diff --git a/status/flowcell.py b/status/flowcell.py
@@ -760,10 +760,19 @@ def get(self, name):
                 barcodes=self.fetch_barcodes(name),
                 args=self.fetch_args(name),
                 has_minknow_report=os.path.exists(
-                    f"{self.application.minknow_reports_path}/report_{name}.html"
+                    os.path.join(
+                        self.application.reports_path,
+                        "minknow_reports",
+                        f"report_{name}.html",
+                    )
                 ),
                 has_toulligqc_report=os.path.exists(
-                    f"{self.application.toulligqc_reports_path}/report_{name}.html"
+                    os.path.join(
+                        self.application.reports_path,
+                        "other_reports",
+                        "toulligqc_reports",
+                        f"report_{name}.html",
+                    )
                 ),
                 user=self.get_current_user(),
             )