From 7f9e891e78df827db8efc003042badad102aeb9c Mon Sep 17 00:00:00 2001 From: "nilovna.bascunan-vasquez" Date: Fri, 27 May 2011 09:49:55 -0400 Subject: [PATCH] 1551: Ajout filtre par region. Ajout de champs pour listing. Correction related_name dans models. --- project/development.py | 6 +++--- project/recrutement/admin.py | 24 ++++++++++++++++++++++-- project/recrutement/models.py | 17 ++++++++--------- 3 files changed, 33 insertions(+), 14 deletions(-) diff --git a/project/development.py b/project/development.py index 1a763c0..0c7f53f 100644 --- a/project/development.py +++ b/project/development.py @@ -5,8 +5,8 @@ DEBUG=True TEMPLATE_DEBUG=DEBUG # Décommentez ces lignes pour activer la debugtoolbar -#INTERNAL_IPS = ('127.0.0.1',) -#INSTALLED_APPS += ('debug_toolbar',) -#MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',) +INTERNAL_IPS = ('127.0.0.1',) +INSTALLED_APPS += ('debug_toolbar',) +MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',) AUTH_PASSWORD_REQUIRED = False diff --git a/project/recrutement/admin.py b/project/recrutement/admin.py index b1252f8..a7801a8 100644 --- a/project/recrutement/admin.py +++ b/project/recrutement/admin.py @@ -4,10 +4,30 @@ from django.contrib import admin from recrutement.models import * class OffreEmploiAdmin(admin.ModelAdmin): - pass + date_hierarchy = 'date_creation' + list_display = ('nom', 'resume', 'date_limite',) + list_filter = ('region',) class CandidatAdmin(admin.ModelAdmin): - pass + date_hierarchy = 'date_creation' + list_display = ('nom', 'prenom', 'offre_emploi','statut',) + fieldsets = ( + ('Informations personnelles', { + 'fields': ('prenom','nom','genre', 'nationalite', 'date_naissance', + 'situation_famille', 'nombre_dependant',) + }), + ('Adresse', { + 'fields': ('adresse', 'ville', 'etat_province', 'pays', ) + }), + ('Informations professionnelles', { + 'fields': ('offre_emploi','niveau_diplome','employeur_actuel','poste_actuel', + 'domaine_professionnel',) + }), + ('Options avancées', { + 'classes': ('collapse',), + 'fields': ('actif', 'statut', ) + }), + ) class CandidatPieceAdmin(admin.ModelAdmin): pass diff --git a/project/recrutement/models.py b/project/recrutement/models.py index 6ec300e..a8bb5fa 100755 --- a/project/recrutement/models.py +++ b/project/recrutement/models.py @@ -58,15 +58,17 @@ STATUT_CHOICES = ( ) class Candidat(Metadata): - # TODO : Automatiser le statut à la création à Nouveau + # TODO : Automatiser le statut à la création à Nouveau + statut = models.CharField(max_length=4, + choices=STATUT_CHOICES) offre_emploi = models.ForeignKey('OffreEmploi', db_column='offre_emploi', - related_name='candidats') + related_name='+') prenom = models.CharField(max_length=255) nom = models.CharField(max_length=255) genre = models.CharField(max_length=1, choices=GENRE_CHOICES) nationalite = models.ForeignKey(ref.Pays, db_column='nationalite', - related_name='candidat_nationalite') + related_name='+') date_naissance = models.DateField(verbose_name="Date de naissance") situation_famille = models.CharField(max_length=1, choices=SITUATION_CHOICES) @@ -83,10 +85,7 @@ class Candidat(Metadata): etat_province = models.CharField(max_length=255, verbose_name="État/Province") pays = models.ForeignKey(ref.Pays, db_column='pays', - related_name='candidats') - - statut = models.CharField(max_length=4, - choices=STATUT_CHOICES) + related_name='+') def __unicode__(self): return '%s %s [%s]' % (self.prenom, self.nom, self.id) @@ -117,9 +116,9 @@ class Evaluateur(models.Model): class CandidatEvaluation(models.Model): candidat = models.ForeignKey(Candidat, db_column='candidat', - related_name='candidats') + related_name='+') evaluateur = models.ForeignKey(Evaluateur, db_column='evaluateur', - related_name='evaluateurs') + related_name='+') note = models.IntegerField() commentaire = models.TextField() date = models.DateField(auto_now_add=True) -- 1.7.10.4