selects : filter et ordering

diff --git a/project/dae/forms.py b/project/dae/forms.py
index 1a444cb..a7fab7e 100644 (file)
--- a/project/dae/forms.py
+++ b/project/dae/forms.py
@@ -60,10 +60,10 @@ class PosteForm(forms.ModelForm):
         d'équivalent dans dae.
 
         """
-        dae_ = dae.Poste.objects.filter(id_rh__isnull=True)
+        dae_ = dae.Poste.objects.filter(actif=True, id_rh__isnull=True)
         copies = dae.Poste.objects.exclude(id_rh__isnull=True)
         id_copies = [p.id_rh_id for p in copies.all()]
-        rhv1 = rh.Poste.objects.exclude(id__in=id_copies)
+        rhv1 = rh.Poste.objects.filter(actif=True).exclude(id__in=id_copies)
         # Optimisation de la requête
         rhv1 = rhv1.select_related(depth=1)
 

diff --git a/project/dae/models.py b/project/dae/models.py
index 9e44988..2e0012c 100644 (file)
--- a/project/dae/models.py
+++ b/project/dae/models.py
@@ -119,8 +119,8 @@ class Poste(models.Model):
     objects = PosteManager()
 
     def __unicode__(self):
-        return u'%s - %s (%s)' % (self.implantation, self.type_poste.nom,
-                                  self.nom)
+        return u'%s - %s (%s) [dae-%s]' % (self.implantation, self.type_poste.nom,
+                                  self.nom, self.id)
 
     def DISABLED_save(self, *args, **kwargs):
         # calculate nb_mois = nb of months between date_debut and date_fin

diff --git a/project/rh_v1/models.py b/project/rh_v1/models.py
index 74138e3..8cb8169 100644 (file)
--- a/project/rh_v1/models.py
+++ b/project/rh_v1/models.py
@@ -168,6 +168,9 @@ class TypePoste(models.Model):
 
     def __unicode__(self):
         return u'%s' % self.nom
+        
+    class Meta:
+        ordering = ['nom']
 
 
 TYPE_PAIEMENT_CHOICES = (
@@ -231,7 +234,7 @@ class Poste(models.Model):
     objects = PosteManager()
 
     def __unicode__(self):
-        return u'%s - %s' % (self.implantation, self.type_poste.nom)
+        return u'%s - %s [%s]' % (self.implantation, self.type_poste.nom, self.id)
 
 
 class Service(models.Model):
@@ -243,6 +246,9 @@ class Service(models.Model):
 
     def __unicode__(self):
         return u'%s' % self.nom
+        
+    class Meta:
+        ordering = ['nom']
 
 
 TYPE_ORGANISME_CHOICES = (
@@ -310,6 +316,9 @@ class ValeurPoint(models.Model):
 
     def __unicode__(self):
         return u'%s (%s-%s)' % (self.valeur, self.implantation_id, self.annee)
+        
+    class Meta:
+        ordering = ['valeur']
 
 
 class TauxChange(models.Model):