print killing wsgi; minor fix.

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

diff --git a/htsworkflow/frontend/experiments/admin.py b/htsworkflow/frontend/experiments/admin.py
index 2cf711111acb512f155ae10563695d05b87326fb..9b8cf4f15d51f9fd08062ccd5cbf3a5b10c1c289 100644 (file)
--- a/htsworkflow/frontend/experiments/admin.py
+++ b/htsworkflow/frontend/experiments/admin.py
@@ -1,7 +1,12 @@
-from htsworkflow.frontend.experiments.models import FlowCell, DataRun, ClusterStation, Sequencer
+from htsworkflow.frontend.experiments.models import FlowCell, DataRun, ClusterStation, Sequencer, Lane
 from django.contrib import admin
 from django.utils.translation import ugettext_lazy as _
 
+class LaneInline(admin.StackedInline):
+  model = Lane
+  max_num = 8
+  extra = 8
+
 class DataRunOptions(admin.ModelAdmin):
   search_fields = [
       'run_folder',
@@ -15,7 +20,14 @@ class DataRunOptions(admin.ModelAdmin):
       '=fcid__lane_6_library__library_id',
       '=fcid__lane_7_library__library_id',
       '=fcid__lane_8_library__library_id'
-  ]
+      'fcid__lane_1_library__library_name',
+      'fcid__lane_2_library__library_name',
+      'fcid__lane_3_library__library_name',
+      'fcid__lane_4_library__library_name',
+      'fcid__lane_5_library__library_name',
+      'fcid__lane_6_library__library_name',
+      'fcid__lane_7_library__library_name',
+      'fcid__lane_8_library__library_name'  ]
   list_display = [
       'run_folder', 
       'Flowcell_Info', 
@@ -38,7 +50,15 @@ class FlowCellOptions(admin.ModelAdmin):
         '=lane_5_library__library_id',
         '=lane_6_library__library_id',
         '=lane_7_library__library_id',
-        '=lane_8_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')
     list_display = ('flowcell_id','run_date','Lanes')
     list_filter = ('sequencer','cluster_station')
     fieldsets = (
@@ -50,6 +70,9 @@ class FlowCellOptions(admin.ModelAdmin):
         }),
         ('Notes:', { 'fields': ('notes',),}),
     )
+    inlines = [
+      LaneInline,
+    ]
 
 class ClusterStationOptions(admin.ModelAdmin):
     list_display = ('name', )
@@ -58,8 +81,22 @@ class ClusterStationOptions(admin.ModelAdmin):
 class SequencerOptions(admin.ModelAdmin):
     list_display = ('name', )
     fieldsets = ( ( None, { 'fields': ( 'name', ) } ), )
+    
+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)
 admin.site.register(FlowCell, FlowCellOptions)
 admin.site.register(ClusterStation, ClusterStationOptions)
 admin.site.register(Sequencer, SequencerOptions)
+admin.site.register(Lane, LaneOptions)