Save pipeline version information from run_xml into DataRun table.

Also show said information on the flowcell page.

diff --git a/htsworkflow/frontend/experiments/models.py b/htsworkflow/frontend/experiments/models.py
index 2f97f155de06e50cca7924422a69e916f14263ac..bf353e1a3898eda784bc87a019ec55ae924cd49e 100644 (file)
--- a/htsworkflow/frontend/experiments/models.py
+++ b/htsworkflow/frontend/experiments/models.py
@@ -174,6 +174,12 @@ class FlowCell(models.Model):
           run.cycle_start = run_xml_data.image_analysis.start
           run.cycle_stop = run_xml_data.image_analysis.stop
           run.run_start_time = run_xml_data.image_analysis.date
+          run.image_software = run_xml_data.image_analysis.software
+          run.image_version = run_xml_data.image_analysis.version
+          run.basecall_software = run_xml_data.bustard.software
+          run.basecall_version = run_xml_data.bustard.version
+          run.alignment_software = run_xml_data.gerald.software
+          run.alignment_version = run_xml_data.gerald.version
 
       run.last_update_time = datetime.datetime.now()
       run.save()
@@ -234,6 +240,12 @@ class DataRun(models.Model):
     cycle_stop = models.IntegerField(null=True, blank=True)
     run_status = models.IntegerField(choices=RUN_STATUS_CHOICES,
                                      null=True, blank=True)
+    image_software = models.CharField(max_length=50)
+    image_version = models.CharField(max_length=50)
+    basecall_software = models.CharField(max_length=50)
+    basecall_version = models.CharField(max_length=50)
+    alignment_software = models.CharField(max_length=50)
+    alignment_version = models.CharField(max_length=50)
     comment = models.TextField(blank=True)
 
     def update_result_files(self):

diff --git a/htsworkflow/frontend/templates/experiments/flowcell_header.html b/htsworkflow/frontend/templates/experiments/flowcell_header.html
index 458619b93efe12def2f0d09850177f40baf78545..55c20d6cbbf8c6ea37a2d83fb83c60d1a251b359 100644 (file)
--- a/htsworkflow/frontend/templates/experiments/flowcell_header.html
+++ b/htsworkflow/frontend/templates/experiments/flowcell_header.html
@@ -15,6 +15,17 @@
     <span property="libns:sequencer_model">{{flowcell.sequencer.model}}</span>
     <br/>
   </div>
+  {% for datarun in flowcell.datarun_set.all %}
+  <b>Image Analysis</b>:
+    <span property="libns:image_software">{{datarun.image_software}}</span>
+    <span property="libns:image_version">{{datarun.image_version}}</span><br/>
+  <b>Base Caller</b>:
+    <span property="libns:basecall_software">{{datarun.basecall_software}}</span>
+    <span property="libns:basecall_version">{{datarun.basecall_version}}</span><br/>
+  <b>Alignment</b>:
+    <span property="libns:alignment_software">{{datarun.alignment_software}}</span>
+    <span property="libns:alignment_version">{{datarun.alignment_version}}</span><br/>
+  {% endfor %}
   <b>Run Date</b>:
     <span property="libns:date" content="{{flowcell.run_date|date:'Y-m-d\TH:i:s'}}" datatype="xsd:dateTime">{{ flowcell.run_date }}</span><br/>
   <b>Type</b>: