Add LibraryType option, (this will probably require a dump/reload)

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

diff --git a/htsworkflow/frontend/samples/admin.py b/htsworkflow/frontend/samples/admin.py
index f8d45d0789695b35df9c93deca0f460e4dcf220f..ee6a9e2f3c152b73ee893abd8e2a19f691c2c33f 100644 (file)
--- a/htsworkflow/frontend/samples/admin.py
+++ b/htsworkflow/frontend/samples/admin.py
@@ -1,22 +1,35 @@
-from htsworkflow.frontend.samples.models import Antibody, Cellline, Condition, Species, Affiliation, Library, Tag
 from django.contrib import admin
+from django.contrib.admin import widgets
+from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
+from htsworkflow.frontend.samples.models import Antibody, Cellline, Condition, ExperimentType, LibraryType, Species, Affiliation, Library, Tag
+
 class Library_Inline(admin.TabularInline):
   model = Library
 
 class CelllineOptions(admin.ModelAdmin):
+    list_display = ('cellline_name', 'nickname', 'notes')
+    search_fields = ('cellline_name', 'nickname', 'notes')
     fieldsets = (
       (None, {
           'fields': (('cellline_name'),('notes'),)
       }),
      )
 
+class ExperimentTypeOptions(admin.ModelAdmin):
+  model = ExperimentType
+  #list_display = ('name',)
+  #fieldsets = ( (None, { 'fields': ('name',) }), )
+
+class LibraryTypeOptions(admin.ModelAdmin):
+    model = LibraryType
+
 class LibraryOptions(admin.ModelAdmin):
     date_hierarchy = "creation_date"
     save_as = True
     save_on_top = True
-    search_fieldsets = (
+    search_fields = (
         'library_id',
         'library_name',
         'cell_line__cellline_name',
@@ -25,37 +38,43 @@ class LibraryOptions(admin.ModelAdmin):
     )
     list_display = (
         'library_id',
-        'aligned_reads',
-        'DataRun',
+        #'aligned_reads',
+        #'DataRun',
         'library_name',
-        'experiment_type',
-        'organism',
-        'antibody_name',
-        'cell_line',
-        'libtags',
-        'made_for',
-        'made_by',
-        'stopping_point',
+        'public',
+        #'experiment_type',
+        #'organism',
+        #'antibody_name',
+        #'cell_line',
+        #'libtags',
+        #'made_for',
+        'affiliation',
+        #'made_by',
+        'undiluted_concentration',
         'creation_date',
-        'condition',
+        'stopping_point',
+        #'condition',
+
     )
     list_filter = (
         'experiment_type', 
         'library_species', 
         'tags',
-        'made_for',
+        #'made_for',
+        'affiliations',
         'made_by', 
         'antibody',
         'cell_line',
         'condition',
-        'stopping_point')
+        'stopping_point',
+        'hidden')
     list_display_links = ('library_id', 'library_name',)
     fieldsets = (
       (None, {
         'fields': (
-          ('replicate','library_id','library_name'),
+          ('library_id','library_name','hidden'),
           ('library_species'),
-          ('experiment_type'),
+          ('library_type', 'experiment_type', 'replicate'),
           ('cell_line','condition','antibody'),)
          }),
          ('Creation Information:', {
@@ -66,6 +85,18 @@ class LibraryOptions(admin.ModelAdmin):
          }),
          )
 
+    # some post 1.0.2 version of django has formfield_overrides 
+    # which would replace this code with:
+    # formfield_overrids = {
+    #   models.ManyToMany: { 'widget': widgets.FilteredSelectMultiple }
+    # }
+    def formfield_for_dbfield(self, db_field, **kwargs):
+      if db_field.name == 'affiliations':
+        kwargs['widget'] = widgets.FilteredSelectMultiple(db_field.verbose_name, (db_field.name in self.filter_vertical))
+      rv = super(LibraryOptions, self).formfield_for_dbfield(db_field, **kwargs)
+      print db_field.name, kwargs
+      return rv
+
 class AffiliationOptions(admin.ModelAdmin):
     list_display = ('name','contact','email')
     fieldsets = (
@@ -78,6 +109,7 @@ class AffiliationOptions(admin.ModelAdmin):
 #   inlines = [Library_Inline]
 
 class AntibodyOptions(admin.ModelAdmin):
+    search_fields = ('antigene','nickname','catalog','antibodies','source','biology','notes')
     list_display = ('antigene','nickname','antibodies','catalog','source','biology','notes')
     list_filter = ('antibodies','source')
     fieldsets = (
@@ -113,6 +145,8 @@ admin.site.register(Affiliation, AffiliationOptions)
 admin.site.register(Antibody, AntibodyOptions)
 admin.site.register(Cellline, CelllineOptions)
 admin.site.register(Condition, ConditionOptions)
+admin.site.register(ExperimentType, ExperimentTypeOptions)
+admin.site.register(LibraryType, LibraryTypeOptions)
 admin.site.register(Library, LibraryOptions)
 admin.site.register(Species, SpeciesOptions)
 admin.site.register(Tag, TagOptions)