X-Git-Url: http://git.auf.org/?p=auf_rh_dae.git;a=blobdiff_plain;f=project%2Frh%2Ftemplates%2Frh%2Finclude%2Fdossier.html;h=4441880e150ee971f77d353ab61daeca0b7ca202;hp=3475e278bd925985c884e785941d53a58d58ad17;hb=838bc59d54d5f65ecc2a5cb4e789074e0f9ba764;hpb=71aec2c373b863afae294d831ccc549dec22c9ce

diff --git a/project/rh/templates/rh/include/dossier.html b/project/rh/templates/rh/include/dossier.html
index 3475e27..4441880 100644
--- a/project/rh/templates/rh/include/dossier.html
+++ b/project/rh/templates/rh/include/dossier.html
@@ -1,53 +1,61 @@
-<h2>Dossier {{ dossier }}</h2>
-
-<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>
-    <tr><th>Date fin d'occupation</th><td>{% if dossier.date_fin == None %}<span style="color: red;">en cours</span>{% else %}{{ dossier.date_fin }}{% endif %}</td></tr>
-
-    <tr><th>Régime de travail (% du temps complet)</th><td>{{ dossier.regime_travail }}</td></tr>
-    <tr><th>Régime de travail (Nb. heures par semaine)</th><td>{{ dossier.regime_travail_nb_heure_semaine }}</td></tr>
-</table>
-
-<h3>Information</h3>
-<table>
-    <tr><th>Statut</th><td>{{ dossier.statut }}</td></tr>
-    <tr><th>Organisme BSTG</th><td>{{ dossier.organisme_bstg }}</td></tr>
-    <tr><th>Statut de résidence</th><td>{{ dossier.statut_residence }}</td></tr>
-    <tr><th>Classement</th><td>{{ dossier.classement }}</td></tr>
+<fieldset class="module">
+    <h2>Annuaire</h2>
+    {% include "rh/form-row.html" with label="Région" value=dossier.poste.implantation.region %}
+    {% include "rh/form-row.html" with label="Implantation" value=dossier.poste.implantation %}
+</fieldset>
+
+<fieldset class="module">
+    <h2>Informations générales</h2>
+    {% include "rh/form-row.html" with label="Date début d'occupation" value=dossier.date_debut %}
+    {% include "rh/form-row.html" with label="Date fin d'occupation" value=dossier.date_fin %}
+    {% include "rh/form-row.html" with label="Régime de travail (% du temps complet)" value=dossier.regime_travail %}
+    {% include "rh/form-row.html" with label="Régime de travail (Nb. heures par semaine)" value=dossier.regime_travail_nb_heure_semaine %}
+    {% include "rh/form-row.html" with label="Statut" value=dossier.statut %}
+    {% include "rh/form-row.html" with label="Organisme BSTG" value=dossier.organisme_bstg %}
+    {% include "rh/form-row.html" with label="Statut de résidence" value=dossier.statut_residence %}
     {% if dossier.remplacement %}
-        <th>Remplacement</th><td>{{ dossier.remplacement_de }}</td></tr>
+        {% include "rh/form-row.html" with label="Remplacement" value=dossier.remplacement_de %}
     {% endif %}
-</table>
+</fieldset>
 
-{% include "rh/include/remunerations.html" with remunerations=dossier.remunerations %}
+<fieldset class="module page-break">
+    <h2>Rémunération en cours</h2>
+    <table>
+        {% include "dae/embauche-remun-consulter.html" %}
+    </table>
+</fieldset>
 
 {% include "rh/include/pieces.html" %}
 
-<h3>Contrats</h3>
-<table>
-  <tr>
-    <th>Type</th>
-    <th>Date début</th>
-    <th>Date fin</th>
-    <th>Fichier</th>
-  </tr>
-  {% for c in contrats %}
-  <tr>
-    <td>{{ c.type_contrat }}</td>
-    <td>{{ c.date_debut }}</td>
-    <td>{{ c.date_fin }}</td>
-    <td>{% if c.fichier %}
-      <a href="{{ media }}{{ c.fichier }}">Télécharger</a>
-      {% endif %}
-    </td>
-  </tr>
-  {% endfor %}
-</table>
+<fieldset class="module">
+    <h2>Contrats</h2>
+    <table>
+      <tr>
+        <th>Type</th>
+        <th>Date début</th>
+        <th>Date fin</th>
+        <th>Fichier</th>
+      </tr>
+      {% for c in contrats %}
+      <tr>
+        <td>{{ c.type_contrat }}</td>
+        <td>{{ c.date_debut }}</td>
+        <td>{{ c.date_fin }}</td>
+        <td>{% if c.fichier %}
+          <a href="{{ media }}{{ c.fichier }}">Télécharger</a>
+          {% endif %}
+        </td>
+      </tr>
+      {% endfor %}
+    </table>
+</fieldset>
+
+<fieldset class="module">
+    <h2>Historique de rémunération</h2>
+{% include "rh/include/remunerations.html" with remunerations=dossier.remunerations %}
+</fieldset>
 
+<fieldset class="module">
+    <h2>Commentaires</h2>
 {% include "rh/include/commentaires.html" %}
+</fieldset>