From c267f20cc29e10e601f3a6a226eb5250062bf4eb Mon Sep 17 00:00:00 2001
From: davin baragiotta <davin.baragiotta@u-db.(none)>
Date: Fri, 12 Aug 2011 13:38:07 -0400
Subject: [PATCH] =?utf8?q?reorg=20templates...=20h=C3=A9ritent=20tous=20de=20?=
 =?utf8?q?sgrh.html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 project/media/css/sgrh.css                      |    2 ++
 project/rh/models.py                            |   19 ++++++++++
 project/rh/templates/rh/employe.html            |    7 ++--
 project/rh/templates/rh/employes_liste.html     |   14 ++------
 project/rh/templates/rh/include/employe.html    |   23 ++++++++++++
 project/rh/templates/rh/include/employe_li.html |    4 +++
 project/rh/templates/rh/profil.html             |   43 +++++++----------------
 project/rh/views.py                             |    2 --
 project/templates/404.html                      |    2 +-
 project/templates/500.html                      |    2 +-
 project/templates/550.html                      |    2 +-
 project/templates/accueil.html                  |    2 +-
 12 files changed, 69 insertions(+), 53 deletions(-)
 create mode 100644 project/rh/templates/rh/include/employe.html
 create mode 100644 project/rh/templates/rh/include/employe_li.html

diff --git a/project/media/css/sgrh.css b/project/media/css/sgrh.css
index bf26b48..a88bfbb 100644
--- a/project/media/css/sgrh.css
+++ b/project/media/css/sgrh.css
@@ -22,3 +22,5 @@
 .bordure { border:1px solid #162d50; }
 
 div.contenu { padding:10px 0px 10px 0px; }
+
+li.no_puce { list-style-type:none; }
diff --git a/project/rh/models.py b/project/rh/models.py
index b78a967..3651cc3 100644
--- a/project/rh/models.py
+++ b/project/rh/models.py
@@ -1,8 +1,11 @@
 # -=- encoding: utf-8 -=-
 
+from datetime import date
+
 from django.core.files.storage import FileSystemStorage
 from django.db import models
 from django.conf import settings
+
 from auf.django.metadata.models import AUFMetadata
 from auf.django.metadata.managers import NoDeleteManager
 import datamaster_modeles.models as ref
@@ -360,6 +363,22 @@ class Employe(AUFMetadata):
         """
         from django.core.urlresolvers import reverse
         return reverse('rh_photo', kwargs={'id':self.id})
+        
+    def postes_encours(self):
+        pass
+        
+    def dossiers_passes(self):
+        today = date.today()
+        return self.dossiers.filter(date_fin__lt=today).order_by('-date_fin')
+        
+    def dossiers_futurs(self):
+        today = date.today()
+        return self.dossiers.filter(date_debut__gt=today).order_by('-date_fin')
+        
+    def dossiers_encours(self):
+        dossiers_p_f = self.dossiers_passes() | self.dossiers_futurs()
+        ids_dossiers_p_f = [d.id for d in dossiers_p_f]
+        return self.dossiers.exclude(id__in=ids_dossiers_p_f).order_by('-date_fin')
 
 class EmployePiece(models.Model):
     """Documents relatifs à un employé.
diff --git a/project/rh/templates/rh/employe.html b/project/rh/templates/rh/employe.html
index 35917f3..9cf3ef5 100644
--- a/project/rh/templates/rh/employe.html
+++ b/project/rh/templates/rh/employe.html
@@ -1,11 +1,10 @@
-{% extends 'base.html' %}
+{% extends 'sgrh.html' %}
 
 {% block title %}RH - {{ employe }}{% endblock %}
 {% block sous_titre %}Employés{% endblock %}
 
 {% block main %}
-<h1>{{ employe }}</h1>
 
-{{ employe }}­
-{% endblock %}
+{% include "rh/include/employe.html" %}
 
+{% endblock %}
diff --git a/project/rh/templates/rh/employes_liste.html b/project/rh/templates/rh/employes_liste.html
index 6f1fcda..3a30370 100644
--- a/project/rh/templates/rh/employes_liste.html
+++ b/project/rh/templates/rh/employes_liste.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'sgrh.html' %}
 
 {% block title %}RH - Employés{% endblock %}
 {% block sous_titre %}Employés{% endblock %}
@@ -19,17 +19,7 @@ http://intranet.auf/rubrique46.html
 
 <ul>
 {% for e in employes %}
-    <li>
-    {% comment %}
-    {% if e.genre.lower == 'f' %}
-        <img src="{{ MEDIA_URL }}/images/femme16x21.png" alt="" />
-    {% else %}
-        <img src="{{ MEDIA_URL }}/images/homme16x21.png" alt="" />
-    {% endif %}
-    {% endcomment %}
-    <img src="{{ e.url_photo }}" alt="" width="16" height="21" />
-    <a href="{% url rh_employe e.id %}">{{ e }}</a>
-    </li>
+    {% include "rh/include/employe_li.html" %}
 {% endfor %}
 </ul>
 
diff --git a/project/rh/templates/rh/include/employe.html b/project/rh/templates/rh/include/employe.html
new file mode 100644
index 0000000..0d9eb3e
--- /dev/null
+++ b/project/rh/templates/rh/include/employe.html
@@ -0,0 +1,23 @@
+<div id="identification" class="contenu">
+    <div class="gauche">
+        <img src="{{ employe.url_photo }}" alt="Photo" class="bordure" />
+    </div>
+    <div class="gauche">
+        <h1>{{ employe.civilite }} {{ employe }}</h1>
+        
+        {% for d in employe.dossiers_encours %}
+            <p>
+            {% if employe.genre.upper == 'F' %}
+                {{ d.poste.nom_feminin }}
+            {% else %}
+                {{ d.poste.nom }}
+            {% endif %}
+            </p>
+            <p>
+            {{ d.poste.service|default_if_none:"Service inconnu" }}<br />
+            {{ d.poste.implantation.nom|default_if_none:"Implantation inconnue" }}<br />
+            {{ d.poste.implantation.adresse_physique_ville|default_if_none:"Ville inconnue" }}
+            </p>
+        {% endfor %}
+    </div>
+</div>
diff --git a/project/rh/templates/rh/include/employe_li.html b/project/rh/templates/rh/include/employe_li.html
new file mode 100644
index 0000000..1bdfce1
--- /dev/null
+++ b/project/rh/templates/rh/include/employe_li.html
@@ -0,0 +1,4 @@
+<li class="no_puce">
+<img src="{{ e.url_photo }}" alt="" width="16" height="21" />
+<a href="{% url rh_employe e.id %}">{{ e }}</a>
+</li>
diff --git a/project/rh/templates/rh/profil.html b/project/rh/templates/rh/profil.html
index d833ca1..2699c9c 100644
--- a/project/rh/templates/rh/profil.html
+++ b/project/rh/templates/rh/profil.html
@@ -4,29 +4,8 @@
 {% block sous_titre %}Mon profil RH{% endblock %}
 
 {% block main %}
-<div id="identification" class="contenu">
-    <div class="gauche">
-        <img src="{{ employe.url_photo }}" alt="Photo" class="bordure" />
-    </div>
-    <div class="gauche">
-        <h1>{{ employe.civilite }} {{ employe }}</h1>
-        
-        {% for d in dossiers_encours %}
-            <p>
-            {% if employe.genre.upper == 'F' %}
-                {{ d.poste.nom_feminin }}
-            {% else %}
-                {{ d.poste.nom }}
-            {% endif %}
-            </p>
-            <p>
-            {{ d.poste.service|default_if_none:"Service inconnu" }}<br />
-            {{ d.poste.implantation.nom }}<br />
-            {{ d.poste.implantation.adresse_physique_ville }}
-            </p>
-        {% endfor %}
-    </div>
-</div>
+
+{% include "rh/include/employe.html" %}
 
 <div id="infos_perso" class="clear gauche50 contenu">
     <h2>Informations personnelles</h2>
@@ -110,7 +89,7 @@
             <tr>
                 <th>Téléphone :</th>
                 <td>
-                {% for d in dossiers_encours %}
+                {% for d in employe.dossiers_encours %}
                     {% if d.poste.implantation.telephone_interne %}
                         {{ d.poste.implantation.telephone_interne }}
                     {% else %}
@@ -125,7 +104,7 @@
             <tr>
                 <th>Télécopie :</th>
                 <td>
-                {% for d in dossiers_encours %}
+                {% for d in employe.dossiers_encours %}
                     {% if d.poste.implantation.fax_interne %}
                         {{ d.poste.implantation.fax_interne }}
                     {% else %}
@@ -137,7 +116,7 @@
             <tr>
                 <th>Adresse postale :</th>
                 <td>
-                {% for d in dossiers_encours %}
+                {% for d in employe.dossiers_encours %}
                     {% comment %}
                     Formattage identique à annuaire intranet.
                     {% endcomment %}
@@ -200,9 +179,9 @@
 <hr />
 
 <div id="postes" class="contenu">
-    <h2>Poste{{ dossiers_encours|pluralize }} en cours</h2>
+    <h2>Poste{{ employe.dossiers_encours|pluralize }} en cours</h2>
     
-    {% for d in dossiers_encours %}
+    {% for d in employe.dossiers_encours %}
         <h3>{{ d.poste.nom }}</h3>
         <p>
         {{ d.poste.service }}<br />
@@ -271,10 +250,13 @@
 <hr />
 
 <div id="dossiers" class="contenu">
-    <h2>Ancien{{ dossiers|pluralize }} poste{{ dossiers|pluralize }}</h2>
+    <h2>
+    Ancien{{ employe.dossiers.count|pluralize }} poste{{ employe.dossiers.count|pluralize }}
+    ({{ employe.dossiers.count }})
+    </h2>
     <table>
     <tbody>
-    {% for d in dossiers_passes %}
+    {% for d in employe.dossiers_passes %}
         {% include "rh/include/dossier.html" %}
     {% endfor %}
     </tbody>
@@ -289,4 +271,3 @@
 {% endcomment %}
 
 {% endblock %}
-
diff --git a/project/rh/views.py b/project/rh/views.py
index dd820da..ec2245b 100644
--- a/project/rh/views.py
+++ b/project/rh/views.py
@@ -34,8 +34,6 @@ def profil(request):
     c['user'] = request.user
     c['employe'] = employe
     c['dossiers'] = dossiers.count()
-    c['dossiers_passes'] = dossiers_passes
-    c['dossiers_encours'] = dossiers_encours
     return render_to_response('rh/profil.html', c, rc)
     
 # employes
diff --git a/project/templates/404.html b/project/templates/404.html
index 9653978..4782525 100644
--- a/project/templates/404.html
+++ b/project/templates/404.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'sgrh.html' %}
 
 {% block title %}RH - Erreur 404{% endblock %}
 {% block sous_titre %}Erreur 404{% endblock %}
diff --git a/project/templates/500.html b/project/templates/500.html
index 09ea99e..8c2ca82 100644
--- a/project/templates/500.html
+++ b/project/templates/500.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'sgrh.html' %}
 
 {% block title %}RH - Erreur 500{% endblock %}
 {% block sous_titre %}Erreur 500{% endblock %}
diff --git a/project/templates/550.html b/project/templates/550.html
index a70bec5..6e86588 100644
--- a/project/templates/550.html
+++ b/project/templates/550.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'sgrh.html' %}
 
 {% block title %}RH - Erreur 550{% endblock %}
 {% block sous_titre %}Erreur 550{% endblock %}
diff --git a/project/templates/accueil.html b/project/templates/accueil.html
index add2cad..c13ca31 100644
--- a/project/templates/accueil.html
+++ b/project/templates/accueil.html
@@ -73,7 +73,7 @@ Voici pour chaque module les actions que vous pouvez faire.
     <p>Dix employés au hasard...</p>
     {% for e in employes %}
     <ul>
-        <li><a href="{% url rh_employe e.id %}">{{ e }}</a></li>
+        {% include "rh/include/employe_li.html" %}
     </ul>
     {% endfor %}
     </div>
-- 
1.7.10.4