WIP, Modification des apercus

diff --git a/project/rh/models.py b/project/rh/models.py
index 6457aa5..0c47dfe 100644 (file)
--- a/project/rh/models.py
+++ b/project/rh/models.py
@@ -249,6 +249,9 @@ class PosteFinancement_(models.Model):
     def __unicode__(self):
         return u'%s : %s %%' % (self.type, self.pourcentage)
 
+    def choix(self):
+        return u"%s" % dict(POSTE_FINANCEMENT_CHOICES)[self.type]
+
 
 class PosteFinancement(PosteFinancement_):
     pass

diff --git a/project/rh/templates/admin/rh/employe/apercu.html b/project/rh/templates/admin/rh/employe/apercu.html
index e1b4c5c..c7fa621 100644 (file)
--- a/project/rh/templates/admin/rh/employe/apercu.html
+++ b/project/rh/templates/admin/rh/employe/apercu.html
@@ -11,11 +11,11 @@
 {% endif %}{% endblock %}
 
 {% block content %}
-<h2>{{ employe }}</h2>
+<h1>Fiche employé</h1>
 {% include "rh/include/imprimer.html" %}
 
 {% include "rh/include/employe.html" %}
-
+<h3 />
 {% 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 b8aec4d..18de6a8 100644 (file)
--- a/project/rh/templates/admin/rh/poste/apercu.html
+++ b/project/rh/templates/admin/rh/poste/apercu.html
@@ -11,7 +11,8 @@
 {% endif %}{% endblock %}
 
 {% block content %}
-<h2>Aperçu du poste {{ poste }}</h2>
+<h1>Fiche de poste</h1>
+<h2> {{ poste }}</h2>
 {% include "rh/include/imprimer.html" %}
 
 {% include "rh/include/poste.html" %}

diff --git a/project/rh/templates/rh/include/employe.html b/project/rh/templates/rh/include/employe.html
index 3d095b9..ddf897b 100644 (file)
--- a/project/rh/templates/rh/include/employe.html
+++ b/project/rh/templates/rh/include/employe.html
@@ -1,2 +1,64 @@
-<h2>Employé</h2>
-<h3>{{ employe.nom|title }} {{employe.prenom|title }}</h3>
+<h2>{{ employe.nom|title }} {{employe.prenom|title }}</h2>
+<h3>Identification</h3>
+<table>
+  <tr>
+    <th>Nom</th>
+    <td>{{ employe.nom }}</td>
+  </tr>
+  <tr>
+    <th>Prénom</th>
+    <td>{{ employe.prenom }}</td>
+  </tr>
+  <tr>
+    <th>Nom d'affichage</th>
+    <td>{{ employe.nom_affichage|default:"" }}</td>
+  </tr>
+  <tr>
+    <th>Nationalité</th>
+    <td>{{ employe.nationalite }}</td>
+  </tr>
+  <tr>
+    <th>Date de naissance</th>
+    <td>{{ employe.date_naissance }}</td>
+  </tr>
+  <tr>
+    <th>Situation familiale</th>
+    <td>{{ employe.situation_famille.nom }}</td>
+  </tr>
+  <tr>
+    <th>Date d'entrée à l'AUF</th>
+    <td>{{ employe.date_entree }}</td>
+  </tr>
+</table>
+
+<h3>Coordonnées</h3>
+<table>
+  <tr>
+    <th>Adresse</th>
+    <td>{{ employe.adresse }}</td>
+  </tr>
+  <tr>
+    <th>Ville</th>
+    <td>{{ employe.ville }}</td>
+  </tr>
+  <tr>
+    <th>Code postal</th>
+    <td>{{ employe.code_postal }}</td>
+  </tr>
+  <tr>
+    <th>Province</th>
+    <td>{{ employe.province }}</td>
+  </tr>
+  <tr>
+    <th>Pays</th>
+    <td>{{ employe.pays }}</td>
+    </tr>
+  <tr>
+    <th>Tél. domicile</th>
+    <td>{{ employe.tel_domicile }}</td>
+  </tr>
+  <tr>
+    <th>Tél. mobile</th>
+    <td>{{ employe.tel_cellulaire }}</td>
+  </tr>
+</table>

diff --git a/project/rh/templates/rh/include/imprimer.html b/project/rh/templates/rh/include/imprimer.html
index 70b23cc..6edfcd6 100644 (file)
--- a/project/rh/templates/rh/include/imprimer.html
+++ b/project/rh/templates/rh/include/imprimer.html
@@ -1,8 +1,31 @@
 <style type="text/css">
 @media print {
-    ul.object-tools .noprint {display: none;}
+    .noprint, ul.object-tools .noprint {display: none;}
 }
+.action-remove-block {
+  display: block;
+  position: relative;
+  top: 10px;
+  left: 10px;
+}
+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];
+        }
+      }
+    }
+  }
+</script>
 
 <ul class="object-tools">
     <li><a href="javascript:window.print()" class="noprint">Imprimer</a></li>

diff --git a/project/rh/templates/rh/include/pieces.html b/project/rh/templates/rh/include/pieces.html
index 6247205..c2f69f8 100644 (file)
--- a/project/rh/templates/rh/include/pieces.html
+++ b/project/rh/templates/rh/include/pieces.html
@@ -8,7 +8,7 @@
     {% for p in pieces %}
     <tr>
         <th>{{ p }}</th>
-        <th><a href="{{ media }}{{ p.fichier }}">Télécharger</a></th>
+        <th><a href="{{ media_url }}{{ p.fichier }}">Télécharger</a></th>
     </tr>
     {% endfor %}
 </table>

diff --git a/project/rh/templates/rh/include/poste.html b/project/rh/templates/rh/include/poste.html
index 81ee60a..96ed335 100644 (file)
--- a/project/rh/templates/rh/include/poste.html
+++ b/project/rh/templates/rh/include/poste.html
@@ -1,7 +1,7 @@
-<h2>Poste</h2>
-
 <h3>Identification</h3>
+
 <table>
+  <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>
 
@@ -18,9 +18,9 @@
 
 <h3>Recrutement</h3>
 <table>
-    <tr><th>Local</th><td>{{ poste.local|yesno:"Oui,Non" }}</td></tr>
-    <tr><th>Expatrié</th><td>{{ poste.expatrie|yesno:"Oui,Non" }}</td></tr>
-    <tr><th>Mise à disposition</th><td>{{ poste.mise_a_disposition|yesno:"Oui,Non" }}</td></tr>
+    <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>
@@ -137,7 +137,7 @@
   <tbody>
     {% for f in financements %}
     <tr>
-      <td>{{ f.type }}</td>
+      <td>{{ f.choix }}</td>
       <td>{{ f.pourcentage|floatformat:"2" }}%</td>
       <td>{{ f.commentaire }}</td>
     </tr>

diff --git a/project/rh/views.py b/project/rh/views.py
index 7aa4c61..32dfa8f 100644 (file)
--- a/project/rh/views.py
+++ b/project/rh/views.py
@@ -311,7 +311,7 @@ def dossier_apercu(request, dossier_id):
         'pieces' :  rh.DossierPiece.objects.filter(dossier__exact=d),
         'contrats' : rh.Contrat.objects.filter(dossier__exact=d),
         'commentaires' : rh.DossierCommentaire.objects.filter(dossier__exact=d).all(),
-        'media' : settings.PRIVE_MEDIA_URL
+        'media_url': settings.PRIVE_MEDIA_URL,
     }
     return render_to_response('admin/rh/dossier/apercu.html', c, RequestContext(request))
 
@@ -325,6 +325,7 @@ def poste_apercu(request, poste_id):
         'dossiers' : rh.Dossier.objects.filter(poste=poste_id).order_by("-date_debut").all(),
         'comparaisons' : rh.PosteComparaison.objects.filter(poste=poste_id).all(),
         'commentaires' : rh.PosteCommentaire.objects.filter(poste=poste_id).all(),
+        'media_url': settings.PRIVE_MEDIA_URL,
     }
     return render_to_response('admin/rh/poste/apercu.html', c, RequestContext(request))
 
@@ -349,6 +350,7 @@ def employe_apercu(request, employe_id):
         'is_popup' : request.GET.get('_popup', False),
         'employe' : employe,
         'dossiers' : dossiers,
+        'media_url': settings.PRIVE_MEDIA_URL,
     }
     return render_to_response('admin/rh/employe/apercu.html', c, RequestContext(request))