poste apercu

diff --git a/project/rh/templates/admin/rh/poste/apercu.html b/project/rh/templates/admin/rh/poste/apercu.html
index 0eff9bc..63af777 100644 (file)
--- a/project/rh/templates/admin/rh/poste/apercu.html
+++ b/project/rh/templates/admin/rh/poste/apercu.html
@@ -1,6 +1,12 @@
 {% extends 'admin/change_form.html' %}
 {% load i18n admin_modify adminmedia %}
 
+{% block extrahead %}
+    {{ block.super }}
+    <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/admin_print.css" media="print"/>
+    <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/rh_apercus.css" media="all"/>
+{% endblock %}
+
 {% block breadcrumbs %}{% if not is_popup %}
 <div class="breadcrumbs">
      <a href="{% url admin:index %}">{% trans "Home" %}</a> &rsaquo;
@@ -11,10 +17,6 @@
 {% endif %}{% endblock %}
 
 {% block content %}
-<h1>Fiche de poste</h1>
-<h2> {{ poste.nom }} - {{ poste.implantation.nom }}</h2>
-{% include "rh/include/imprimer.html" %}
-
-{% include "rh/include/poste.html" %}
-
+    {% include "rh/include/imprimer.html" %}
+    {% include "rh/include/poste.html" %}
 {% endblock %}

diff --git a/project/rh/templates/rh/include/pieces.html b/project/rh/templates/rh/include/pieces.html
index 016aa83..12ebb40 100644 (file)
--- a/project/rh/templates/rh/include/pieces.html
+++ b/project/rh/templates/rh/include/pieces.html
@@ -1,9 +1,6 @@
 {% if pieces|length > 0 %}
-<div>
-  <h3>Pièces</h3>
-  {% comment %}
-  <a class="noprint action-remove-block" href="#">Retirer de l'impression</a>
-  {% endcomment %}
+<fieldset class="module">
+  <h2>Pièces</h2>
   <table>
       <tr>
           <th>Nom</th>
@@ -16,5 +13,5 @@
       </tr>
       {% endfor %}
   </table>
-</div>
+</fieldset>
 {% endif %}

diff --git a/project/rh/templates/rh/include/poste.html b/project/rh/templates/rh/include/poste.html
index 40a068b..6e6bad7 100644 (file)
--- a/project/rh/templates/rh/include/poste.html
+++ b/project/rh/templates/rh/include/poste.html
@@ -1,46 +1,30 @@
-<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>
+<fieldset class="module">
+  <h2>Identification</h2>
+  {% include "rh/form-row.html" with label="Nom" value=poste.nom %}
+  {% include "rh/form-row.html" with label="Implantation" value=poste.implantation %}
+  {% include "rh/form-row.html" with label="Type" value=poste.type_service %}
+  {% include "rh/form-row.html" with label="Service" value=poste.service %}
+  {% include "rh/form-row.html" with label="Responsable" value=poste.responsable %}
+</fieldset>
 
-<div>
-  <h3>Contrat</h3>
-  {% comment %}
-  <a class="noprint action-remove-block" href="#">Retirer de l'impression</a>
-  {% 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>
+<fieldset class="module">
+  <h2>Contrat</h2>
+  {% include "rh/form-row.html" with label="Régime de travail (% du temps complet)" value=poste.regime_travail %}
+  {% include "rh/form-row.html" with label="Régime de travail (Nb. heures par semaine)" value=poste.regime_travail_nb_heure_semaine %}
+</fieldset>
 
-<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>
+<fieldset class="module">
+  <h2>Recrutement</h2>
+  {% include "rh/form-row.html" with label="Local" value=poste.local|yesno:"Oui,Non,Inconnu" %}
+  {% include "rh/form-row.html" with label="Expatrié" value=poste.expatrie|yesno:"Oui,Non,Inconnu" %}
+  {% include "rh/form-row.html" with label="Mise à disposition" value=poste.mise_a_disposition|yesno:"Oui,Non,Inconnu" %}
+  {% include "rh/form-row.html" with label="Appel à candidature" value=poste.appel %}
+  {% include "rh/form-row.html" with label="Date début" value=poste.date_debut|default:"s/o" %}
+  {% include "rh/form-row.html" with label="Date fin" value=poste.date_fin|default:"s/o" %}
+</fieldset>
 
-<div>
-  <h3>Rémunération</H3>
-  {% comment %}
-  <a class="noprint action-remove-block" href="#">Retirer de l'impression</a>
-  {% endcomment %}
+<fieldset class="module">
+  <h2>Rémunération</h2>
   <table id="classement">
     <thead>
       <tr>
@@ -77,14 +61,12 @@
       </tr>
     </tbody>
   </table>
-</div>
+</fieldset>
 
-<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>
+<fieldset class="module">
+  <h2>Comparatif</h2>
+
+  <h4>Device comparative : {{ poste.devise_comparaison }} </h4>
   <table id="classement">
     <thead>
       <tr>
@@ -126,45 +108,20 @@
       </tr>
     </tbody>
   </table>
-</div>
+</fieldset>
 
 {% if 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">
+<fieldset class="module">
+  <h2>Justification</h2>
+  <p>
   {{ poste.justification }}
   </p>
-</div>
-{% endif %}
-
-{% if poste.date_debut or poste.date_fin %}
-<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>
-      <td>{{ poste.date_debut|default:"s/o" }}</td>
-    </tr>
-    <tr>
-      <th>Date fin</th>
-      <td>{{ poste.date_fin|default:"s/o" }}</td>
-    </tr>
-  </table>
-</div>
+</fieldset>
 {% endif %}
 
 {% if financements|length > 0  %}
-<div>
-  <h3>Financement</h3>
-  {% comment %}
-  <a class="noprint action-remove-block" href="#">Retirer de l'impression</a>
-  {% endcomment %}
+<fieldset class="module">
+  <h2>Financement</h2>
   <table>
     <thead>
       <tr>
@@ -183,53 +140,29 @@
       {% endfor %}
     </tbody>
   </table>
-</div>
+</fieldset>
 {% endif %}
 
 {% include "rh/include/pieces.html" %}
 
-{% if dossiers|length > 0 %}
-<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>
-      <td>{{ poste.date_debut|default:"s/o" }}</td>
-    </tr>
-    <tr>
-      <th>Date fin</th>
-      <td>{{ poste.date_fin|default:"s/o" }}</td>
-    </tr>
-  </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 %}
+<fieldset class="module">
+  <h2>Dossiers</h2>
   <table>
     <thead>
       <tr>
+        <th>Dossier #</th>
         <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><a href="{% url dossier_apercu d.id %}">{{ d.id }}</a></td>
         <td>{{ d.date_debut }}</td>
         <td>{{ d.date_fin|default:"indéterminée" }}</td>
-        <td>{{ d.id }}</td>
-        <td>{{ d.actif|yesno:"Oui,Non" }}</td>
         <td>{{ d.employe }}</td>
       </tr>
       {% endfor %}

diff --git a/project/rh/views.py b/project/rh/views.py
index 3922df3..0afadb8 100644 (file)
--- a/project/rh/views.py
+++ b/project/rh/views.py
@@ -424,9 +424,11 @@ def dossier_apercu(request, dossier_id):
 
 @region_protected(rh.Poste)
 def poste_apercu(request, poste_id):
+    p = get_object_or_404(rh.Poste, pk=poste_id)
     c = {
+        'title': u"Poste %s" % (p, ),
         'is_popup' : request.GET.get('_popup', False),
-        'poste' : get_object_or_404(rh.Poste, pk=poste_id),
+        'poste' : p,
         'financements' : rh.PosteFinancement.objects.filter(poste=poste_id).all(),
         'pieces' : rh.PostePiece.objects.filter(poste=poste_id).all(),
         'dossiers' : rh.Dossier.objects.filter(poste=poste_id).order_by("-date_debut").all(),