fix salary JS calculation, ordering classement

[auf_rh_dae.git] / project / rh / models.py

diff --git a/project/rh/models.py b/project/rh/models.py
index f1d1b42..7a4d649 100644 (file)
--- a/project/rh/models.py
+++ b/project/rh/models.py
@@ -1066,7 +1066,7 @@ class ClassementManager(models.Manager):
     def get_query_set(self):
         qs = super(self.__class__, self).get_query_set()
         qs = qs.extra(select={'ponderation': 'FIND_IN_SET(type,"SO,HG,S,T,P,C,D")'})
-        qs = qs.extra(order_by=('ponderation', ))
+        qs = qs.extra(order_by=('ponderation', 'echelon',  'degre', ))
         return qs.all()