Added control_lane column to Flowcell.

 * updated upgrade_v0.2.6_to_v0.3.py script to update flowcell table.

diff --git a/docs/upgrade_v0.2.6_to_v0.3.py b/docs/upgrade_v0.2.6_to_v0.3.py
index 7a755f6f8df1836cad5488ba87192cb420fc8259..92df026703f6c90c6066329b2c57cf36e2f10498 100644 (file)
--- a/docs/upgrade_v0.2.6_to_v0.3.py
+++ b/docs/upgrade_v0.2.6_to_v0.3.py
@@ -86,6 +86,9 @@ WHERE id=%(id)d;"""
             
     c.execute('DROP TABLE experiments_flowcell_temp;')
     
+    #Add control_lane column
+    c.execute('ALTER TABLE experiments_flowcell ADD COLUMN "control_lane" integer NULL;')
+    
     conn.commit()
 
 if __name__ == "__main__":

diff --git a/htsworkflow/frontend/experiments/admin.py b/htsworkflow/frontend/experiments/admin.py
index a4a1eef424ebedc0b2877c4a7a1ceaff1f985752..1a4a93f75c312e6c0634a414cde37264d3e82368 100644 (file)
--- a/htsworkflow/frontend/experiments/admin.py
+++ b/htsworkflow/frontend/experiments/admin.py
@@ -60,7 +60,7 @@ class FlowCellOptions(admin.ModelAdmin):
     list_filter = ('sequencer','cluster_station')
     fieldsets = (
         (None, {
-            'fields': ('run_date', ('flowcell_id','cluster_station','sequencer'), ('read_length', 'paired_end'),)
+            'fields': ('run_date', ('flowcell_id','cluster_station','sequencer'), ('read_length', 'control_lane', 'paired_end'),)
         }),
         #('Lanes:', {
         #   'fields' : (('lane__library__library_id', 'lane__pM', 'lane__cluster_estimate'),)

diff --git a/htsworkflow/frontend/experiments/models.py b/htsworkflow/frontend/experiments/models.py
index 53f14fa084f3e19e0de951edb72be4f16458b5ab..eafe06a080e7f45d55ac6a827a480be1a24b1fb6 100755 (executable)
--- a/htsworkflow/frontend/experiments/models.py
+++ b/htsworkflow/frontend/experiments/models.py
@@ -32,6 +32,7 @@ class FlowCell(models.Model):
   advanced_run = models.BooleanField(default=False)
   paired_end = models.BooleanField(default=False)
   read_length = models.IntegerField(default=32) #Stanford is currenlty 25
+  control_lane = models.IntegerField(choices=[(1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8)], null=True)
 
   cluster_station = models.ForeignKey(ClusterStation, default=3)
   sequencer = models.ForeignKey(Sequencer, default=1)