Apercu des postes, employés et dossiers

diff --git a/project/rh/admin.py b/project/rh/admin.py
index 909ca30..c0e8c07 100644 (file)
--- a/project/rh/admin.py
+++ b/project/rh/admin.py
@@ -353,6 +353,7 @@ class DossierAdmin(AUFMetadataAdminMixin, ProtectRegionMixin, admin.ModelAdmin,
         for instance in instances:
             if instance.__class__ == rh.DossierCommentaire:
                 instance.owner = request.user
+                instance.date_creation = datetime.datetime.now()
             instance.save()
 
 
@@ -436,6 +437,7 @@ class EmployeAdmin(AUFMetadataAdminMixin, ProtectRegionMixin, admin.ModelAdmin):
         for instance in instances:
             if instance.__class__ == rh.EmployeCommentaire:
                 instance.owner = request.user
+                instance.date_creation = datetime.datetime.now()
             instance.save()
 
 
@@ -593,6 +595,7 @@ class PosteAdmin(AUFMetadataAdminMixin, ProtectRegionMixin, admin.ModelAdmin, Aj
         for instance in instances:
             if instance.__class__ == rh.PosteCommentaire:
                 instance.owner = request.user
+                instance.date_creation = datetime.datetime.now()
             instance.save()
         formset.save_m2m()
 

diff --git a/project/rh/models.py b/project/rh/models.py
index 0c47dfe..2f9510d 100644 (file)
--- a/project/rh/models.py
+++ b/project/rh/models.py
@@ -627,6 +627,9 @@ class Dossier_(AUFMetadata):
     def remunerations(self):
         return self.rh_remunerations.all().order_by('date_debut')
 
+    def remunerations_en_cours(self):
+        return self.rh_remunerations.all().filter(date_fin__exact=None).order_by('date_debut')
+
     def get_salaire(self):
         try:
             return [r for r in self.remunerations().order_by('-date_debut') if r.type_id == 1][0]

diff --git a/project/rh/templates/admin/rh/dossier/apercu.html b/project/rh/templates/admin/rh/dossier/apercu.html
index dac1d6a..a4a0621 100644 (file)
--- a/project/rh/templates/admin/rh/dossier/apercu.html
+++ b/project/rh/templates/admin/rh/dossier/apercu.html
@@ -1,4 +1,5 @@
 {% extends 'admin/change_form.html' %}
+
 {% load i18n admin_modify adminmedia %}
 
 {% block breadcrumbs %}{% if not is_popup %}

diff --git a/project/rh/templates/admin/rh/employe/apercu.html b/project/rh/templates/admin/rh/employe/apercu.html
index c7fa621..46c3d9d 100644 (file)
--- a/project/rh/templates/admin/rh/employe/apercu.html
+++ b/project/rh/templates/admin/rh/employe/apercu.html
@@ -15,7 +15,7 @@
 {% include "rh/include/imprimer.html" %}
 
 {% include "rh/include/employe.html" %}
-<h3 />
+<hr style="margin-top:20px" />
 {% for dossier in dossiers %}
         {% include "rh/include/dossier.html" %}
         <hr />

diff --git a/project/rh/templates/admin/rh/poste/apercu.html b/project/rh/templates/admin/rh/poste/apercu.html
index 18de6a8..0eff9bc 100644 (file)
--- a/project/rh/templates/admin/rh/poste/apercu.html
+++ b/project/rh/templates/admin/rh/poste/apercu.html
@@ -12,7 +12,7 @@
 
 {% block content %}
 <h1>Fiche de poste</h1>
-<h2> {{ poste }}</h2>
+<h2> {{ poste.nom }} - {{ poste.implantation.nom }}</h2>
 {% include "rh/include/imprimer.html" %}
 
 {% include "rh/include/poste.html" %}

diff --git a/project/rh/templates/rh/include/commentaires.html b/project/rh/templates/rh/include/commentaires.html
index 62ca5d0..b76c779 100644 (file)
--- a/project/rh/templates/rh/include/commentaires.html
+++ b/project/rh/templates/rh/include/commentaires.html
@@ -1,20 +1,27 @@
 {% if commentaires|length > 0  %}
-<h3>Commentaires</h3>
-<table>
-  <thead>
-    <tr>
-      <th>Commentaire</th>
-      <th>Auteur</th>
-    </tr>
-  </thead>
-  <tbody>
-    {% for c in commentaires %}
-    <tr>
-      <td>{{ c.texte }}</td>
-      <td>{{ c.owner }}</td>
-    </tr>
-    {% endfor %}
-  </tbody>
-</table>
+<div>
+  <h3>Commentaires</h3>
+  {% comment %}
+  <a class="noprint action-remove-block" href="#">Retirer de l'impression</a>
+  {% endcomment %}
+  <table>
+    <thead>
+      <tr>
+        <th>Commentaire</th>
+        <th>Auteur</th>
+        <th>Date</th>
+      </tr>
+    </thead>
+    <tbody>
+      {% for c in commentaires %}
+      <tr>
+        <td>{{ c.texte }}</td>
+        <td>{{ c.owner }}</td>
+        <td>{{ c.date_creation|default:"" }}</td>
+      </tr>
+      {% endfor %}
+    </tbody>
+  </table>
+</div>
 {% endif %}
 

diff --git a/project/rh/templates/rh/include/dossier.html b/project/rh/templates/rh/include/dossier.html
index dcae524..3475e27 100644 (file)
--- a/project/rh/templates/rh/include/dossier.html
+++ b/project/rh/templates/rh/include/dossier.html
@@ -3,6 +3,8 @@
 <h3>Implantation</h3>
 {{ dossier.poste.implantation }}
 
+{% include "rh/include/remunerations.html" with remunerations=dossier.remunerations_en_cours %}
+
 <h3>Durée et régime</h3>
 <table>
     <tr><th>Date début d'occupation</th><td>{{ dossier.date_debut }}</td></tr>
@@ -23,28 +25,7 @@
     {% endif %}
 </table>
 
-
-<h3>Rémunérations</h3>
-<table>
-    <tr>
-        <th>Type</th>
-        <th>Nature</th>
-        <th>Montant (devise)</th>
-        <th>Commentaire</th>
-        <th>Date début</th>
-        <th>Date fin</th>
-    </tr>
-    {% for r in dossier.remunerations %}
-    <tr>
-        <th>{{ r.type }}</th>
-        <th>{{ r.type.nature_remuneration }}</th>
-        <td>{{ r.montant }} {{ r.devise.code }}</td>
-        <td>{{ r.commentaire }}</td>
-        <td>{{ r.date_debut }}</td>
-        <td>{{ r.date_fin }}</td>
-    </tr>
-    {% endfor %}
-</table>
+{% include "rh/include/remunerations.html" with remunerations=dossier.remunerations %}
 
 {% include "rh/include/pieces.html" %}
 

diff --git a/project/rh/templates/rh/include/imprimer.html b/project/rh/templates/rh/include/imprimer.html
index 6edfcd6..1006557 100644 (file)
--- a/project/rh/templates/rh/include/imprimer.html
+++ b/project/rh/templates/rh/include/imprimer.html
@@ -2,6 +2,7 @@
 @media print {
     .noprint, ul.object-tools .noprint {display: none;}
 }
+/*
 .action-remove-block {
   display: block;
   position: relative;
@@ -10,21 +11,18 @@
 }
 table { clear: both; float: none }
 h3 { float: left }
+*/
 </style>
 <script type="text/javascript">
-  var objects = document.getElementsByClassName("action-remove-block");
-  for(var i = 0; i < objects.length; i++) {
-    console.log(objects[i])
-    objects[i].onclick = function(){ 
-      for(var n = 0; n < objects[i].parentNode.length;i++)
-      {
-        if(objects[i].parentNode[n] == this)
-        {
-          var next = objects[i].parentNode[n + 1];
-        }
+  document.addEventListener("DOMContentLoaded", function() {
+    var objects = document.getElementsByClassName("action-remove-block");
+    for(var i = 0; i < objects.length; i++) {
+      objects[i].onclick = function(){ 
+        this.parentNode.parentNode.removeChild(this.parentNode);
+        return false;
       }
     }
-  }
+  }, false);
 </script>
 
 <ul class="object-tools">

diff --git a/project/rh/templates/rh/include/pieces.html b/project/rh/templates/rh/include/pieces.html
index c2f69f8..016aa83 100644 (file)
--- a/project/rh/templates/rh/include/pieces.html
+++ b/project/rh/templates/rh/include/pieces.html
@@ -1,15 +1,20 @@
 {% if pieces|length > 0 %}
-<h3>Pièces</h3>
-<table>
-    <tr>
-        <th>Nom</th>
-        <th>Lien</th>
-    </tr>
-    {% for p in pieces %}
-    <tr>
-        <th>{{ p }}</th>
-        <th><a href="{{ media_url }}{{ p.fichier }}">Télécharger</a></th>
-    </tr>
-    {% endfor %}
-</table>
+<div>
+  <h3>Pièces</h3>
+  {% comment %}
+  <a class="noprint action-remove-block" href="#">Retirer de l'impression</a>
+  {% endcomment %}
+  <table>
+      <tr>
+          <th>Nom</th>
+          <th>Lien</th>
+      </tr>
+      {% for p in pieces %}
+      <tr>
+          <th>{{ p }}</th>
+          <th><a href="{{ media_url }}{{ p.fichier }}">Télécharger</a></th>
+      </tr>
+      {% endfor %}
+  </table>
+</div>
 {% endif %}

diff --git a/project/rh/templates/rh/include/poste.html b/project/rh/templates/rh/include/poste.html
index 96ed335..191721e 100644 (file)
--- a/project/rh/templates/rh/include/poste.html
+++ b/project/rh/templates/rh/include/poste.html
@@ -1,216 +1,270 @@
-<h3>Identification</h3>
+<div>
+  <h3>Identification</h3>
+  {% comment %}
+  <a class="noprint action-remove-block" href="#">Retirer de l'impression</a>
+  {% endcomment %}
+  <table>
+      <tr><th>Nom</th><td>{{ poste.nom }}</td></tr>
+      <tr><th>Implantation</th><td>{{ poste.implantation }}</td></tr>
+      <tr><th>Type</th><td>{{ poste.type_poste }}</td></tr>
+      <tr><th>Service</th><td>{{ poste.service }}</td></tr>
+      <tr><th>Responsable</th><td>{{ poste.responsable }}</td></tr>
+  </table>
+</div>
 
-<table>
+<div>
+  <h3>Contrat</h3>
+  {% comment %}
   <a class="noprint action-remove-block" href="#">Retirer de l'impression</a>
-    <tr><th>Nom</th><td>{{ poste.nom }}</td></tr>
-    <tr><th>Implantation</th><td>{{ poste.implantation }}</td></tr>
+  {% endcomment %}
+  <table>
+      <tr><th>Régime de travail (% du temps complet)</th><td>{{ poste.regime_travail }}</td></tr>
+      <tr><th>Régime de travail (Nb. heures par semaine)</th><td>{{ poste.regime_travail_nb_heure_semaine }}</td></tr>
+  </table>
+</div>
 
-    <tr><th>Type</th><td>{{ poste.type_poste }}</td></tr>
-    <tr><th>Service</th><td>{{ poste.service }}</td></tr>
-    <tr><th>Responsable</th><td>{{ poste.responsable }}</td></tr>
-</table>
+<div>
+  <h3>Recrutement</h3>
+  {% comment %}
+  <a class="noprint action-remove-block" href="#">Retirer de l'impression</a>
+  {% endcomment %}
+  <table>
+      <tr><th>Local</th><td>{{ poste.local|yesno:"Oui,Non,Inconnu" }}</td></tr>
+      <tr><th>Expatrié</th><td>{{ poste.expatrie|yesno:"Oui,Non,Inconnu" }}</td></tr>
+      <tr><th>Mise à disposition</th><td>{{ poste.mise_a_disposition|yesno:"Oui,Non,Inconnu" }}</td></tr>
+      <tr><th>Appel à candidature</th><td>{{ poste.appel }}</td></tr>
+  </table>
+</div>
 
-<h3>Contrat</h3>
-<table>
-    <tr><th>Régime de travail (% du temps complet)</th><td>{{ poste.regime_travail }}</td></tr>
-    <tr><th>Régime de travail (Nb. heures par semaine)</th><td>{{ poste.regime_travail_nb_heure_semaine }}</td></tr>
-</table>
+<div>
+  <h3>Rémunération</H3>
+  {% comment %}
+  <a class="noprint action-remove-block" href="#">Retirer de l'impression</a>
+  {% endcomment %}
+  <table id="classement">
+    <thead>
+      <tr>
+        <th></th>
+        <th>Min.</th>
+        <th>Max.</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <th>Échelon AUF</th>
+        <td>{{ poste.classement_min|default:"s/o" }}</td>
+        <td>{{ poste.classement_max|default:"s/o" }}</td>
+      </tr>
+      <tr>
+        <th>Valeur du point</th>
+        <td class="montant">{{ poste.valeur_point_min|default:"" }}</td>
+        <td class="montant">{{ poste.valeur_point_max|default:"" }}</td>
+      </tr>
+      <tr>
+        <th>Salaire de base</th>
+        <td class="montant">{{ poste.salaire_min|default:"0"|floatformat:0 }} {{ poste.devise_min.code }}</td>
+        <td class="montant">{{ poste.salaire_max|default:"0"|floatformat:0 }} {{ poste.devise_max.code }}</td>
+      </tr>
+      <tr>
+        <th>Indemnité</th>
+        <td class="montant">{{ poste.indemn_min|default:"0"|floatformat:0 }} {{ poste.devise_min.code }}</td>
+        <td class="montant">{{ poste.indemn_max|default:"0"|floatformat:0 }} {{ poste.devise_max.code }}</td>
+      </tr>
+      <tr>
+        <th>Autres</th>
+        <td class="montant">{{ poste.autre_min|default:"0"|floatformat:0 }} {{ poste.devise_min.code }}</td>
+        <td class="montant">{{ poste.autre_max|default:"0"|floatformat:0 }} {{ poste.devise_max.code }}</td>
+      </tr>
+    </tbody>
+  </table>
+</div>
 
-<h3>Recrutement</h3>
-<table>
-    <tr><th>Local</th><td>{{ poste.local|yesno:"Oui,Non,Inconnu" }}</td></tr>
-    <tr><th>Expatrié</th><td>{{ poste.expatrie|yesno:"Oui,Non,Inconnu" }}</td></tr>
-    <tr><th>Mise à disposition</th><td>{{ poste.mise_a_disposition|yesno:"Oui,Non,Inconnu" }}</td></tr>
-    <tr><th>Appel à candidature</th><td>{{ poste.appel }}</td></tr>
-</table>
-<h3>Rémunération</H3>
-<table id="classement">
-  <thead>
-    <tr>
-      <th></th>
-      <th>Min.</th>
-      <th>Max.</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <th>Échelon AUF</th>
-      <td>{{ poste.classement_min|default:"s/o" }}</td>
-      <td>{{ poste.classement_max|default:"s/o" }}</td>
-    </tr>
-    <tr>
-      <th>Valeur du point</th>
-      <td class="montant">{{ poste.valeur_point_min|default:"" }}</td>
-      <td class="montant">{{ poste.valeur_point_max|default:"" }}</td>
-    </tr>
-    <tr>
-      <th>Salaire de base</th>
-      <td class="montant">{{ poste.salaire_min|default:"0"|floatformat:0 }} {{ poste.devise_min.code }}</td>
-      <td class="montant">{{ poste.salaire_max|default:"0"|floatformat:0 }} {{ poste.devise_max.code }}</td>
-    </tr>
-    <tr>
-      <th>Indemnité</th>
-      <td class="montant">{{ poste.indemn_min|default:"0"|floatformat:0 }} {{ poste.devise_min.code }}</td>
-      <td class="montant">{{ poste.indemn_max|default:"0"|floatformat:0 }} {{ poste.devise_max.code }}</td>
-    </tr>
-    <tr>
-      <th>Autres</th>
-      <td class="montant">{{ poste.autre_min|default:"0"|floatformat:0 }} {{ poste.devise_min.code }}</td>
-      <td class="montant">{{ poste.autre_max|default:"0"|floatformat:0 }} {{ poste.devise_max.code }}</td>
-    </tr>
-  </tbody>
-</table>
+<div>
+  <h3>Comparatif</H3>
+  {% comment %}
+  <a class="noprint action-remove-block" href="#">Retirer de l'impression</a>
+  {% endcomment %}
+  <h4 style="float:none; clear: both">Device comparative : {{ poste.devise_comparaison }} </h4>
+  <table id="classement">
+    <thead>
+      <tr>
+        <th></th>
+        <th>Min.</th>
+        <th>Max.</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <th>Comp. locale</th>
+        <td class="montant">{{ poste.comp_locale_min|default:"0" }}</td>
+        <td class="montant">{{ poste.comp_locale_max|default:"0" }}</td>
+      </tr>
+      <tr>
+        <th>Comp. université</th>
+        <td class="montant">{{ poste.comp_universite_min|default:"0" }}</td>
+        <td class="montant">{{ poste.comp_universite_max|default:"0" }}</td>
+      </tr>
+      <tr>
+        <th>Comp. fonction pub.</th>
+        <td class="montant">{{ poste.comp_fonctionpub_min|default:"0" }}</td>
+        <td class="montant">{{ poste.comp_fonctionpub_max|default:"0" }}</td>
+      </tr>
+      <tr>
+        <th>Comp. ONG</th>
+        <td class="montant">{{ poste.comp_ong_min|default:"0" }}</td>
+        <td class="montant">{{ poste.comp_ong_max|default:"0" }}</td>
+      </tr>
+      <tr>
+        <th>Comp. autre</th>
+        <td class="montant">{{ poste.comp_autre_min|default:"0" }}</td>
+        <td class="montant">{{ poste.comp_autre_max|default:"0" }}</td>
+      </tr>
+      <tr>
+        <th>valeur</th>
+        <td class="montant">{{ poste.valeur_valeur_min|default:"0" }}</td>
+        <td class="montant">{{ poste.valeur_valeur_max|default:"0" }}</td>
+      </tr>
+    </tbody>
+  </table>
+</div>
 
-<h3>Comparatif</H3>
-<h4>Device comparative : {{ poste.devise_comparaison }} </h4>
-<table id="classement">
-  <thead>
-    <tr>
-      <th></th>
-      <th>Min.</th>
-      <th>Max.</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <th>Comp. locale</th>
-      <td class="montant">{{ poste.comp_locale_min|default:"0" }}</td>
-      <td class="montant">{{ poste.comp_locale_max|default:"0" }}</td>
-    </tr>
-    <tr>
-      <th>Comp. université</th>
-      <td class="montant">{{ poste.comp_universite_min|default:"0" }}</td>
-      <td class="montant">{{ poste.comp_universite_max|default:"0" }}</td>
-    </tr>
-    <tr>
-      <th>Comp. fonction pub.</th>
-      <td class="montant">{{ poste.comp_fonctionpub_min|default:"0" }}</td>
-      <td class="montant">{{ poste.comp_fonctionpub_max|default:"0" }}</td>
-    </tr>
-    <tr>
-      <th>Comp. ONG</th>
-      <td class="montant">{{ poste.comp_ong_min|default:"0" }}</td>
-      <td class="montant">{{ poste.comp_ong_max|default:"0" }}</td>
-    </tr>
-    <tr>
-      <th>Comp. autre</th>
-      <td class="montant">{{ poste.comp_autre_min|default:"0" }}</td>
-      <td class="montant">{{ poste.comp_autre_max|default:"0" }}</td>
-    </tr>
-    <tr>
-      <th>valeur</th>
-      <td class="montant">{{ poste.valeur_valeur_min|default:"0" }}</td>
-      <td class="montant">{{ poste.valeur_valeur_max|default:"0" }}</td>
-    </tr>
-  </tbody>
-</table>
 {% if poste.justification %}
-<h3>Justification</h3>
-{{ poste.justification }}
+<div>
+  <h3>Justification</h3>
+  {% comment %}
+  <a class="noprint action-remove-block" href="#">Retirer de l'impression</a>
+  {% endcomment %}
+  <p style="float:none; clear: both">
+  {{ poste.justification }}
+  </p>
+</div>
 {% endif %}
 
 {% if poste.date_debut or poste.date_fin %}
-<h3>Autres méta-données</h3>
-<table>
-  <tr>
-    <th>Date début</th>
-    <td>{{ poste.date_debut|default:"s/o" }}</td>
-  </tr>
-  <tr>
-    <th>Date fin</th>
-    <td>{{ poste.date_fin|default:"s/o" }}</td>
-  </tr>
-</table>
-
-{% endif %}
-
-{% if financements|length > 0  %}
-<h3>Financement</h3>
-<table>
-  <thead>
+<div>
+  <h3>Autres méta-données</h3>
+  {% comment %}
+  <a class="noprint action-remove-block" href="#">Retirer de l'impression</a>
+  {% endcomment %}
+  <table>
     <tr>
-      <th>Type</th>
-      <th>Pourcentage</th>
-      <th>Commentaire</th>
+      <th>Date début</th>
+      <td>{{ poste.date_debut|default:"s/o" }}</td>
     </tr>
-  </thead>
-  <tbody>
-    {% for f in financements %}
     <tr>
-      <td>{{ f.choix }}</td>
-      <td>{{ f.pourcentage|floatformat:"2" }}%</td>
-      <td>{{ f.commentaire }}</td>
+      <th>Date fin</th>
+      <td>{{ poste.date_fin|default:"s/o" }}</td>
     </tr>
-    {% endfor %}
-  </tbody>
-</table>
+  </table>
+</div>
+{% endif %}
+
+{% if financements|length > 0  %}
+<div>
+  <h3>Financement</h3>
+  {% comment %}
+  <a class="noprint action-remove-block" href="#">Retirer de l'impression</a>
+  {% endcomment %}
+  <table>
+    <thead>
+      <tr>
+        <th>Type</th>
+        <th>Pourcentage</th>
+        <th>Commentaire</th>
+      </tr>
+    </thead>
+    <tbody>
+      {% for f in financements %}
+      <tr>
+        <td>{{ f.choix }}</td>
+        <td>{{ f.pourcentage|floatformat:"2" }}%</td>
+        <td>{{ f.commentaire }}</td>
+      </tr>
+      {% endfor %}
+    </tbody>
+  </table>
+</div>
 {% endif %}
 
 {% include "rh/include/pieces.html" %}
 
 {% if dossiers|length > 0 %}
-<h3>Autres méta-données</h3>
-<table>
-  <tr>
-    <th>Date début</th>
-    <td>{{ poste.date_debut|default:"s/o" }}</td>
-  </tr>
-  <tr>
-    <th>Date fin</th>
-    <td>{{ poste.date_fin|default:"s/o" }}</td>
-  </tr>
-</table>
-
-{% endif %}
-
-{% if dossiers|length > 0  %}
-<h3>Dossiers</h3>
-<table>
-  <thead>
+<div>
+  <h3>Autres méta-données</h3>
+  {% comment %}
+  <a class="noprint action-remove-block" href="#">Retirer de l'impression</a>
+  {% endcomment %}
+  <table>
     <tr>
       <th>Date début</th>
-      <th>Date fin</th>
-      <th># du poste</th>
-      <th>Actif</th>
-      <th>Employé<th>
+      <td>{{ poste.date_debut|default:"s/o" }}</td>
     </tr>
-  </thead>
-  <tbody>
-    {% for d in dossiers %}
     <tr>
-      <td>{{ d.date_debut }}</td>
-      <td>{{ d.date_fin }}</td>
-      <td>{{ d.id }}</td>
-      <td>{{ d.actif|yesno:"Oui,Non" }}</td>
-      <td>{{ d.employe }}</td>
+      <th>Date fin</th>
+      <td>{{ poste.date_fin|default:"s/o" }}</td>
     </tr>
-    {% endfor %}
-  </tbody>
-</table>
+  </table>
+</div>
+{% endif %}
+
+{% if dossiers|length > 0  %}
+<div>
+  <h3>Dossiers</h3>
+  {% comment %}
+  <a class="noprint action-remove-block" href="#">Retirer de l'impression</a>
+  {% endcomment %}
+  <table>
+    <thead>
+      <tr>
+        <th>Date début</th>
+        <th>Date fin</th>
+        <th># du poste</th>
+        <th>Actif</th>
+        <th>Employé<th>
+      </tr>
+    </thead>
+    <tbody>
+      {% for d in dossiers %}
+      <tr>
+        <td>{{ d.date_debut }}</td>
+        <td>{{ d.date_fin }}</td>
+        <td>{{ d.id }}</td>
+        <td>{{ d.actif|yesno:"Oui,Non" }}</td>
+        <td>{{ d.employe }}</td>
+      </tr>
+      {% endfor %}
+    </tbody>
+  </table>
+</div>
 {% endif %}
 
 {% if comparaisons|length > 0  %}
-<h3>Dossiers de comparaison</h3>
-<table>
-  <thead>
-    <tr>
-      <th>Implantation</th>
-      <th>Nom</th>
-      <th>Montant</th>
-      <th>Devise<th>
-    </tr>
-  </thead>
-  <tbody>
-    {% for p in comparaisons %}
-    <tr>
-      <td>{{ p.implantation }}</td>
-      <td>{{ p.nom }}</td>
-      <td>{{ p.montant|floatformat:2 }}</td>
-      <td>{{ p.devise|default:"s/o" }}</td>
-    </tr>
-    {% endfor %}
-  </tbody>
-</table>
+<div>
+  <h3>Dossiers de comparaison</h3>
+  {% comment %}
+  <a class="noprint action-remove-block" href="#">Retirer de l'impression</a>
+  {% endcomment %}
+  <table>
+    <thead>
+      <tr>
+        <th>Implantation</th>
+        <th>Nom</th>
+        <th>Montant</th>
+        <th>Devise<th>
+      </tr>
+    </thead>
+    <tbody>
+      {% for p in comparaisons %}
+      <tr>
+        <td>{{ p.implantation }}</td>
+        <td>{{ p.nom }}</td>
+        <td>{{ p.montant|floatformat:2 }}</td>
+        <td>{{ p.devise|default:"s/o" }}</td>
+      </tr>
+      {% endfor %}
+    </tbody>
+  </table>
+</div>
 {% endif %}
 
 {% include "rh/include/commentaires.html" %}

diff --git a/project/rh/templates/rh/include/remunerations.html b/project/rh/templates/rh/include/remunerations.html
new file mode 100644 (file)
index 0000000..71f3bd2
--- /dev/null
+++ b/project/rh/templates/rh/include/remunerations.html
@@ -0,0 +1,25 @@
+{% if remunerations|length > 0 %}
+<h3>Rémunérations en cours</h3>
+<table>
+    <tr>
+        <th>Type</th>
+        <th>Nature</th>
+        <th>Montant (devise)</th>
+        <th>Commentaire</th>
+        <th>Date début</th>
+        <th>Date fin</th>
+    </tr>
+    {% for r in dossier.remunerations_en_cours %}
+    <tr>
+        <th>{{ r.type }}</th>
+        <th>{{ r.type.nature_remuneration }}</th>
+        <td>{{ r.montant }} {{ r.devise.code }}</td>
+        <td>{{ r.commentaire|default:"" }}</td>
+        <td>{{ r.date_debut }}</td>
+        <td>{{ r.date_fin }}</td>
+    </tr>
+    {% endfor %}
+</table>
+{% endif %}
+
+