changed Tasks&Projects Server to illumin-mac.stanford... and put that in a global...

diff --git a/htswfrontend/htswfrontend/analys_track/models.py b/htswfrontend/htswfrontend/analys_track/models.py
index 301be2721c891112438156042c6eee48b7782593..a62dec56981860666234fdabde9661ccf6bc51e6 100644 (file)
--- a/htswfrontend/htswfrontend/analys_track/models.py
+++ b/htswfrontend/htswfrontend/analys_track/models.py
@@ -1,5 +1,6 @@
 from django.db import models
 from datetime import datetime
+from htswfrontend import settings
 from htswfrontend.fctracker.models import Library 
 from string import *
 
@@ -18,6 +19,7 @@ class Task(models.Model):
     )
   apply_calc = models.CharField(max_length=50,choices=CALCS,verbose_name='Applied Calculation')
   ## userid = # logged in user
+  task_params = models.CharField(max_length=200,blank=True,null=True,default="")
   task_status = models.CharField(max_length=500,blank=True,null=True,default='defined')
   results_location = models.CharField(max_length=2000,blank=True,null=True) 
   submitted_on = models.DateTimeField(core=True,default=datetime.now())
@@ -36,12 +38,12 @@ class Task(models.Model):
       return pstr
 
   class Admin:
-    list_display = ('task_name','apply_calc','subject1','subject2','InProjects','submitted_on','task_status')
+    list_display = ('task_name','apply_calc','subject1','subject2','task_params','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'))
+          'fields': (('task_name'),('apply_calc'),('subject1'),('subject2'),('task_params'))
            }),
           ('system fields', {
              'classes': 'collapse',
@@ -60,7 +62,7 @@ class Project(models.Model):
 
     def ProjectTasks(self):
       ptasks = self.tasks.all().order_by('id')
-      surl = 'http://m304-apple-server.stanford.edu/projects/' 
+      surl = settings.TASKS_PROJS_SERVER+'/projects/'
       tstr = '<script>'
       tstr += 'function togView(eid){'
       tstr += 'f=document.getElementById(eid);'
@@ -79,7 +81,11 @@ class Project(models.Model):
       tstr += '<table><tr><th>Tasks</th><th>Job Status</th>'
       isregistered = False
       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>'))
+        taskdesc = t.task_name+'<div style="font-size:80%">Details: '+t.apply_calc+' on '+t.subject1.library_id
+        if t.subject2 is not None:
+          taskdesc += ' and '+t.subject2.library_id
+        taskdesc += ' (TaskId:'+t.id.__str__()+')'
+        tstr += '<tr><td width=250>%s</td><td>%s</td></tr>'  % (taskdesc,replace(t.task_status,'Complete','<span style="color:green;font-weight:bolder">Complete</span>'))
         if t.task_status != 'defined': isregistered = True
 
       tstr += '</table>'