[#2212] Montrer les totaux sans charges patronales dans la section "Classement"

diff --git a/project/dae/models.py b/project/dae/models.py
index 7f81d9f..f515cea 100644 (file)
--- a/project/dae/models.py
+++ b/project/dae/models.py
@@ -210,7 +210,10 @@ class Poste(PosteWorkflow, models.Model):
     #####################
 
     def get_couts_minimum(self):
-        return (float)(self.salaire_min + self.indemn_expat_min + + self.indemn_fct_min +  self.charges_patronales_min + self.autre_min)
+        return self.salaire_min + self.indemn_expat_min + self.indemn_fct_min + self.charges_patronales_min + self.autre_min
+
+    def get_salaire_minimum(self):
+        return self.get_couts_minimum() - self.charges_patronales_min
 
     def get_taux_minimum(self):
         taux_changes = rh.TauxChange.objects.filter(devise=self.devise_min).order_by('annee')
@@ -225,8 +228,14 @@ class Poste(PosteWorkflow, models.Model):
     def get_couts_minimum_euros(self):
         return self.get_couts_minimum() * self.get_taux_minimum()
 
+    def get_salaire_minimum_euros(self):
+        return self.get_salaire_minimum() * self.get_taux_minimum()
+
     def get_couts_maximum(self):
-        return (float)(self.salaire_max + self.indemn_expat_max + + self.indemn_fct_max +  self.charges_patronales_max + self.autre_max)
+        return self.salaire_max + self.indemn_expat_max + self.indemn_fct_max + self.charges_patronales_max + self.autre_max
+
+    def get_salaire_maximum(self):
+        return self.get_couts_maximum() - self.charges_patronales_max
 
     def get_taux_maximum(self):
         taux_changes = rh.TauxChange.objects.filter(devise=self.devise_max).order_by('annee')
@@ -241,29 +250,43 @@ class Poste(PosteWorkflow, models.Model):
     def get_couts_maximum_euros(self):
         return self.get_couts_maximum() * self.get_taux_maximum()
 
+    def get_salaire_maximum_euros(self):
+        return self.get_salaire_maximum() * self.get_taux_maximum()
 
     def show_taux_minimum(self):
         try:
             return self.get_taux_minimum()
-        except Exception, e:
+        except DeviseException, e:
             return e
 
     def show_couts_minimum_euros(self):
         try:
             return self.get_couts_minimum_euros()
-        except Exception, e:
+        except DeviseException, e:
+            return e
+
+    def show_salaire_minimum_euros(self):
+        try:
+            return self.get_salaire_minimum_euros()
+        except DeviseException, e:
             return e
 
     def show_taux_maximum(self):
         try:
             return self.get_taux_maximum()
-        except Exception, e:
+        except DeviseException, e:
             return e
 
     def show_couts_maximum_euros(self):
         try:
             return self.get_couts_maximum_euros()
-        except Exception, e:
+        except DeviseException, e:
+            return e
+
+    def show_salaire_maximum_euros(self):
+        try:
+            return self.get_salaire_maximum_euros()
+        except DeviseException, e:
             return e
 
 

diff --git a/project/dae/templates/dae/poste.html b/project/dae/templates/dae/poste.html
index d861538..74639c2 100644 (file)
--- a/project/dae/templates/dae/poste.html
+++ b/project/dae/templates/dae/poste.html
@@ -165,8 +165,10 @@ Demande d'autorisation d'embauche
             <th colspan="2">Charges patronales</th>
             <th colspan="2">Autres</th>
             <th colspan="2">TOTAL</th>
+            <th colspan="2">TOTAL sans charges patronales</th>
             <th>Taux&nbsp;>&nbsp;€</th>
             <th colspan="2">Conversion EUR</th>
+            <th colspan="2">Conversion EUR sans charges patronales</th>
         </tr>
         <tr>
             <th>Minimum</th>
@@ -197,9 +199,13 @@ Demande d'autorisation d'embauche
             <td><span class="devise_code">EUR</span></td>
             <td id="total_min" class="total-devise cell-nombre">0.00</td>
             <td><span class="devise_code">EUR</span></td>
+            <td id="total_min" class="remuneration-devise cell-nombre">0.00</td>
+            <td><span class="devise_code">EUR</span></td>
             <td class="taux">1</td>
             <td id="total_min_euro" class="total-euro cell-nombre">0.00</td>
             <td>€</td>
+            <td id="total_min_euro" class="remuneration-euro cell-nombre">0.00</td>
+            <td>€</td>
         </tr>
         <tr>
             <th>Maximun</th>
@@ -230,9 +236,13 @@ Demande d'autorisation d'embauche
             <td><span class="devise_code">EUR</span></td>
             <td id="total_max" class="total-devise cell-nombre">0.00</td>
             <td><span class="devise_code">EUR</span></td>
+            <td id="total_max" class="remuneration-devise cell-nombre">0.00</td>
+            <td><span class="devise_code">EUR</span></td>
             <td class="taux">1</td>
             <td id="total_max_euro" class="total-euro cell-nombre">0.00</td>
             <td>€</td>
+            <td id="total_max_euro" class="remuneration-euro cell-nombre">0.00</td>
+            <td>€</td>
         </tr>
         </tbody>
     </table>

diff --git a/project/dae/templates/dae/poste_resume.html b/project/dae/templates/dae/poste_resume.html
index f156a22..cad05bd 100644 (file)
--- a/project/dae/templates/dae/poste_resume.html
+++ b/project/dae/templates/dae/poste_resume.html
@@ -87,8 +87,10 @@
         <th>Charges patronales</th>
         <th>Autres</th>
         <th>TOTAL</th>
+        <th>TOTAL sans charges patronales</th>
         <th>Taux&nbsp;>&nbsp;€</th>
-        <th>EUR</th>
+        <th>TOTAL (EUR)</th>
+        <th>TOTAL (EUR) sans charges patronales</th>
     </tr>
     <tr>
         <th>Min.</th>
@@ -99,8 +101,10 @@
         <td class="montant">{{ poste.charges_patronales_min|floatformat:0 }} {{ poste.devise_min.code }}</td>
         <td class="montant">{{ poste.autre_min|floatformat:0 }} {{ poste.devise_min.code }}</td>
         <td class="montant">{{ poste.get_couts_minimum|floatformat:0 }} {{ poste.devise_min.code }}</td>
+        <td class="montant">{{ poste.get_salaire_minimum|floatformat:0 }} {{ poste.devise_min.code }}</td>
         <td>{{ poste.show_taux_minimum }}</td>
-        <td class="montant">{{ poste.show_couts_minimum_euros|floatformat:0 }}</td>
+        <td class="montant">{{ poste.show_couts_minimum_euros|floatformat:0 }} €</td>
+        <td class="montant">{{ poste.show_salaire_minimum_euros|floatformat:0 }} €</td>
     </tr>
     <tr>
         <th>Max.</th>
@@ -111,8 +115,10 @@
         <td class="montant">{{ poste.charges_patronales_max|floatformat:0 }} {{ poste.devise_max.code }}</td>
         <td class="montant">{{ poste.autre_max|floatformat:0 }} {{ poste.devise_max.code }}</td>
         <td class="montant">{{ poste.get_couts_maximum|floatformat:0 }} {{ poste.devise_max.code }}</td>
+        <td class="montant">{{ poste.get_salaire_maximum|floatformat:0 }} {{ poste.devise_max.code }}</td>
         <td>{{ poste.show_taux_maximum }}</td>
-        <td class="montant">{{ poste.show_couts_maximum_euros|floatformat:0 }}</td>
+        <td class="montant">{{ poste.show_couts_maximum_euros|floatformat:0 }} €</td>
+        <td class="montant">{{ poste.show_salaire_maximum_euros|floatformat:0 }} €</td>
     </tr>
     </tbody>
 </table>

diff --git a/project/media/js/dae-poste.js b/project/media/js/dae-poste.js
index f95f30a..526ace9 100644 (file)
--- a/project/media/js/dae-poste.js
+++ b/project/media/js/dae-poste.js
@@ -129,12 +129,15 @@ function recalculer_ligne(element) {
             salaire_input.val(salaire);
         }
         taux_euro = parseFloat(ligne.find(".taux").html())
-        total = 0;
         total = salaire + indemn_expat + indemn_fct + charges_patronales + autre;
+        remuneration = total - charges_patronales;
         total_euro = total * taux_euro;
+        remuneration_euro = remuneration * taux_euro;
 
         ligne.find(".total-devise").text(clean_float(total));
+        ligne.find(".remuneration-devise").text(clean_float(remuneration));
         ligne.find(".total-euro").text(clean_float(total_euro));
+        ligne.find(".remuneration-euro").text(clean_float(remuneration_euro));
     });
 
 }