From e13a5143356c5703953efa8cfd73ed91d1901692 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Olivier=20Larchev=C3=AAque?= <olivier.larcheveque@auf.org>
Date: Tue, 24 May 2011 13:41:38 -0400
Subject: [PATCH] #1494

---
 buildout.cfg                                      |    2 +-
 project/dae/templates/dae/embauche_consulter.html |   11 ++++++++---
 project/dae/templates/dae/ligne_validation.html   |   15 +++++++++++++++
 project/dae/templates/dae/poste_consulter.html    |   11 ++++++++---
 4 files changed, 32 insertions(+), 7 deletions(-)
 create mode 100644 project/dae/templates/dae/ligne_validation.html

diff --git a/buildout.cfg b/buildout.cfg
index f67e761..74c2627 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -36,7 +36,7 @@ south = 0.7
 auf.django.skin = 0.15dev
 auf.django.auth = 0.5.2dev
 django-reversion = 1.3.3
-auf.django.workflow = 0.12dev
+auf.django.workflow = 0.13dev
 django-ajax-selects = 1.1.4
 
 #reportlab = 2.5
diff --git a/project/dae/templates/dae/embauche_consulter.html b/project/dae/templates/dae/embauche_consulter.html
index c8ddbda..10bae49 100644
--- a/project/dae/templates/dae/embauche_consulter.html
+++ b/project/dae/templates/dae/embauche_consulter.html
@@ -135,11 +135,16 @@
   <fieldset>
   <h2>Validations</h2>
   
-  <ul>
+  <table>
+  <tr>
+      <th>Action</th>
+      <th>Destinataire de l'action</th>
+      <th>Commentaire</th>
+  </tr>
   {% for commentaire in dossier.historique_desc %}
-      <li>{{ commentaire }}</li>
+    {% include "dae/ligne_validation.html" %}
   {% endfor %}
-  </ul>
+  </table>
 
   <h2>Votre validation (ou commentaire)</h2>
   <p>Ce dossier est actuellement à l'état <span class="note">{{ dossier.get_etat_display }}</span>.</p>
diff --git a/project/dae/templates/dae/ligne_validation.html b/project/dae/templates/dae/ligne_validation.html
new file mode 100644
index 0000000..65e457b
--- /dev/null
+++ b/project/dae/templates/dae/ligne_validation.html
@@ -0,0 +1,15 @@
+<tr>
+<td>
+    {% if commentaire.etat_final == 'REFUSE' %}
+        {{ commentaire.owner }} a refusé la demande le {{ commentaire.date|date:"d M Y" }}
+    {% else %}
+        {{ commentaire.owner }} a validé la demande le {{ commentaire.date|date:"d M Y"}}
+    {% endif %}
+</td>
+<td>
+    {{ commentaire.get_etat_final_label }}
+</td>
+<td>
+    {% if commentaire.texte %} ({{ commentaire.texte }}){% endif %}
+</td>
+</tr>
diff --git a/project/dae/templates/dae/poste_consulter.html b/project/dae/templates/dae/poste_consulter.html
index ccfa91b..b2a6e9f 100644
--- a/project/dae/templates/dae/poste_consulter.html
+++ b/project/dae/templates/dae/poste_consulter.html
@@ -23,11 +23,16 @@ Demande d'autorisation d'embauche
 <fieldset>
 <h2>Validations</h2>
 
-<ul>
+<table>
+<tr>
+    <th>Action</th>
+    <th>Destinataire de l'action</th>
+    <th>Commentaire</th>
+</tr>
 {% for commentaire in poste.historique_desc %}
-    <li>{{ commentaire }}</li>
+    {% include "dae/ligne_validation.html" %}
 {% endfor %}
-</ul>
+</table>
 
 <h2>Votre validation</h2>
 <p>Le poste est actuellement à l'état :  <span class="note">{{ poste.get_etat_display }}</span>.</p>
-- 
1.7.10.4