From 4443bcc3b810be54f06e8c46dfbfc6fd8cc3d82b Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Wed, 2 Jan 2013 14:40:24 +0100 Subject: [PATCH] Add fields for student --- stages/admin.py | 15 +++++++++++---- stages/models.py | 2 ++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/stages/admin.py b/stages/admin.py index 8d5af0a..5a964e4 100644 --- a/stages/admin.py +++ b/stages/admin.py @@ -6,18 +6,25 @@ from stages.models import (Student, Section, Level, Klass, Referent, Corporation CorpContact, Domain, Period, Availability, Training) +class KlassAdmin(admin.ModelAdmin): + list_display = ('name', 'section', 'level') + ordering = ('name',) + + class StudentAdmin(admin.ModelAdmin): list_display = ('__unicode__', 'pcode', 'city', 'klass') + ordering = ('last_name', 'first_name') list_filter = ('klass',) search_fields = ('last_name', 'first_name', 'pcode', 'city', 'klass') - fields = (('last_name', 'first_name'), ('pcode', 'city'), ('email', 'tel'), - 'birth_date', 'klass', 'archived') + fields = (('last_name', 'first_name'), 'street', ('pcode', 'city'), 'email', + ('tel', 'mobile'), 'birth_date', 'klass', 'archived') - def get_readonly_fields(self, request, obj=None): + '''def get_readonly_fields(self, request, obj=None): if 'edit' not in request.GET: return self.fields else: return self.readonly_fields + ''' class ReferentAdmin(admin.ModelAdmin): @@ -105,7 +112,7 @@ class TrainingAdmin(admin.ModelAdmin): admin.site.register(Section) admin.site.register(Level) -admin.site.register(Klass) +admin.site.register(Klass, KlassAdmin) admin.site.register(Student, StudentAdmin) admin.site.register(Referent, ReferentAdmin) admin.site.register(Corporation, CorporationAdmin) diff --git a/stages/models.py b/stages/models.py index 34af596..44351c2 100644 --- a/stages/models.py +++ b/stages/models.py @@ -51,9 +51,11 @@ class Student(models.Model): first_name = models.CharField(max_length=40, verbose_name='Prénom') last_name = models.CharField(max_length=40, verbose_name='Nom') birth_date = models.DateField(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') city = models.CharField(max_length=40, verbose_name='Localité') tel = models.CharField(max_length=40, blank=True, verbose_name='Téléphone') + mobile = models.CharField(max_length=40, blank=True, verbose_name='Portable') email = models.EmailField(verbose_name='Courriel', blank=True) klass = models.ForeignKey(Klass, verbose_name='Classe') archived = models.BooleanField(default=False, verbose_name='Archivé')