From e4fa851febb62a6a57fee7a3c2ea9e3e2b610f89 Mon Sep 17 00:00:00 2001
From: Davin Baragiotta <davin.baragiotta@auf.org>
Date: Fri, 15 Jun 2012 16:55:29 -0400
Subject: [PATCH] L10N modif + list_per_page

---
 project/rh/admin.py                                         |   10 +++++++---
 project/rh/templates/rh/include/rapports_dossier_poste.html |    2 +-
 project/rh/templates/rh/rapports/contrats.html              |    2 +-
 project/rh/templates/rh/rapports/employes_sans_contrat.html |    2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/project/rh/admin.py b/project/rh/admin.py
index 744306e..f88c61e 100644
--- a/project/rh/admin.py
+++ b/project/rh/admin.py
@@ -349,6 +349,7 @@ class DossierAdmin(DateRangeMixin, AUFMetadataAdminMixin,
         'rh_contrats__type_contrat',
         'principal',
     )
+    #list_per_page = 5000   # optimiser avant de tout lister
     inlines = (DossierPieceInline, ContratInline,
                RemunerationInline,
                DossierCommentaireInline,
@@ -526,6 +527,7 @@ class EmployeAdmin(DateRangeMixin, AUFMetadataAdminMixin,
             '_date_modification',
             )
     list_display_links = ('_nom',)
+    #list_per_page = 5000   # optimiser avant de tout lister
     list_filter = (
             'rh_dossiers__poste__implantation__region',
             'rh_dossiers__poste__implantation',
@@ -667,6 +669,7 @@ class EmployeAdmin(DateRangeMixin, AUFMetadataAdminMixin,
 
 class EmployeProxyAdmin(EmployeAdmin):
     list_display = ('_id', '_apercu', '_nom', '_organigramme')
+    list_per_page = 5000
     actions = None
 
     def __init__(self, *args, **kwargs):
@@ -694,10 +697,9 @@ class EmployeProxyAdmin(EmployeAdmin):
                         reverse('rho_employe_sans_niveau', args=(d.poste.id,)),
                         d.poste.id
                     )
-            link = u"""<li>%s - [%s] %s : %s</li>""" % (
-                    d.date_debut.year,
-                    d.poste.id,
+            link = u"""<li>%s [%s]:<br />%s</li>""" % (
                     d.poste.nom,
+                    d.poste.id,
                     organigramme
             )
             l.append(link)
@@ -786,6 +788,7 @@ class PosteAdmin(DateRangeMixin, AUFMetadataAdminMixin,
         'vacant',
         )
     list_display_links = ('_nom',)
+    #list_per_page = 5000   # optimiser avant de tout lister
     fieldsets = AUFMetadataAdminMixin.fieldsets + (
         (None, {'fields': (
                 ('nom', 'nom_feminin'),
@@ -1009,6 +1012,7 @@ class ResponsableImplantationAdmin(BaseAdmin):
     list_filter = ('region', 'statut', )
     list_display = ('_region', '_nom', 'statut', '_responsable', )
     list_display_links = ('_nom',)
+    list_per_page = 5000
     readonly_fields = ('nom', )
     search_fields = (
             'nom',
diff --git a/project/rh/templates/rh/include/rapports_dossier_poste.html b/project/rh/templates/rh/include/rapports_dossier_poste.html
index 1171f08..95cc4e4 100644
--- a/project/rh/templates/rh/include/rapports_dossier_poste.html
+++ b/project/rh/templates/rh/include/rapports_dossier_poste.html
@@ -5,4 +5,4 @@
    <img src="{{ STATIC_URL }}img/dossier-apercu.png" />
 </a>&nbsp;
 <a href="{% url admin:rh_dossier_change d.id %}">Dossier</a> : 
-{{ d.poste.nom }} [{{ d.poste.id }}]
+{{ d.poste.nom }} [{{ d.poste.id|stringformat:"d" }}]
diff --git a/project/rh/templates/rh/rapports/contrats.html b/project/rh/templates/rh/rapports/contrats.html
index e0d2b19..27afccf 100644
--- a/project/rh/templates/rh/rapports/contrats.html
+++ b/project/rh/templates/rh/rapports/contrats.html
@@ -43,7 +43,7 @@
   {% for contrat in contrats %}
   <tr class="{% cycle 'row1' 'row2' %}">
     <td style="text-align:right">
-        {{ contrat.dossier.employe.id }}
+        {{ contrat.dossier.employe.id|stringformat:"d" }}
     </td>
     <td>{{ contrat.dossier.employe.nom|upper }} {{ contrat.dossier.employe.prenom|title }}</td>
     <td>
diff --git a/project/rh/templates/rh/rapports/employes_sans_contrat.html b/project/rh/templates/rh/rapports/employes_sans_contrat.html
index ea5c28d..813d7af 100644
--- a/project/rh/templates/rh/rapports/employes_sans_contrat.html
+++ b/project/rh/templates/rh/rapports/employes_sans_contrat.html
@@ -29,7 +29,7 @@
   {% spaceless %}   
     {% for d in dossiers %}
     <tr class="{% cycle 'row1' 'row2' %}">
-      <td style="text-align:right">{{ d.employe.id }}</td>
+      <td style="text-align:right">{{ d.employe.id|stringformat:"d" }}</td>
       <td>{{ d.employe.nom|upper }} {{ d.employe.prenom }}</td>
       <td>{% include 'rh/include/rapports_dossier_poste.html' %}</td>
       <td>
-- 
1.7.10.4