added search interface to the Task and Project entities. Now, for example, you can...

diff --git a/htswfrontend/htswfrontend/analys_track/models.py b/htswfrontend/htswfrontend/analys_track/models.py
index 10a31143bd659a1f0e610140cba5946e808ade8b..9b28626f08ea4211d998237fc1e61ec02e217b8e 100644 (file)
--- a/htswfrontend/htswfrontend/analys_track/models.py
+++ b/htswfrontend/htswfrontend/analys_track/models.py
@@ -1,6 +1,6 @@
 from django.db import models
 from datetime import datetime
-from htswfrontend.fctracker.models import Library 
+from gaworkflow.frontend.fctracker.models import Library 
 from string import *
 
 class Task(models.Model):
@@ -38,6 +38,7 @@ class Task(models.Model):
   class Admin:
     list_display = ('task_name','apply_calc','subject1','subject2','InProjects','submitted_on','task_status')
     list_filter = ('apply_calc',)
+    search_fields = ['task_name','id','=subject1__library_id','=subject2__library_id']
     fields = (
         (None, {
           'fields': (('task_name'),('apply_calc'),('subject1'),('subject2'))
@@ -77,12 +78,12 @@ class Project(models.Model):
       tstr += '<div '+Style+'>'
       tstr += '<table><tr><th>Tasks</th><th>Job Status</th>'
       isregistered = False
-      for t in ptasks:      
+      for t in ptasks:
         tstr += '<tr><td width=250>%s</td><td>%s</td></tr>'  % (t.task_name,replace(t.task_status,'Complete','<span style="color:green;font-weight:bolder">Complete</span>'))
         if t.task_status != 'defined': isregistered = True
 
       tstr += '</table>'
-      tstr += '</div>'
+      tstr += '</div>' 
       tstr += '<div>'
       tstr += '<div align=center>'
       if isregistered:
@@ -95,7 +96,7 @@ class Project(models.Model):
       tstr += '<iframe width="100%" height="0" frameborder="0" style="background-color:#ffffff" name="RFrame'+self.id.__str__()+'" id="RFrame'+self.id.__str__()+'"/></iframe>'
       tstr += '</div>'
       return tstr
-    
+
     ProjectTasks.allow_tags = True
 
     def ProjTitle(self):
@@ -108,7 +109,8 @@ class Project(models.Model):
 
     class Admin:
       list_display = ('ProjTitle','ProjectTasks')
-      # list_filter = ('...',)
+      list_filter = ()
+      search_fields = ['project_name','=tasks__subject1__library_id','=tasks__subject2__library_id','tasks__subject1__library_name','tasks__subject2__library_name','project_notes']
       fields = (
         (None, {
           'fields': (('project_name'),('tasks'),('project_notes'))}),