claudep/epcstages
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into master

Browse source
This commit is contained in:
Claude Paroz 2017-12-05 16:18:42 +01:00 • committed by GitHub
commit bc033cbcf9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 535 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

9
stages/models.py
View file

@ -148,11 +148,16 @@ class Option(models.Model):
return self.name
GENDER_CHOICES = (
('M', 'Masculin'),
('F', 'Féminin'),
)
class Student(models.Model):
ext_id = models.IntegerField(null=True, unique=True, verbose_name='ID externe')
first_name = models.CharField(max_length=40, verbose_name='Prénom')
last_name = models.CharField(max_length=40, verbose_name='Nom')
gender = models.CharField(max_length=3, blank=True, verbose_name='Genre')
gender = models.CharField('Genre', max_length=3, blank=True, choices=GENDER_CHOICES)
birth_date = models.DateField(blank=True, verbose_name='Date de naissance')
street = models.CharField(max_length=150, blank=True, verbose_name='Rue')
pcode = models.CharField(max_length=4, verbose_name='Code postal')
@ -279,7 +284,7 @@ class CorpContact(models.Model):
verbose_name = "Contact"
def __str__(self):
return '%s %s' % (self.last_name, self.first_name)
return '{0} {1}, {2}'.format(self.last_name, self.first_name, self.corporation)
class Domain(models.Model):