From 701f3bea81d18d97220acdc7793e1f10d5dffc25 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Olivier=20Larchev=C3=AAque?= Date: Mon, 11 Jul 2011 17:25:37 -0400 Subject: [PATCH 1/1] valeur point #1542 --- project/rh/lib.py | 10 +++++++++- project/rh/models.py | 10 ++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/project/rh/lib.py b/project/rh/lib.py index ff72388..5174213 100644 --- a/project/rh/lib.py +++ b/project/rh/lib.py @@ -362,4 +362,12 @@ class TypeRevalorisationAdmin(admin.ModelAdmin): class ValeurPointAdmin(admin.ModelAdmin): - pass + list_display = ('_devise_code', '_devise_nom', 'annee', 'valeur', ) + + def _devise_code(self, obj): + return obj.devise.code + _devise_code.short_description = "Code de la devise" + + def _devise_nom(self, obj): + return obj.devise.nom + _devise_nom.short_description = "Nom de la devise" diff --git a/project/rh/models.py b/project/rh/models.py index e5bcfd4..d48f1ad 100644 --- a/project/rh/models.py +++ b/project/rh/models.py @@ -904,6 +904,10 @@ class TauxChange_(AUFMetadata): class TauxChange(TauxChange_): __doc__ = TauxChange_.__doc__ +class ValeurPointManager(NoDeleteManager): + def get_query_set(self): + return super(ValeurPointManager, self).get_query_set().select_related('devise', 'implantation') + class ValeurPoint_(AUFMetadata): """Utile pour connaître, pour un Dossier, le salaire de base théorique lié @@ -912,6 +916,9 @@ class ValeurPoint_(AUFMetadata): salaire de base = coefficient * valeur du point de l'Implantation du Poste """ + + objects = ValeurPointManager() + valeur = models.FloatField(null=True) devise = models.ForeignKey('Devise', db_column='devise', null=True, related_name='+', default=5) @@ -922,9 +929,8 @@ class ValeurPoint_(AUFMetadata): annee = models.IntegerField() class Meta: - ordering = ['annee', 'implantation__nom'] + ordering = ['-annee', 'implantation__nom'] abstract = True - ordering = ['annee'] verbose_name = "Valeur du point" verbose_name_plural = "Valeurs du point" -- 1.7.10.4