fix salary JS calculation, ordering classement

diff --git a/project/assets/js/dae-poste.js b/project/assets/js/dae-poste.js
index a8b6d2a..cba1191 100644 (file)
--- a/project/assets/js/dae-poste.js
+++ b/project/assets/js/dae-poste.js
@@ -126,8 +126,7 @@ function recalculer_ligne(element) {
         if (valeur_point_text == "")
             valeur_point = 0;
         else
-            valeur_point = clean_float(valeur_point_text.split(" ")[1]);
-
+            valeur_point = clean_float(valeur_point_text.split(" ")[2]);
         if (salaire_manuel == false) {
             salaire = clean_float(valeur_point * coeff);
             salaire_input.val(salaire);

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()