dbsamples.db @@ -26,11 +26,11 @@ class MacroArea(models.Model): >>> area6b.name = "6b" >>> area6b.provinces = (Province("Na", "Napoli"), Province("Sa", "Salerno")) """ - name = models.CharField(max_length = 10) + code = models.CharField(max_length = 10, unique = True) provinces = models.ManyToManyField(Province) def __unicode__(self): - return self.name + return self.code class Admin: pass @@ -73,17 +73,24 @@ class Individual(models.Model): father = models.ForeignKey("self", null = True, blank = True, help_text = "Father of the individual", related_name = "father_") grandfather_father = models.ForeignKey("self", null = True, blank = True, verbose_name = "Grand Father by father", related_name = "grandfatherfather_") grandmother_father = models.ForeignKey("self", null = True, blank = True, verbose_name = "Grand Mother by father" , related_name = "grandmotherfather") + mother = models.ForeignKey("self", null = True, blank = True, help_text = "Mother of the individual", related_name = "mother_") grandfather_mother = models.ForeignKey("self", null = True, blank = True, verbose_name = "Gran Father by mother", related_name = "grandfathermother") grandmother_mother = models.ForeignKey("self", null = True, blank = True, verbose_name = "Gran Mother by mother", related_name = "grandmothermother") + def is_donator(self): + return self.samples_set.count() + def __unicode__(self): if self.lastname: - return "individual %s (%s)" % (self.id, self.lastname) + repr = "individual %s (%s)" % (self.id, self.lastname) else: - return "individual %s" % self.id + repr = "individual %s" % self.id + return repr - class Admin: pass + class Admin: + list_display = ('id', 'is_donator', 'lastname', 'sex', 'place_of_birth', 'father', 'grandfather_father', 'grandmother_father', 'mother', 'grandfather_mother', 'grandmother_mother') + list_filter = ('place_of_birth', ) class Sample(models.Model): samples/models.py 23e6957d54b9a1f4a98d8be50954a165c2a82796 giovanni dall'olio dalloliogm@gmail.com http://github.com/dalloliogm/samples-database/commit/c422d064e19b003f36b823d0a6965df5c09626a7 c422d064e19b003f36b823d0a6965df5c09626a7 2008-07-18T04:57:56-07:00 2008-07-18T04:57:56-07:00 added some list_display fields to Individual and Sample 7028050cb1d3749460ed615104c2738da5647028 giovanni dall'olio dalloliogm@gmail.com