Script for conversion of db; start of fixes brought on by changes to the db.

[htsworkflow.git] / htsworkflow / frontend / experiments / admin.py

diff --git a/htsworkflow/frontend/experiments/admin.py b/htsworkflow/frontend/experiments/admin.py
index c97322f14acf02493dd35a2d36c6aed71128423d..4563bde51895f860a37db7ded92f727bc5f28a9a 100644 (file)
--- a/htsworkflow/frontend/experiments/admin.py
+++ b/htsworkflow/frontend/experiments/admin.py
@@ -43,31 +43,17 @@ class FlowCellOptions(admin.ModelAdmin):
     search_fields = ('flowcell_id',
         'sequencer__name',
         'cluster_station__name',
-        '=lane_1_library__library_id',
-        '=lane_2_library__library_id',
-        '=lane_3_library__library_id',
-        '=lane_4_library__library_id',
-        '=lane_5_library__library_id',
-        '=lane_6_library__library_id',
-        '=lane_7_library__library_id',
-        '=lane_8_library__library_id',
-        'lane_1_library__library_name',
-        'lane_2_library__library_name',
-        'lane_3_library__library_name',
-        'lane_4_library__library_name',
-        'lane_5_library__library_name',
-        'lane_6_library__library_name',
-        'lane_7_library__library_name',
-        'lane_8_library__library_name')
+        '=lane__library__library_id',
+        'lane__library__library_name')
     list_display = ('flowcell_id','run_date','Lanes')
     list_filter = ('sequencer','cluster_station')
     fieldsets = (
         (None, {
             'fields': ('run_date', ('flowcell_id','cluster_station','sequencer'), ('read_length', 'paired_end'),)
         }),
-        ('Lanes:', {
-           'fields' : (('lane_1_library', 'lane_1_pM', 'lane_1_cluster_estimate'), ('lane_2_library', 'lane_2_pM', 'lane_2_cluster_estimate'), ('lane_3_library', 'lane_3_pM', 'lane_3_cluster_estimate'), ('lane_4_library', 'lane_4_pM', 'lane_4_cluster_estimate'), ('lane_5_library', 'lane_5_pM', 'lane_5_cluster_estimate'), ('lane_6_library', 'lane_6_pM', 'lane_6_cluster_estimate'), ('lane_7_library', 'lane_7_pM', 'lane_7_cluster_estimate'), ('lane_8_library', 'lane_8_pM', 'lane_8_cluster_estimate'),)
-        }),
+        #('Lanes:', {
+        #   'fields' : (('lane__library__library_id', 'lane__pM', 'lane__cluster_estimate'),)
+        #}),
         ('Notes:', { 'fields': ('notes',),}),
     )
     inlines = [
@@ -84,6 +70,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)