From 7080a079c37b32645918957676ca7da0d236b674 Mon Sep 17 00:00:00 2001 From: Brandon King Date: Mon, 10 Aug 2009 22:33:58 +0000 Subject: [PATCH] print killing wsgi; minor fix. --- htsworkflow/frontend/experiments/admin.py | 9 +++++++++ htsworkflow/frontend/experiments/models.py | 2 +- scripts/migrate_to_lane_table.py | 16 ++++++++-------- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/htsworkflow/frontend/experiments/admin.py b/htsworkflow/frontend/experiments/admin.py index c97322f..9b8cf4f 100644 --- a/htsworkflow/frontend/experiments/admin.py +++ b/htsworkflow/frontend/experiments/admin.py @@ -84,6 +84,15 @@ class SequencerOptions(admin.ModelAdmin): class LaneOptions(admin.ModelAdmin): list_display = ('flowcell', 'lane_number', 'library', 'comment') + fieldsets = ( + (None, { + 'fields': ('lane_number', 'flowcell', 'library', 'pM', 'cluster_estimate') + }), + ('Optional', { + 'classes': ('collapse', ), + 'fields': ('comment', ) + }), + ) admin.site.register(DataRun, DataRunOptions) diff --git a/htsworkflow/frontend/experiments/models.py b/htsworkflow/frontend/experiments/models.py index 690c18b..f60bd0e 100755 --- a/htsworkflow/frontend/experiments/models.py +++ b/htsworkflow/frontend/experiments/models.py @@ -168,6 +168,6 @@ class Lane(models.Model): flowcell = models.ForeignKey(FlowCell) lane_number = models.IntegerField(choices=[(1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8)]) library = models.ForeignKey(Library) - pm = models.DecimalField(max_digits=5, decimal_places=2,blank=False, null=False,default=default_pM) + pM = models.DecimalField(max_digits=5, decimal_places=2,blank=False, null=False,default=default_pM) cluster_estimate = models.IntegerField(blank=True, null=True) comment = models.TextField(null=True, blank=True) diff --git a/scripts/migrate_to_lane_table.py b/scripts/migrate_to_lane_table.py index 13eb789..7b67c56 100755 --- a/scripts/migrate_to_lane_table.py +++ b/scripts/migrate_to_lane_table.py @@ -20,7 +20,7 @@ if __name__ == '__main__': # Meta Data lane1.lane_number = 1 - lane1.pm = flowcell.lane_1_pM + lane1.pM = flowcell.lane_1_pM lane1.cluster_estimate = flowcell.lane_1_cluster_estimate # Save @@ -36,7 +36,7 @@ if __name__ == '__main__': # Meta Data lane2.lane_number = 2 - lane2.pm = flowcell.lane_2_pM + lane2.pM = flowcell.lane_2_pM lane2.cluster_estimate = flowcell.lane_2_cluster_estimate # Save @@ -52,7 +52,7 @@ if __name__ == '__main__': # Meta Data lane3.lane_number = 3 - lane3.pm = flowcell.lane_3_pM + lane3.pM = flowcell.lane_3_pM lane3.cluster_estimate = flowcell.lane_3_cluster_estimate # Save @@ -68,7 +68,7 @@ if __name__ == '__main__': # Meta Data lane4.lane_number = 4 - lane4.pm = flowcell.lane_4_pM + lane4.pM = flowcell.lane_4_pM lane4.cluster_estimate = flowcell.lane_4_cluster_estimate # Save @@ -84,7 +84,7 @@ if __name__ == '__main__': # Meta Data lane5.lane_number = 5 - lane5.pm = flowcell.lane_5_pM + lane5.pM = flowcell.lane_5_pM lane5.cluster_estimate = flowcell.lane_5_cluster_estimate # Save @@ -100,7 +100,7 @@ if __name__ == '__main__': # Meta Data lane6.lane_number = 6 - lane6.pm = flowcell.lane_6_pM + lane6.pM = flowcell.lane_6_pM lane6.cluster_estimate = flowcell.lane_6_cluster_estimate # Save @@ -116,7 +116,7 @@ if __name__ == '__main__': # Meta Data lane7.lane_number = 7 - lane7.pm = flowcell.lane_7_pM + lane7.pM = flowcell.lane_7_pM lane7.cluster_estimate = flowcell.lane_7_cluster_estimate # Save @@ -132,7 +132,7 @@ if __name__ == '__main__': # Meta Data lane8.lane_number = 8 - lane8.pm = flowcell.lane_1_pM + lane8.pM = flowcell.lane_8_pM lane8.cluster_estimate = flowcell.lane_8_cluster_estimate # Save -- 2.30.2