+import logging
import urlparse
from django.db import models
from django.contrib.auth.models import User, UserManager
from django.db.models.signals import pre_save, post_save
from django.db import connection
-from htsworkflow.frontend import settings
from htsworkflow.frontend.reports.libinfopar import *
+
# Create your models here.
+logger = logging.getLogger(__name__)
class Antibody(models.Model):
antigene = models.CharField(max_length=500, db_index=True)
max_length=20,
blank=True,
null=True,
- db_index=True,
- verbose_name = 'Short Name'
+ db_index=True
)
catalog = models.CharField(max_length=50, unique=True, db_index=True)
antibodies = models.CharField(max_length=500, db_index=True)
nickname = models.CharField(max_length=20,
blank=True,
null=True,
- db_index=True,
- verbose_name = 'Short Name')
+ db_index=True)
+
notes = models.TextField(blank=True)
def __unicode__(self):
return unicode(self.cellline_name)
class Meta:
verbose_name_plural = "species"
ordering = ["scientific_name"]
+
+ @models.permalink
+ def get_absolute_url(self):
+ return ('htsworkflow.frontend.samples.views.species', [str(self.id)])
class Affiliation(models.Model):
name = models.CharField(max_length=256, db_index=True, verbose_name='Name')
contact = models.CharField(max_length=256, null=True, blank=True,verbose_name='Lab Name')
email = models.EmailField(null=True,blank=True)
- users = models.ManyToManyField('HTSUser', null=True)
+ users = models.ManyToManyField('HTSUser', null=True, blank=True)
users.admin_order_field = "username"
def __unicode__(self):
def __unicode__(self):
return unicode(self.name)
+
class Library(models.Model):
- id = models.AutoField(primary_key=True)
- library_id = models.CharField(max_length=30, db_index=True, unique=True)
+ id = models.CharField(max_length=10, primary_key=True)
library_name = models.CharField(max_length=100, unique=True)
library_species = models.ForeignKey(Species)
# new field 2008 Mar 5, alter table samples_library add column "hidden" NOT NULL default 0;
# New field Aug/19/08
# SQL to add column: alter table fctracker_library add column "replicate" smallint unsigned NULL;
REPLICATE_NUM = ((1,1),(2,2),(3,3),(4,4))
- replicate = models.PositiveSmallIntegerField(choices=REPLICATE_NUM,default=1)
+ replicate = models.PositiveSmallIntegerField(choices=REPLICATE_NUM,blank=True,null=True)
experiment_type = models.ForeignKey(ExperimentType)
library_type = models.ForeignKey(LibraryType, blank=True, null=True)
creation_date = models.DateField(blank=True, null=True)
('1A', 'Ligation, then gel'),
('PCR', 'Ligation, then PCR'),
('1Ab', 'Ligation, PCR, then gel'),
- ('1Aa', 'Ligation, gel, then PCR'),
+ ('1Ac', 'Ligation, gel, then 12x PCR'),
+ ('1Aa', 'Ligation, gel, then 18x PCR'),
('2A', 'Ligation, PCR, gel, PCR'),
('Done', 'Completed'),
)
+ PROTOCOL_END_POINTS_DICT = dict(PROTOCOL_END_POINTS)
+
stopping_point = models.CharField(max_length=25, choices=PROTOCOL_END_POINTS, default='Done')
amplified_from_sample = models.ForeignKey('self', blank=True, null=True, related_name='amplified_into_sample')
# note \u00b5 is the micro symbol in unicode
successful_pM = models.DecimalField(max_digits=9, decimal_places=1, blank=True, null=True)
ten_nM_dilution = models.BooleanField()
- avg_lib_size = models.IntegerField(default=225, blank=True, null=True)
+ gel_cut_size = models.IntegerField(default=225, blank=True, null=True)
+ insert_size = models.IntegerField(blank=True, null=True)
notes = models.TextField(blank=True)
+
+ bioanalyzer_summary = models.TextField(blank=True,default="")
+ bioanalyzer_concentration = models.DecimalField(max_digits=5,
+ decimal_places=2, blank=True, null=True,
+ help_text=u"(ng/\u00b5l)")
+ bioanalyzer_image_url = models.URLField(blank=True,default="")
def __unicode__(self):
- return u'#%s: %s' % (self.library_id, self.library_name)
+ return u'#%s: %s' % (self.id, self.library_name)
class Meta:
- verbose_name_plural = "libraries"
- #ordering = ["-creation_date"]
- ordering = ["-library_id"]
+ verbose_name_plural = "libraries"
+ #ordering = ["-creation_date"]
+ ordering = ["-id"]
def antibody_name(self):
- str ='<a target=_self href="/admin/samples/antibody/'+self.antibody.id.__str__()+'/" title="'+self.antibody.__str__()+'">'+self.antibody.nickname+'</a>'
+ str ='<a target=_self href="/admin/samples/antibody/'+self.antibody.id.__str__()+'/" title="'+self.antibody.__str__()+'">'+self.antibody.label+'</a>'
return str
antibody_name.allow_tags = True
else:
return False
+ def stopping_point_name(self):
+ end_points = Library.PROTOCOL_END_POINTS_DICT
+ name = end_points.get(self.stopping_point, None)
+ if name is None:
+ name = "Lookup Error"
+ logger.error("protocol stopping point in database didn't match names in library model")
+ return name
+
+
def libtags(self):
affs = self.tags.all().order_by('tag_name')
ar = []
return u'%s' % ( ", ".join(ar))
def DataRun(self):
- str ='<a target=_self href="/admin/experiments/datarun/?q='+self.library_id+'" title="Check All Data Runs for This Specific Library ..." ">Data Run</a>'
+ str ='<a target=_self href="/admin/experiments/datarun/?q='+self.id+'" title="Check All Data Runs for This Specific Library ..." ">Data Run</a>'
return str
DataRun.allow_tags = True
def aligned_m_reads(self):
- return getLibReads(self.library_id)
+ return getLibReads(self.id)
def aligned_reads(self):
- res = getLibReads(self.library_id)
+ res = getLibReads(self.id)
# Check data sanity
if res[2] != "OK":
else: tstr = 'not processed yet'
return tstr
aligned_reads.allow_tags = True
-
+
def public(self):
SITE_ROOT = '/'
summary_url = self.get_absolute_url()
return '<a href="%s">S</a>' % (summary_url,)
public.allow_tags = True
-
+
@models.permalink
def get_absolute_url(self):
- return ('htsworkflow.frontend.samples.views.library_to_flowcells', [str(self.library_id)])
+ return ('htsworkflow.frontend.samples.views.library_to_flowcells', [str(self.id)])
+
class HTSUser(User):
"""
#objects = UserManager()
class Meta:
- ordering = ['username']
+ ordering = ['first_name', 'last_name', 'username']
def admin_url(self):
return '/admin/%s/%s/%d' % (self._meta.app_label, self._meta.module_name, self.id)
+
+ def __unicode__(self):
+ #return unicode(self.username) + u" (" + unicode(self.get_full_name()) + u")"
+ return unicode(self.get_full_name()) + u' (' + unicode(self.username) + ')'
def HTSUserInsertID(sender, instance, **kwargs):
"""
projects / htsworkflow.git / blobdiff