Add a custom (inherited) user object named HTSUser to the samples table.

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

diff --git a/htsworkflow/frontend/samples/admin.py b/htsworkflow/frontend/samples/admin.py
index 9fb140845423e6e061eb88f80754bf95089f35ed..d686e21e1bf14875e0d7e0c0ada807d623e64958 100644 (file)
--- a/htsworkflow/frontend/samples/admin.py
+++ b/htsworkflow/frontend/samples/admin.py
@@ -1,9 +1,42 @@
-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.contrib.admin.models import User
+from django.contrib.auth.admin import UserAdmin
+from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
-class Library_Inline(admin.TabularInline):
-  model = Library
+from htsworkflow.frontend.samples.models import Antibody, Cellline, Condition, ExperimentType, HTSUser, LibraryType, Species, Affiliation, Library, Tag
+from htsworkflow.frontend.experiments.models import Lane
+
+class AffiliationOptions(admin.ModelAdmin):
+    list_display = ('name','contact','email')
+    fieldsets = (
+      (None, {
+          'fields': (('name','contact','email','users'))
+      }),
+    )
+
+    # 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 == 'users':
+        kwargs['widget'] = widgets.FilteredSelectMultiple(db_field.verbose_name, (db_field.name in self.filter_vertical))
+      rv = super(AffiliationOptions, self).formfield_for_dbfield(db_field, **kwargs)
+    #  print db_field.name, kwargs
+      return rv
+
+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 = (
+      (None, {
+          'fields': (('antigene','nickname','antibodies'),('catalog','source'),('biology'),('notes'))
+      }),
+     )
 
 class CelllineOptions(admin.ModelAdmin):
     list_display = ('cellline_name', 'nickname', 'notes')
@@ -14,6 +47,31 @@ class CelllineOptions(admin.ModelAdmin):
       }),
      )
 
+class ConditionOptions(admin.ModelAdmin):
+    list_display = (('condition_name'), ('notes'),)
+    fieldsets = (
+      (None, {
+          'fields': (('condition_name'),('nickname'),('notes'),)
+      }),
+     )
+
+class ExperimentTypeOptions(admin.ModelAdmin):
+  model = ExperimentType
+  #list_display = ('name',)
+  #fieldsets = ( (None, { 'fields': ('name',) }), )
+
+class HTSUserOptions(UserAdmin): pass
+
+class LaneLibraryInline(admin.StackedInline):
+  model = Lane
+  extra = 0
+
+class Library_Inline(admin.TabularInline):
+  model = Library
+
+class LibraryTypeOptions(admin.ModelAdmin):
+    model = LibraryType
+
 class LibraryOptions(admin.ModelAdmin):
     date_hierarchy = "creation_date"
     save_as = True
@@ -30,17 +88,18 @@ class LibraryOptions(admin.ModelAdmin):
         #'aligned_reads',
         #'DataRun',
         'library_name',
+        'public',
         #'experiment_type',
         #'organism',
         #'antibody_name',
         #'cell_line',
         #'libtags',
         #'made_for',
-       'affiliation',
+        'affiliation',
         #'made_by',
         'undiluted_concentration',
         'creation_date',
-       'stopping_point',
+        'stopping_point',
         #'condition',
 
     )
@@ -49,19 +108,20 @@ class LibraryOptions(admin.ModelAdmin):
         'library_species', 
         'tags',
         #'made_for',
-       'affiliations',
+        '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:', {
@@ -71,27 +131,21 @@ class LibraryOptions(admin.ModelAdmin):
              'fields' : (('affiliations'), ('tags'),)
          }),
          )
+    inlines = [
+      LaneLibraryInline,
+    ]
 
-class AffiliationOptions(admin.ModelAdmin):
-    list_display = ('name','contact','email')
-    fieldsets = (
-      (None, {
-          'fields': (('name','contact','email'))
-      }),
-    )
-
-# class UserOptions(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 = (
-      (None, {
-          'fields': (('antigene','nickname','antibodies'),('catalog','source'),('biology'),('notes'))
-      }),
-     )
+    # 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 SpeciesOptions(admin.ModelAdmin):
     fieldsets = (
@@ -100,14 +154,6 @@ class SpeciesOptions(admin.ModelAdmin):
       }),
     )
 
-class ConditionOptions(admin.ModelAdmin):
-    list_display = (('condition_name'), ('notes'),)
-    fieldsets = (
-      (None, {
-          'fields': (('condition_name'),('nickname'),('notes'),)
-      }),
-     )
-
 class TagOptions(admin.ModelAdmin):
     list_display = ('tag_name', 'context')
     fieldsets = ( 
@@ -120,6 +166,9 @@ 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(HTSUser, HTSUserOptions)
+admin.site.register(LibraryType, LibraryTypeOptions)
 admin.site.register(Library, LibraryOptions)
 admin.site.register(Species, SpeciesOptions)
 admin.site.register(Tag, TagOptions)