From 43d04712688a9eb88cd33fe16c80eed89e3a0bc3 Mon Sep 17 00:00:00 2001
From: davin baragiotta <davin.baragiotta@u-db.(none)>
Date: Wed, 6 Apr 2011 17:05:45 -0400
Subject: [PATCH] PosteFinancement ajustements

---
 project/dae/models.py                |   11 ++++++++---
 project/dae/templates/dae/poste.html |   12 ++++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/project/dae/models.py b/project/dae/models.py
index d0fa588..c7f19f0 100644
--- a/project/dae/models.py
+++ b/project/dae/models.py
@@ -152,12 +152,17 @@ POSTE_FINANCEMENT_CHOICES = (
 
 
 class PosteFinancement(models.Model):
-    montant = models.DecimalField(max_digits=12, decimal_places=2)
+    montant = models.DecimalField(max_digits=12, decimal_places=2, 
+            help_text="ex.: 12000.00 € (décimale avec point, devise = EUR)")
     poste = models.ForeignKey('Poste', related_name='financements')
     type = models.CharField(max_length=1, choices=POSTE_FINANCEMENT_CHOICES)
-    pourcentage = models.DecimalField(max_digits=12, decimal_places=2)
-    commentaire = models.TextField()
+    pourcentage = models.DecimalField(max_digits=12, decimal_places=2,
+            help_text="ex.: 33.33 % (décimale avec point)")
+    commentaire = models.TextField(
+            help_text="Spécifiez la source de financement.")
 
+    class Meta:
+        ordering = ['type']
 
 GENRE_CHOICES = (
     ('m', 'Homme'),
diff --git a/project/dae/templates/dae/poste.html b/project/dae/templates/dae/poste.html
index ba7f02b..fc8bc50 100644
--- a/project/dae/templates/dae/poste.html
+++ b/project/dae/templates/dae/poste.html
@@ -239,9 +239,13 @@
     </tr>
     {% for fin in poste.financements.all %}
       <tr>
-        <td>{{ fin.type }}</td>
+        <td>{{ fin.get_type_display }}</td>
         <td>{{ fin.montant }}</td>
-        <td>{{ fin.devise }}</td>
+        <td>€
+            {% comment %}
+            {{ fin.devise }}
+            {% endcomment %}
+        </td>
         <td>{{ fin.pourcentage }}</td>
         <td>{{ fin.commentaire }}</td>
         <td><a href="{% url financement poste_key fin.id %}">Modifier</a></td>
@@ -275,8 +279,8 @@
         $('#financing-form').load($(this).attr('href') + '?ajax=1')
                             .dialog({
                                 modal: true,
-                                height: 460,
-                                width: 500
+                                height: 500,
+                                width: 550
                             });
         return false;
     });
-- 
1.7.10.4