From b15bf54341ce5da0c354e6649ace6e3105492910 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Olivier=20Larchev=C3=AAque?= <olivier.larcheveque@auf.org>
Date: Mon, 16 May 2011 10:02:41 -0400
Subject: [PATCH] fix #1465

---
 project/dae/admin.py                           |    2 +-
 project/dae/forms.py                           |    4 +-
 project/dae/managers.py                        |    7 ++++
 project/dae/templates/dae/embauches_liste.html |   48 +++++++++++++++++++++++-
 project/dae/views.py                           |    4 +-
 5 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/project/dae/admin.py b/project/dae/admin.py
index c8f15a4..efaac95 100644
--- a/project/dae/admin.py
+++ b/project/dae/admin.py
@@ -5,7 +5,7 @@ from reversion.admin import VersionAdmin
 from models import Poste, JustificationQuestion
 
 class PosteAdmin(VersionAdmin):
-    list_display = ('_titre', 'pourvu')
+    list_display = ('_titre', 'pourvu', 'actif', )
 
     def _titre(self, obj):
         return unicode(obj)
diff --git a/project/dae/forms.py b/project/dae/forms.py
index d6eda59..a4a8f96 100644
--- a/project/dae/forms.py
+++ b/project/dae/forms.py
@@ -158,10 +158,10 @@ class PosteForm(forms.ModelForm):
     
     class Meta:
         model = dae.Poste
-
+        exclude = ('actif', )
         fields = ('poste', 'implantation', 'type_poste', 'service', 'nom',
                   'responsable', 'local', 'expatrie', 'mise_a_disposition',
-                  'appel', 'date_debut', 'date_fin', 'actif',
+                  'appel', 'date_debut', 'date_fin',
                   'regime_travail', 'regime_travail_nb_heure_semaine',
                   'classement_min', 'classement_max',
                   'valeur_point_min', 'valeur_point_max',
diff --git a/project/dae/managers.py b/project/dae/managers.py
index 86b85e2..df40a7c 100644
--- a/project/dae/managers.py
+++ b/project/dae/managers.py
@@ -86,6 +86,9 @@ class PosteManager(SecurityManager):
     """
     prefixe_implantation = "implantation"
 
+    def ma_region_ou_service(self, user):
+        return super(PosteManager, self).filter(actif=True)
+
     def get_query_set(self):
         fkeys = (
             'id_rh',
@@ -105,3 +108,7 @@ class PosteManager(SecurityManager):
 class DossierManager(SecurityManager):
     prefixe_implantation = "poste__implantation"
 
+    def ma_region_ou_service(self, user):
+        return super(DossierManager, self).filter(poste__actif=True)
+
+
diff --git a/project/dae/templates/dae/embauches_liste.html b/project/dae/templates/dae/embauches_liste.html
index 5d702e4..318373c 100644
--- a/project/dae/templates/dae/embauches_liste.html
+++ b/project/dae/templates/dae/embauches_liste.html
@@ -7,13 +7,15 @@
 {% block main %}
 <h1>Liste des demandes d'autorisation d'engagement de personnel</h1>
 
+<h2>Mes embauches à traiter</h2>
+{% if embauches_a_traiter %}
 <table>
     <tr>
         <th>Embauche</th>
         <th>Région</th>
         <th>État</th>
     </tr>
-{% for dossier in embauches %}
+{% for dossier in embauches_a_traiter %}
     <tr>
         <td><a href="{% url embauche_consulter dossier.id %}">{{ dossier }}</a></td>
         <td>{{ dossier.poste.implantation.region }}</td>
@@ -21,5 +23,49 @@
     </tr>
 {% endfor %}
 </table>
+{% else %}
+    <p>Vous n'avez aucune embauche à traiter.</p>
+{% endif %}
+
+<h2>Les embauches en cours</h2>
+{% if embauches_en_cours %}
+<table>
+    <tr>
+        <th>Embauche</th>
+        <th>Région</th>
+        <th>État</th>
+    </tr>
+{% for dossier in embauches_en_cours %}
+    <tr>
+        <td><a href="{% url embauche_consulter dossier.id %}">{{ dossier }}</a></td>
+        <td>{{ dossier.poste.implantation.region }}</td>
+        <td>{{ dossier.get_etat_display }}</td>
+    </tr>
+{% endfor %}
+</table>
+{% else %}
+    <p>Il n'y a aucune embauche en cours.</p>
+{% endif %}
+
+<h2>Les embauches non retenues</h2>
+{% if embauches_non_retenues %}
+<table>
+    <tr>
+        <th>Embauche</th>
+        <th>Région</th>
+        <th>État</th>
+    </tr>
+{% for dossier in embauches_non_retenues %}
+    <tr>
+        <td><a href="{% url embauche_consulter dossier.id %}">{{ dossier }}</a></td>
+        <td>{{ dossier.poste.implantation.region }}</td>
+        <td>{{ dossier.get_etat_display }}</td>
+    </tr>
+{% endfor %}
+</table>
+{% else %}
+    <p>Il n'y a aucune embauche non retenue.</p>
+{% endif %}
+
 
 {% endblock %}
diff --git a/project/dae/views.py b/project/dae/views.py
index 36f7501..6a318a6 100644
--- a/project/dae/views.py
+++ b/project/dae/views.py
@@ -354,7 +354,9 @@ def embauche(request, key=None, dossier_id=None):
 def embauches_liste(request):
     """ Liste des embauches. """
     vars = dict()
-    vars['embauches'] = dae.Dossier.objects.ma_region_ou_service(request.user).order_by('-date_creation')
+    vars['embauches_a_traiter'] = dae.Dossier.objects.ma_region_ou_service(request.user).order_by('-date_creation')
+    vars['embauches_en_cours'] = dae.Dossier.objects.ma_region_ou_service(request.user).filter(poste__pourvu=False).order_by('-date_creation')
+    vars['embauches_non_retenues'] = dae.Dossier.objects.ma_region_ou_service(request.user).filter(poste__pourvu=True).order_by('-date_creation')
     return render_to_response('dae/embauches_liste.html', vars, RequestContext(request))
 
 def employe(request, key):
-- 
1.7.10.4