From: Diane Trout <diane@caltech.edu>
Date: Thu, 26 Feb 2009 03:04:14 +0000 (+0000)
Subject: Remove a few more fields that we dont use, and change the Lanes display
X-Git-Tag: 0.2.0.1~15
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=8adfa2fe97261dfa8709ed88f91241f19d951533

Remove a few more fields that we dont use, and change the Lanes display
on the flowcell index page.

I switched from the <div><span> that Rami was using to a <ol><li>
hierarchy, I also made the items link to the corresponding library
page.
---

diff --git a/htsworkflow/frontend/experiments/admin.py b/htsworkflow/frontend/experiments/admin.py
index d7793fd..50b8e3f 100644
--- a/htsworkflow/frontend/experiments/admin.py
+++ b/htsworkflow/frontend/experiments/admin.py
@@ -39,7 +39,7 @@ class FlowCellOptions(admin.ModelAdmin):
         '=lane_6_library__library_id',
         '=lane_7_library__library_id',
         '=lane_8_library__library_id')
-    list_display = ('flowcell_id','seq_mac_id','run_date', 'Create_LOG','Lanes')
+    list_display = ('flowcell_id','run_date','Lanes')
     list_filter = ('seq_mac_id','cluster_mac_id')
     fieldsets = (
         (None, {
diff --git a/htsworkflow/frontend/experiments/models.py b/htsworkflow/frontend/experiments/models.py
index 92b0d37..5fdd7b2 100755
--- a/htsworkflow/frontend/experiments/models.py
+++ b/htsworkflow/frontend/experiments/models.py
@@ -81,7 +81,15 @@ class FlowCell(models.Model):
   Create_LOG.allow_tags = True 
 
   def Lanes(self):
-    return '<div><span style="margin-right:10px">1)%s</span><span style="margin-right:10px">2)%s</span><span style="margin-right:10px">3)%s</span><span style="margin-right:10px">4)%s</span><span style="margin-right:10px">5)%s</span><span style="margin-right:10px">6)%s</span><span style="margin-right:10px">7)%s</span><span style="margin-right:10px">8)%s</span></div>' % (self.lane_1_library,self.lane_2_library,self.lane_3_library,self.lane_4_library,self.lane_5_library,self.lane_6_library,self.lane_7_library,self.lane_8_library)
+    library_url = '/admin/samples/library/%s' 
+    html = ['<ol>']
+    for i in range(1,9):
+	library_id = getattr(self, 'lane_%d_library_id' % i)
+        library = getattr(self, 'lane_%d_library' % i)
+	element = '<li><a href="%s">%s</a></li>'
+        html.append(element % (library_url % library_id, library))
+    html.append('</ol>')
+    return "\n".join(html)
   Lanes.allow_tags = True
 
   class Meta:
diff --git a/htsworkflow/frontend/samples/admin.py b/htsworkflow/frontend/samples/admin.py
index e237ea9..9fb1408 100644
--- a/htsworkflow/frontend/samples/admin.py
+++ b/htsworkflow/frontend/samples/admin.py
@@ -30,17 +30,19 @@ class LibraryOptions(admin.ModelAdmin):
         #'aligned_reads',
         #'DataRun',
         'library_name',
-        'experiment_type',
+        #'experiment_type',
         #'organism',
         #'antibody_name',
         #'cell_line',
         #'libtags',
         #'made_for',
 	'affiliation',
-        'made_by',
+        #'made_by',
         'undiluted_concentration',
         'creation_date',
+	'stopping_point',
         #'condition',
+
     )
     list_filter = (
         'experiment_type',