Update Rami's flowcell report to work with our new seperate lane table.

diff --git a/htsworkflow/frontend/templates/experiments/flowcellSheet.html b/htsworkflow/frontend/templates/experiments/flowcellSheet.html
index 66b7b4d19a863ef13346bd24f3174f06c0cb282e..f639ff680a139341aba98e4c868c81b5cafd0651 100644 (file)
--- a/htsworkflow/frontend/templates/experiments/flowcellSheet.html
+++ b/htsworkflow/frontend/templates/experiments/flowcellSheet.html
@@ -16,8 +16,8 @@ TD
 <tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
 <tr><td>Date Run Started</td><td colspan=2>{{ fc.run_date }}</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
 <tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-<tr><td>Cluster station used</td><td colspan=2 nowrap>{{ fc.cluster_mac_id }}</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-<tr><td>GA used</td><td colspan=2 nowrap>{{ fc.seq_mac_id }}</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+<tr><td>Cluster station used</td><td colspan=2 nowrap>{{ fc.cluster_station.name }}</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+<tr><td>GA used</td><td colspan=2 nowrap>{{ fc.sequencer.name }}</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
 
 <tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
 <tr><td>Flowcell number</td><td colspan=2 nowrap>{{ fc.flowcell_id }}</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
@@ -28,84 +28,54 @@ TD
 <tr><td><font point-size="9" face="Arial"><b>SAMPLE INFORMATION</b><font></td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
 <tr><td>&nbsp;</td><td>FC#</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td colspan=2 nowrap>FC bar code</td></tr>
 
-<tr><td valign=middle nowrap>Lane</td><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td></tr>
+<tr><td valign=middle nowrap>Lane</td>
+{% for lane in fc.lane_set.all %}
+<td>{{ lane.lane_number }}</td>
+{% endfor %}
+</tr>
 <tr><td valign=middle nowrap>Solexa Library Number</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_1_library.library_id }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_2_library.library_id }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_3_library.library_id }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_4_library.library_id }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_5_library.library_id }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_6_library.library_id }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_7_library.library_id }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_8_library.library_id }}</td></tr>
+{% for lane in fc.lane_set.all %}
+<td bgcolor=#CCFFCC>{{ lane.library.library_id }}</td>
+{% endfor %}
+</tr>
 
 <tr><td valign=middle nowrap>Sample Name</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_1_library.library_name }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_2_library.library_name }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_3_library.library_name }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_4_library.library_name }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_5_library.library_name }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_6_library.library_name }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_7_library.library_name }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_8_library.library_name }}</td>
+{% for lane in fc.lane_set.all %}
+<td bgcolor=#CCFFCC>{{ lane.library.library_name }}</td>
+{% endfor %}
 </tr>
 
 <tr><td valign=middle nowrap>Organism</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_1_library.library_species.common_name }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_2_library.library_species.common_name }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_3_library.library_species.common_name }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_4_library.library_species.common_name }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_5_library.library_species.common_name }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_6_library.library_species.common_name }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_7_library.library_species.common_name }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_8_library.library_species.common_name }}</td>
+{% for lane in fc.lane_set.all %}
+<td bgcolor=#CCFFCC>{{ lane.library.library_species.scientific_name }}</td>
+{% endfor %}
 </tr>
 
 <tr><td valign=middle nowrap>Submitter</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_1_library.made_by }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_2_library.made_by }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_3_library.made_by }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_4_library.made_by }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_5_library.made_by }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_6_library.made_by }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_7_library.made_by }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_8_library.made_by }}</td>
+{% for lane in fc.lane_set.all %}
+<td bgcolor=#CCFFCC>{{ lane.library.made_for }}</td>
+{% endfor %}
 </tr>
 
 
 <tr><td valign=middle nowrap>First time run?</td><td bgcolor=#CCFFCC></td><td bgcolor=#CCFFCC></td><td bgcolor=#CCFFCC></td><td bgcolor=#CCFFCC></td><td bgcolor=#CCFFCC></td><td bgcolor=#CCFFCC></td><td bgcolor=#CCFFCC></td><td bgcolor=#CCFFCC></td></tr>
 
 <tr><td valign=middle nowrap>Average Library Size (bp)</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_1_library.avg_lib_size }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_2_library.avg_lib_size }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_3_library.avg_lib_size }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_4_library.avg_lib_size }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_5_library.avg_lib_size }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_6_library.avg_lib_size }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_7_library.avg_lib_size }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_8_library.avg_lib_size }}</td>
+{% for lane in fc.lane_set.all %}
+<td bgcolor=#CCFFCC>{{ lane.library.avg_lib_size }}</td>
+{% endfor %}
 </tr>  
 
 <tr><td valign=middle nowrap>Template Concentration (ng/ul)</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_1_library.undiluted_concentration }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_2_library.undiluted_concentration }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_3_library.undiluted_concentration }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_4_library.undiluted_concentration }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_5_library.undiluted_concentration }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_6_library.undiluted_concentration }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_7_library.undiluted_concentration }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_8_library.undiluted_concentration }}</td>
+{% for lane in fc.lane_set.all %}
+<td bgcolor=#CCFFCC>{{ lane.library.undiluted_concentration }}</td>
+{% endfor %}
 </tr>
 
 <tr><td valign=middle nowrap>Run Concentration (pM)</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_1_pM }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_2_pM }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_3_pM }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_4_pM }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_5_pM }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_6_pM }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_7_pM }}</td>
-<td bgcolor=#CCFFCC>{{ fc.lane_8_pM }}</td>
+{% for lane in fc.lane_set.all %}
+<td bgcolor=#CCFFCC>{{ lane.pM }}</td>
+{% endfor %}
 </tr>
 
 </table>

diff --git a/htsworkflow/frontend/templates/experiments/index.html b/htsworkflow/frontend/templates/experiments/index.html
index 1105bec8acdb0d94cb89edef3a511526aceeaae0..0d817d20f70c245def4b0123f35a72d5eb679529 100644 (file)
--- a/htsworkflow/frontend/templates/experiments/index.html
+++ b/htsworkflow/frontend/templates/experiments/index.html
@@ -1,7 +1,7 @@
 {% if data_run_list %}
     <ul>
     {% for run in data_run_list %}
-        <li>{{ run.run_folder }}</li>
+        <li><a href="{{ run.fcid }}">{{ run.run_folder }}</a></li>
     {% endfor %}
     </ul>
 {% else %}