From: Lorian Schaeffer Date: Thu, 20 Mar 2008 19:17:21 +0000 (+0000) Subject: Created table Person, with required fields "name" and "lab", and optional field ... X-Git-Tag: stanford.caltech-merged-database-2009-jan-15~94 X-Git-Url: http://woldlab.caltech.edu/gitweb/?a=commitdiff_plain;h=e07611dc72fdc9b678153650a1f000b5fa7d5d3f;p=htsworkflow.git Created table Person, with required fields "name" and "lab", and optional field "email" Changed "made_for" in table Library to choose from contents of table Person --- diff --git a/gaworkflow/frontend/fctracker/models.py b/gaworkflow/frontend/fctracker/models.py index 60cfd93..2e6a314 100644 --- a/gaworkflow/frontend/fctracker/models.py +++ b/gaworkflow/frontend/fctracker/models.py @@ -23,6 +23,28 @@ class Species(models.Model): }), ) +class Person(models.Model): + + name = models.CharField(max_length=100, primary_key=True, db_index=True) + lab = models.CharField(max_length=100) + email = models.CharField(max_length=50, blank=True, null=True) + + def __str__(self): + return '%s (%s lab)' % (self.name, self.lab) + + + class Meta: + verbose_name_plural = "people" + ordering = ["lab"] + + class Admin: + fields = ( + (None, { + 'fields': (('name', 'lab'), ('email')) + }), + ) + + class Library(models.Model): library_id = models.CharField(max_length=25, primary_key=True, db_index=True, core=True) @@ -33,7 +55,7 @@ class Library(models.Model): made_by = models.CharField(max_length=50, blank=True, default="Lorian") creation_date = models.DateField(blank=True, null=True) - made_for = models.CharField(max_length=50, blank=True) + made_for = models.ForeignKey(Person) PROTOCOL_END_POINTS = ( ('?', 'Unknown'),