Make antibody & condition visible.

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

diff --git a/htsworkflow/frontend/samples/admin.py b/htsworkflow/frontend/samples/admin.py
index 9295175c3f0cfe43fb96ada1ab64bdcac4cdb8ac..4247c88b68d7998771a1adad4c04d28d24587d28 100644 (file)
--- a/htsworkflow/frontend/samples/admin.py
+++ b/htsworkflow/frontend/samples/admin.py
@@ -6,6 +6,7 @@ from django.contrib.auth.forms import UserCreationForm, UserChangeForm
 from django.template import Context, Template
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
+from django.forms import TextInput, Textarea
 
 from htsworkflow.frontend.samples.models import Antibody, Cellline, Condition, ExperimentType, HTSUser, LibraryType, Species, Affiliation, Library, Tag
 from htsworkflow.frontend.experiments.models import Lane
@@ -46,11 +47,11 @@ class AntibodyOptions(admin.ModelAdmin):
      )
 
 class CelllineOptions(admin.ModelAdmin):
-    list_display = ('cellline_name', 'nickname', 'notes')
+    list_display = ('cellline_name', 'notes')
     search_fields = ('cellline_name', 'nickname', 'notes')
     fieldsets = (
       (None, {
-          'fields': (('cellline_name'),('notes'),)
+          'fields': (('cellline_name','nickname',),('notes'),)
       }),
      )
 
@@ -108,50 +109,47 @@ class LibraryOptions(admin.ModelAdmin):
     )
     list_display = (
         'id',
-        #'aligned_reads',
-        #'DataRun',
         'library_name',
         'public',
-        #'experiment_type',
-        #'organism',
-        #'antibody_name',
-        #'cell_line',
-        #'libtags',
-        #'made_for',
         'affiliation',
-        #'made_by',
         'undiluted_concentration',
+        'gel_cut_size',
         'creation_date',
-        'stopping_point',
-        #'condition',
-
     )
     list_filter = (
-        'experiment_type', 
-        'library_species', 
-        'tags',
-        #'made_for',
+        'hidden',
         'affiliations',
+        'library_species', 
+        'experiment_type', 
         'made_by', 
-        'antibody',
         'cell_line',
-        'condition',
-        'stopping_point',
-        'hidden')
+        'stopping_point',)
     list_display_links = ('id', 'library_name',)
     fieldsets = (
       (None, {
         'fields': (
           ('id','library_name','hidden'),
-          ('library_species'),
-          ('library_type', 'experiment_type', 'replicate'),
-          ('cell_line','condition','antibody'),)
+          ('library_species', 'library_type', 'experiment_type'),
+          )
          }),
+         ('Experiment Detail:', {
+            'fields': (('cell_line', 'replicate',),
+                       ('condition',),
+                       ('antibody', ),
+                       ),
+            'classes': ('collapse',),
+            }),
          ('Creation Information:', {
-             'fields' : (('made_for', 'made_by', 'creation_date'), ('stopping_point', 'amplified_from_sample'), ('avg_lib_size','undiluted_concentration', 'ten_nM_dilution', 'successful_pM'), 'account_number', 'notes',)
+             'fields' : (('made_by', 'creation_date', 'stopping_point'), 
+                         ('amplified_from_sample'), 
+                         ('gel_cut_size', 'insert_size', 
+                          'undiluted_concentration'), 
+                         ('bioanalyzer_concentration','bioanalyzer_image_url'),
+                         ('bioanalyzer_summary'), 
+                         ('notes'))
          }),
          ('Library/Project Affiliation:', {
-             'fields' : (('affiliations'), ('tags'),)
+             'fields' : (('account_number', 'affiliations'),)
          }),
          )
     inlines = [
@@ -159,7 +157,6 @@ class LibraryOptions(admin.ModelAdmin):
     ]
     actions = ['action_print_library_labels']
     
-    
     def action_print_library_labels(self, request, queryset):
         """
         Django action which prints labels for the selected set of labels from the
@@ -200,19 +197,19 @@ class LibraryOptions(admin.ModelAdmin):
                           
     action_print_library_labels.short_description = "Print Labels"
 
-
-
-    # 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 in ('affiliations', 'tags'):
-        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)
-      return rv
+        # Override Field type
+        if db_field.name in ('affiliations', 'tags'):
+            kwargs['widget'] = widgets.FilteredSelectMultiple(
+                db_field.verbose_name,
+                (db_field.name in self.filter_vertical)
+            )
+        field = super(LibraryOptions, self).formfield_for_dbfield(db_field,
+                                                                  **kwargs)
+        # Override field attributes
+        if db_field.name == "bioanalyzer_summary":
+            field.widget.attrs["rows"] = "3"
+        return field
 
 class SpeciesOptions(admin.ModelAdmin):
     fieldsets = (
@@ -229,13 +226,13 @@ class TagOptions(admin.ModelAdmin):
           }),
         )
 
+admin.site.register(Library, LibraryOptions)
 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(HTSUser, HTSUserOptions)
 admin.site.register(LibraryType, LibraryTypeOptions)
-admin.site.register(Library, LibraryOptions)
 admin.site.register(Species, SpeciesOptions)
-admin.site.register(Tag, TagOptions)
+#admin.site.register(Tag, TagOptions)