From 4047b783ea42c5e435edc65ba8bc41422d2981fc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Olivier=20Larchev=C3=AAque?= Date: Thu, 19 Jan 2012 16:10:11 -0500 Subject: [PATCH] date help text et date future fix --- project/dae/models.py | 6 +----- project/rh/models.py | 2 ++ project/rh/validators.py | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/project/dae/models.py b/project/dae/models.py index cfba8db..7e6227d 100644 --- a/project/dae/models.py +++ b/project/dae/models.py @@ -11,13 +11,9 @@ from workflow import DOSSIER_ETAT_DRH_FINALISATION, DOSSIER_ETAT_REGION_FINALISA DOSSIER_ETAT_FINALISE import auf.django.references.models as ref from managers import * +from rh.models import HELP_TEXT_DATE -# Constantes -HELP_TEXT_DATE = "format: jj-mm-aaaa" -REGIME_TRAVAIL_DEFAULT=100.00 -REGIME_TRAVAIL_NB_HEURE_SEMAINE_DEFAULT=35.00 - # Upload de fichiers UPLOAD_STORAGE = FileSystemStorage(settings.PRIVE_MEDIA_ROOT) diff --git a/project/rh/models.py b/project/rh/models.py index 7117a0b..8b99c8f 100644 --- a/project/rh/models.py +++ b/project/rh/models.py @@ -26,6 +26,7 @@ def app_context(): # Constantes +HELP_TEXT_DATE = "format: jj-mm-aaaa" REGIME_TRAVAIL_DEFAULT = Decimal('100.00') REGIME_TRAVAIL_NB_HEURE_SEMAINE_DEFAULT = Decimal('35.00') @@ -328,6 +329,7 @@ class Employe(AUFMetadata): verbose_name = u"Nationalité", blank=True, null=True) date_naissance = models.DateField(verbose_name = u"Date de naissance", + help_text=HELP_TEXT_DATE, validators=[validate_date_passee], null=True, blank=True) genre = models.CharField(max_length=1, choices=GENRE_CHOICES) diff --git a/project/rh/validators.py b/project/rh/validators.py index f664820..abdc237 100644 --- a/project/rh/validators.py +++ b/project/rh/validators.py @@ -5,5 +5,5 @@ from django.core.exceptions import ValidationError from django.utils.translation import ugettext_lazy as _ def validate_date_passee(date): - if date >= datetime.date.today(): + if date > datetime.date.today(): raise ValidationError(_(u"La date ne peut pas être future")) -- 1.7.10.4