diff --git a/smash/web/models.py b/smash/web/models.py index 939c9915dec4279c2ea60a6a9b32131302758d56..f633291e18d3c7d606e98e12efc0f3f59a23cc8e 100644 --- a/smash/web/models.py +++ b/smash/web/models.py @@ -21,7 +21,11 @@ class Language (models.Model): image_img.allow_tags = True class Subject(models.Model): - sex = models.CharField(max_length=1) + SEX_CHOICES = ( + ('M','Male'), + ('F','Female'), + ) + sex = models.CharField(max_length=1, choices = SEX_CHOICES) firstName = models.CharField(max_length=50) lastName = models.CharField(max_length=50) languages = models.ManyToManyField(Language) @@ -35,9 +39,18 @@ class Subject(models.Model): ndno = models.CharField(max_length=6) visitNumber = models.IntegerField() mpowerId = models.CharField(max_length=20) - subjectStatus = models.CharField(max_length=3) + STATUS_CHOICES = ( + ('INV', 'Invited'), + ('OPT', 'Opted out'), + ('PAR', 'Participating'), + ('TST', 'Test group'), + ('DEA', 'Dead') + ) + subjectStatus = models.CharField(max_length=3, choices = STATUS_CHOICES) mainPseudonym = models.CharField(max_length=45) comments = models.CharField(max_length=2000) + def __str__(self): + return self.firstName + " " + self.lastName class Visit(models.Model):