From b903198b553483738c72be41931e817a72c29175 Mon Sep 17 00:00:00 2001 From: Nilovna Bascunan-Vasquez Date: Thu, 7 Jul 2011 17:16:22 -0400 Subject: [PATCH] =?utf8?q?1699:=20Premi=C3=A8re=20partie-Voir=20les=20=C3=A9?= =?utf8?q?valuateurs=20qui=20n'ont=20pas=20encore=20donn=C3=A9=20de=20note.=20?= =?utf8?q?1700:=20Ajouter=20des=20help=5Ftext=20aux=20champs=20pertinents.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- project/recrutement/admin.py | 17 ++++++++++++----- project/recrutement/models.py | 30 +++++++++++++++++++----------- project/recrutement/views.py | 3 +++ 3 files changed, 34 insertions(+), 16 deletions(-) diff --git a/project/recrutement/admin.py b/project/recrutement/admin.py index cf1a76b..f16b31a 100644 --- a/project/recrutement/admin.py +++ b/project/recrutement/admin.py @@ -337,8 +337,8 @@ class AdministrateurRegionalAdmin(VersionAdmin): pass class CandidatEvaluationAdmin(VersionAdmin): - list_display = ('_offre_emploi', '_candidat', '_note', '_commentaire', - 'evaluateur',) + list_display = ('_offre_emploi', '_candidat', 'evaluateur', '_note', + '_commentaire', ) readonly_fields = ('candidat', 'evaluateur') fieldsets = ( ('Évaluation du candidat', { @@ -352,11 +352,18 @@ class CandidatEvaluationAdmin(VersionAdmin): un lien pour Évaluer le candidat. Sinon afficher la note. """ + evaluateur = obj.evaluateur + candidat = obj.candidat + candidat_evaluation = CandidatEvaluation.objects.\ + get(candidat=candidat, evaluateur=evaluateur) if obj.note is None: - return "Évaluer le candidat " % \ + return "Candidat non évalué" % \ (reverse('admin:recrutement_candidatevaluation_change', - args=(obj.candidat.id,))) - return obj.note + args=(candidat_evaluation.id,))) + return "%s" % \ + (reverse('admin:recrutement_candidatevaluation_change', + args=(candidat_evaluation.id,)), obj.note) + return _note.allow_tags = True _note.short_description = "Votre note" _note.admin_order_field = 'note' diff --git a/project/recrutement/models.py b/project/recrutement/models.py index f0c7da5..5c8829f 100755 --- a/project/recrutement/models.py +++ b/project/recrutement/models.py @@ -17,7 +17,10 @@ NOTE_MIN = 1 NOTE_RANGE = 1 NOTE_MAX = 11 NOTES = [(i, i) for i in range(NOTE_MIN, NOTE_MAX, NOTE_RANGE)] + +#HELP_TEXT HELP_TEXT_NB_DEPENDANT = "Le nombre de personnes à charge" +HELP_TEXT_FORMAT_DATE = "Le format de la date est AAAA-MM-JJ" # Abstracts class Metadata(models.Model): @@ -26,7 +29,8 @@ class Metadata(models.Model): actif == False : objet réputé supprimé. """ actif = models.BooleanField(default=True) - date_creation = models.DateField(auto_now_add=True) + date_creation = models.DateField(auto_now_add=True, + help_text=HELP_TEXT_FORMAT_DATE, ) class Meta: abstract = True @@ -50,7 +54,8 @@ class OffreEmploi(Metadata): resume = models.TextField(verbose_name="Résumé") description = tinymce_models.HTMLField() poste = models.ForeignKey(ProxyPoste, db_column='poste') - date_limite = models.DateField(verbose_name="Date limite") + date_limite = models.DateField(verbose_name="Date limite", + help_text=HELP_TEXT_FORMAT_DATE,) region = models.ForeignKey(ref.Region, db_column='region', verbose_name="Région") bureau = models.ForeignKey(ref.Bureau, db_column='bureau', ) @@ -58,7 +63,8 @@ class OffreEmploi(Metadata): verbose_name="Durée de l'affectation") renumeration = models.CharField(max_length=255, verbose_name='Rénumération') - debut_affectation = models.DateField(verbose_name="Début de l'affectation") + debut_affectation = models.DateField(verbose_name="Début de l'affectation", + help_text=HELP_TEXT_FORMAT_DATE,) lieu_affectation = models.ForeignKey(ref.Implantation, db_column='implantation', verbose_name="Lieu d'affectation") @@ -86,7 +92,7 @@ GENRE_CHOICES = ( ) SITUATION_CHOICES = ( ('C', 'Célibataire'), - ('F', 'Fiancé'), + ('F', 'Conjoint de fait'), ('M', 'Marié'), ('D', 'Divorcé'), ) @@ -109,17 +115,18 @@ class Candidat(Metadata): nationalite = models.ForeignKey(ref.Pays, db_column='nationalite', related_name='+', verbose_name='Nationalité') - date_naissance = models.DateField(verbose_name='Date de naissance') + date_naissance = models.DateField(verbose_name='Date de naissance', + help_text=HELP_TEXT_FORMAT_DATE, ) situation_famille = models.CharField(max_length=1, choices=SITUATION_CHOICES, - verbose_name='Situation familiale') + verbose_name='Situation familiale', ) nombre_dependant = models.IntegerField(verbose_name='Nombre de dépendant', - help_text=HELP_TEXT_NB_DEPENDANT) + help_text=HELP_TEXT_NB_DEPENDANT, ) niveau_diplome = models.CharField(max_length=255, verbose_name='Niveau du diplôme') - employeur_actuel = models.CharField(max_length=255) - poste_actuel = models.CharField(max_length=255) - domaine_professionnel = models.CharField(max_length=255) + employeur_actuel = models.CharField(max_length=255, ) + poste_actuel = models.CharField(max_length=255, ) + domaine_professionnel = models.CharField(max_length=255, ) telephone = models.CharField(max_length=255, verbose_name='Téléphone', ) email = models.EmailField(max_length=255, verbose_name = 'Courriel', ) @@ -209,7 +216,8 @@ class CandidatEvaluation(models.Model): related_name='+', verbose_name='Évaluateur') note = models.IntegerField(choices=NOTES, blank=True, null=True) commentaire = models.TextField(null=True, blank=True) - date = models.DateField(auto_now_add=True) + date = models.DateField(auto_now_add=True, + help_text=HELP_TEXT_FORMAT_DATE, ) class Meta: verbose_name = 'évaluation du candidat' diff --git a/project/recrutement/views.py b/project/recrutement/views.py index e962301..5a65b5d 100755 --- a/project/recrutement/views.py +++ b/project/recrutement/views.py @@ -103,3 +103,6 @@ def postuler_appel_offre(request): return render_to_response('recrutement/postuler_appel_offre.html', vars, RequestContext(request)) + +def assigner_evaluateurs(request): + pass -- 1.7.10.4