Merge pull request #831 from wtsi-npg/devel

pull from devel to master to create release 101.2.0

Changes

@@ -1,8 +1,9 @@
 LIST OF CHANGES
 
-release 101.1.1
+release 101.2.0 (2024-05-24)
  - remove dependency on HTML::Tidy
  - update NovaSeqX icon
+ - Added a footer to the tracking run web page.
 
 release 101.1.0
  - Deleted npg_tracking::illumina::run::short_info and

data/npg_tracking_email/templates/wrapper.tt2

@@ -1,2 +1,5 @@
 [% content %]
-NPG on behalf of DNA Pipelines and GSLP
+
+If you have any questions or need further assistance, please feel free to reach out to a Scientific Service Representative at [email protected].
+
+NPG on behalf of DNA Pipelines

data/templates/run_read.tt2

@@ -157,6 +157,7 @@ IF ( ( current_status == 'qc review pending' ) || (current_status == 'qc in prog
 </div>
 
 <div class="widgets_group">
+
 <div id="tabs">
   <div id="tag_tab" class="tab noncurrent"><a href="javascript:void(toggle_information('tag_tab'));">Tags</a></div>
   <div id="status_history_tab" class="tab noncurrent"><a href="javascript:void(toggle_information('status_history_tab'));">Status History</a></div>
@@ -186,6 +187,15 @@ IF ( ( current_status == 'qc review pending' ) || (current_status == 'qc in prog
 <div id="annotation" class="info_box">
 [% PROCESS run_annotation_tables.tt2 %]
 </div>
+
+</div>
+
+<div id="email_link">
+[%- subject = 'Illumina sequencing run ' _ id_run -%]
+  If you have any questions or need further assistance, please feel free to reach out to a Scientific Service Representative at
+  <a href="mailto:[email protected]?subject=[% subject %]&body=[% subject %] [% staging_url %]/[% SCRIPT_NAME %]/run/[% id_run %]">
+    [email protected]
+  </a>
 </div>
 
 <script type="text/javascript">

htdocs/css/npg.css

@@ -75,6 +75,12 @@ div.widgets_group {
  margin-bottom: 10px;
 }
 
+div#email_link {
+ padding: 5px;
+ margin-top: 20px;
+ font-style: italic;
+}
+
 a.npg_menu {
  background-color: #D9D9D9;
  border:2px solid #a1a1a1;

t/80-npg_tracking-report-event2subscribers.t

@@ -17,6 +17,10 @@ Log::Log4perl->easy_init({layout => '%d %-5p %c - %m%n',
                           file   => $logfile,
                           utf8   => 1});
 
+my $footer = 'If you have any questions or need further assistance, ' .
+'please feel free to reach out to a Scientific Service Representative at ' .
+'[email protected].' . "\n\n" . 'NPG on behalf of DNA Pipelines';
+
 use_ok ('npg_tracking::report::event2subscribers');
 
 my $template_dir = 'data/npg_tracking_email/templates';
@@ -156,7 +160,8 @@ Run 21915 was assigned status "run pending" on 2017-02-08 11:49:39 by joe_events
 NPG page for this run:
 https://sfweb.internal.sanger.ac.uk:12443/perl/npg/run/21915
 
-NPG on behalf of DNA Pipelines and GSLP
+
+$footer
 REPORT
   is ($e->report_full(), $report, 'full report text');
 
@@ -173,7 +178,8 @@ $lims_summary
 NPG page for this run:
 https://sfweb.internal.sanger.ac.uk:12443/perl/npg/run/21915
 
-NPG on behalf of DNA Pipelines and GSLP
+
+$footer
 REPORT1
   is ($e->report_full($e->lims()), $report, 'full report text with LIMs data');
 
@@ -217,7 +223,8 @@ Instrument HS8 status changed to "wash performed" on $date_as_string by joe_appr
 NPG page for this instrument:
 https://sfweb.internal.sanger.ac.uk:12443/perl/npg/instrument/HS8
 
-NPG on behalf of DNA Pipelines and GSLP
+
+$footer
 REPORT2
   is ($e->report_full($e->lims()), $report, 'full report text');
 
@@ -231,7 +238,8 @@ Instrument HS8 status changed to "wash performed" on $date_as_string by joe_appr
 NPG page for this instrument:
 https://sfweb.internal.sanger.ac.uk:12443/perl/npg/instrument/HS8
 
-NPG on behalf of DNA Pipelines and GSLP
+
+$footer
 REPORT3
   is ($e->report_full($e->lims()), $report, 'full report text with a comment');
   is (scalar @{$e->reports}, 1, 'One report generated');
@@ -272,7 +280,8 @@ $lims_summary
 NPG page for this run:
 https://sfweb.internal.sanger.ac.uk:12443/perl/npg/run/21915
 
-NPG on behalf of DNA Pipelines and GSLP
+
+$footer
 REPORT4
   is ($e->report_full($e->lims()), $report, 'full report text with LIMs data');
 };
@@ -325,7 +334,8 @@ Lane 2: Samples
 NPG page for this run:
 https://sfweb.internal.sanger.ac.uk:12443/perl/npg/run/21915
 
-NPG on behalf of DNA Pipelines and GSLP
+
+$footer
 REPORT5
   is ($e->report_full($e->lims()), $report, 'full report text with LIMs data');
 };
@@ -362,7 +372,8 @@ Instrument HS8 annotated by joe_loader on $date_as_string - New instrument annot
 NPG page for this instrument:
 https://sfweb.internal.sanger.ac.uk:12443/perl/npg/instrument/HS8
 
-NPG on behalf of DNA Pipelines and GSLP
+
+$footer
 REPORT6
   is ($e->report_full($e->lims()), $report, 'full report text');
 };

t/data/report/report_text_1

@@ -36,5 +36,8 @@ https://sfweb.internal.sanger.ac.uk:12443/perl/npg/run/21915
 Analysis and QC information for this run will be/is available:
 http://sfweb.internal.sanger.ac.uk:1959/checks/runs/21915
 
-NPG on behalf of DNA Pipelines and GSLP
+
+If you have any questions or need further assistance, please feel free to reach out to a Scientific Service Representative at [email protected].
+
+NPG on behalf of DNA Pipelines
 

t/data/report/report_text_5

@@ -44,5 +44,8 @@ https://sfweb.internal.sanger.ac.uk:12443/perl/npg/run/21915
 Analysis and QC information for this run will be/is available:
 http://sfweb.internal.sanger.ac.uk:1959/checks/runs/21915
 
-NPG on behalf of DNA Pipelines and GSLP
+
+If you have any questions or need further assistance, please feel free to reach out to a Scientific Service Representative at [email protected].
+
+NPG on behalf of DNA Pipelines