From 75fa2b3ec17e57a30af6efb5e5a319009e59e074 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Mon, 12 Nov 2012 13:19:41 +0100 Subject: [PATCH] Complement models Added referent.abrev, corporation.typ, corporation.web, period.title --- docs/SchemaRelationnel.odg | Bin 19165 -> 19765 bytes stages/admin.py | 4 ++-- stages/fixtures/test_fixture.json | 8 ++++++-- stages/models.py | 6 +++++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/docs/SchemaRelationnel.odg b/docs/SchemaRelationnel.odg index 65d07779d71324d954dd8c80c831c1611efa3ed7..1cc6cf765f5298881ffb8fb5987eb1e391844914 100644 GIT binary patch delta 14873 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 delta 14220 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 CHSsV2 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')