Initial port to python3

[htsworkflow.git] / htsworkflow / frontend / reports / models.py

diff --git a/htsworkflow/frontend/reports/models.py b/htsworkflow/frontend/reports/models.py
index 8554688d90dbef2d38f1e6d0e4a9803909d526be..9bcb3e589409b7cfb5558f3aeaaa31bfe07ffa43 100644 (file)
--- a/htsworkflow/frontend/reports/models.py
+++ b/htsworkflow/frontend/reports/models.py
@@ -2,14 +2,14 @@ from django.db import models
 from django.db.models import Q
 from django.core.exceptions import ObjectDoesNotExist
 from datetime import datetime
-from htswfrontend.fctracker.models import * 
-from htswfrontend.analys_track.models import *
-from htswfrontend.exp_track.models import *
+from htsworkflow.frontend.samples.models import * 
+from htsworkflow.frontend.analysis.models import *
+from htsworkflow.frontend.experiments.models import *
 from string import *
-from htswfrontend.htsw_reports.utils import *
+from htsworkflow.frontend.reports.utils import *
 import re
 ##from p1 import LibInfo
-from libinfopar import *
+from .libinfopar import *
 
 ## This is a table based REPORT generator. The goal is to display a Progress Report for all the ENCODE projects, based on Study Name (e.g. NRSF, FOXP2, Methy-Seq on .. etc).
   
@@ -204,12 +204,12 @@ class ProgressReport(models.Model):
       rc = "%1.2f" % (res[1]/1000000.0)
       tstr += '<tr><td><b>'+l+'</b></td><td>'+res[0].__str__()+'</td></td><td>'+rc+'</td></tr>'
     tstr += '</table>'
-    #tstr += '<a target=_blank href="http://m304-apple-server.stanford.edu/projects/'+self.st_sbj.id.__str__()+'">Project results page</a>'
+    #tstr += '<a target=_blank href="'+settings.TASKS_PROJS_SERVER+'/projects/'+self.st_sbj.id.__str__()+'">Project results page</a>'
     tstr += '</div>'
     myNum = (ReadsCnt/1000000.0)
     myNum  = "%1.2f" % (myNum) 
     tstr += '<div>Total: <b>'+LanesCnt.__str__()+'</b> lanes and <b>'+myNum+'</b> M Reads</div>'
-    tstr += '<a target=_blank href="http://m304-apple-server.stanford.edu/projects/'+self.st_sbj.id.__str__()+'">Project results page</a>'
+    tstr += '<a target=_blank href="'+settings.TASKS_PROJS_SERVER+'/projects/'+self.st_sbj.id.__str__()+'">Project results page</a>'
     return tstr
   aligned_reads.allow_tags = True
 
@@ -218,8 +218,8 @@ class ProgressReport(models.Model):
     return 'coming up ..'
 
   QPCR = models.CharField(max_length=500,blank=True,null=True)    
-  submitted_to_DCC = models.DateTimeField(core=True,blank=True,null=True)
-  submitted_to_NCBI = models.DateTimeField(core=True,blank=True,null=True)
+  submitted_to_DCC = models.DateTimeField(blank=True,null=True)
+  submitted_to_NCBI = models.DateTimeField(blank=True,null=True)
   note_about_DCC =  models.TextField(blank=True)
   note_about_NCBI = models.TextField(blank=True)