Convert Rami's DataRun feature to something useful to us.

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

diff --git a/htsworkflow/frontend/experiments/admin.py b/htsworkflow/frontend/experiments/admin.py
index eb243a70b264ebc371b81235652a39d383eeab00..4181e5c91aef2aa0d2a7af9b2d0bddcc37ad65e6 100644 (file)
--- a/htsworkflow/frontend/experiments/admin.py
+++ b/htsworkflow/frontend/experiments/admin.py
@@ -1,4 +1,5 @@
-from htsworkflow.frontend.experiments.models import FlowCell, DataRun, ClusterStation, Sequencer, Lane
+from htsworkflow.frontend.experiments.models import \
+     FlowCell, DataRun, DataFile, FileType, ClusterStation, Sequencer, Lane
 from django.contrib import admin
 from django.contrib.admin.widgets import FilteredSelectMultiple
 from django.forms import ModelForm
@@ -6,20 +7,45 @@ from django.forms.fields import Field, CharField
 from django.forms.widgets import TextInput
 from django.utils.translation import ugettext_lazy as _
 
+class DataFileForm(ModelForm):
+    class Meta:
+        model = DataFile
+
+class DataFileInline(admin.TabularInline):
+    model = DataFile
+    form = DataFileForm
+    raw_id_fields = ('library',)
+    extra = 0
+
 class DataRunOptions(admin.ModelAdmin):
   search_fields = [
+      'flowcell_id',
       'run_folder',
       'run_note',
-      'config_params', ]
+      ]
   list_display = [
-      'run_folder', 
-      'Flowcell_Info', 
+      'runfolder_name',
+      'result_dir',
       'run_start_time',
-      'main_status', 
-      'run_note',
   ]
-  list_filter = ('run_status', 'run_start_time')
+  fieldsets = (
+      (None, {
+        'fields': (('flowcell', 'run_status'),
+                   ('runfolder_name', 'cycle_start', 'cycle_stop'),
+                   ('result_dir',),
+                   ('last_update_time'),
+                   ('comment',))
+      }),
+    )
+  inlines = [ DataFileInline ]
+  #list_filter = ('run_status', 'run_start_time')
+admin.site.register(DataRun, DataRunOptions)
+
 
+class FileTypeAdmin(admin.ModelAdmin):
+    list_display = ('name', 'mimetype', 'regex')
+admin.site.register(FileType, FileTypeAdmin)
+  
 # lane form setup needs to come before Flowcell form config
 # as flowcell refers to the LaneInline class
 class LaneForm(ModelForm):
@@ -63,6 +89,7 @@ class LaneOptions(admin.ModelAdmin):
         'fields': ('comment', )
       }),
     )
+admin.site.register(Lane, LaneOptions)
     
 class FlowCellOptions(admin.ModelAdmin):
     date_hierarchy = "run_date"
@@ -92,18 +119,14 @@ class FlowCellOptions(admin.ModelAdmin):
         if db_field.name == "notes":
             field.widget.attrs["rows"] = "3"
         return field
+admin.site.register(FlowCell, FlowCellOptions)
 
 class ClusterStationOptions(admin.ModelAdmin):
     list_display = ('name', )
     fieldsets = ( ( None, { 'fields': ( 'name', ) } ), )
+admin.site.register(ClusterStation, ClusterStationOptions)
 
 class SequencerOptions(admin.ModelAdmin):
     list_display = ('name', )
     fieldsets = ( ( None, { 'fields': ( 'name', ) } ), )
-    
-
-#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)