Dossier: Ajout des pièces dans l'aperçu

diff --git a/project/rh/templates/rh/include/dossier.html b/project/rh/templates/rh/include/dossier.html
index 68d6e6c..ed1325c 100644 (file)
--- a/project/rh/templates/rh/include/dossier.html
+++ b/project/rh/templates/rh/include/dossier.html
@@ -44,3 +44,19 @@
     </tr>
     {% endfor %}
 </table>
+
+{% if piecse|length > 0 %}
+<h3>Pièces</h3>
+<table>
+    <tr>
+        <th>Nom</th>
+        <th>Lien</th>
+    </tr>
+    {% for p in pieces %}
+    <tr>
+        <th>{{ p }}</th>
+        <th><a href="{{ media }}{{ p.fichier }}">Télécharger</a></th>
+    </tr>
+    {% endfor %}
+</table>
+{% endif %}

diff --git a/project/rh/views.py b/project/rh/views.py
index 61af97e..38a83e8 100644 (file)
--- a/project/rh/views.py
+++ b/project/rh/views.py
@@ -21,6 +21,7 @@ from rh.templatetags.rapports import SortHeaders
 from dae.utils import get_employe_from_user
 from dae.decorators import redirect_interdiction
 from dae.workflow import grp_drh, grp_correspondants_rh
+from django.conf import settings
 
 @login_required
 def piece(request, filename):
@@ -295,10 +296,12 @@ def region_protected(model):
 
 @region_protected(rh.Dossier)
 def dossier_apercu(request, dossier_id):
+    d = get_object_or_404(rh.Dossier, pk=dossier_id)
     c = {
         'is_popup' : request.GET.get('_popup', False),
-        'dossier' : get_object_or_404(rh.Dossier, pk=dossier_id)
-
+        'dossier' : d,
+        'pieces':  rh.DossierPiece.objects.filter(dossier__exact=d),
+        'media': settings.PRIVE_MEDIA_URL
     }
     return render_to_response('admin/rh/dossier/apercu.html', c, RequestContext(request))