diff --git a/docs/SchemaRelationnel.odg b/docs/SchemaRelationnel.odg index 65d0777..1cc6cf7 100644 Binary files a/docs/SchemaRelationnel.odg and b/docs/SchemaRelationnel.odg differ diff --git a/stages/admin.py b/stages/admin.py index bda0f3d..fc94bc0 100644 --- a/stages/admin.py +++ b/stages/admin.py @@ -24,7 +24,7 @@ class ContactInline(admin.StackedInline): class CorporationAdmin(admin.ModelAdmin): list_display = ('name', 'pcode', 'city') - fields = ('name', 'street', ('pcode', 'city'), ('tel', 'email')) + fields = ('name', 'typ', 'street', ('pcode', 'city'), ('tel', 'email'), 'web') inlines = [ContactInline] @@ -33,7 +33,7 @@ class AvailabilityInline(admin.TabularInline): extra = 1 class PeriodAdmin(admin.ModelAdmin): - list_display = ('dates', 'section') + list_display = ('title', 'dates', 'section') list_filter = ('section',) inlines = [AvailabilityInline] diff --git a/stages/fixtures/test_fixture.json b/stages/fixtures/test_fixture.json index 4750377..ad1eb95 100644 --- a/stages/fixtures/test_fixture.json +++ b/stages/fixtures/test_fixture.json @@ -81,7 +81,8 @@ "model": "stages.referent", "fields": { "first_name": "Julie", - "last_name": "Caux" + "last_name": "Caux", + "abrev": "JCA" } }, { @@ -91,9 +92,11 @@ "city": "Moulineaux", "tel": "", "name": "Centre p\u00e9dagogique XY", + "typ": "Institution", "pcode": "2500", "street": "Rue des champs 12", - "email": "" + "email": "", + "web": "" } }, { @@ -127,6 +130,7 @@ "pk": 1, "model": "stages.period", "fields": { + "title": "Stage de pré-sensibilisation", "section": 1, "start_date": "2012-11-26", "end_date": "2012-12-07" diff --git a/stages/models.py b/stages/models.py index 6101aa6..0ac6cdf 100644 --- a/stages/models.py +++ b/stages/models.py @@ -44,6 +44,7 @@ class Student(models.Model): class Referent(models.Model): first_name = models.CharField(max_length=40, verbose_name='Prénom') last_name = models.CharField(max_length=40, verbose_name='Nom') + abrev = models.CharField(max_length=10, blank=True, verbose_name='Initiales') class Meta: verbose_name = "Référent" @@ -54,11 +55,13 @@ class Referent(models.Model): class Corporation(models.Model): name = models.CharField(max_length=100, verbose_name='Nom') + typ = models.CharField(max_length=40, blank=True, verbose_name='Type de structure') street = models.CharField(max_length=100, blank=True, verbose_name='Rue') pcode = models.CharField(max_length=4, verbose_name='Code postal') city = models.CharField(max_length=40, verbose_name='Localité') tel = models.CharField(max_length=20, blank=True, verbose_name='Téléphone') - email = models.CharField(max_length=40, blank=True, verbose_name='Courriel') + email = models.EmailField(blank=True, verbose_name='Courriel') + web = models.URLField(blank=True, verbose_name='Site Web') class Meta: verbose_name = "Institution" @@ -95,6 +98,7 @@ class Domain(models.Model): class Period(models.Model): """ Périodes de stages """ + title = models.CharField(max_length=150, verbose_name='Titre') section = models.ForeignKey(Section, verbose_name='Filière') start_date = models.DateField(verbose_name='Date de début') end_date = models.DateField(verbose_name='Date de fin')