From 0441ef0b9d92536096734c2084374494a669eb58 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Sun, 17 Jul 2016 21:20:43 +0200
Subject: [PATCH] Un peu de style sur les formulaire d'edition de factures

---
 .../templates/cotisations/edit_facture.html   | 37 +++++++++++++++++++
 .../templates/cotisations/facture.html        |  5 ---
 .../templates/cotisations/new_facture.html    | 10 ++++-
 cotisations/views.py                          |  4 +-
 4 files changed, 47 insertions(+), 9 deletions(-)
 create mode 100644 cotisations/templates/cotisations/edit_facture.html

diff --git a/cotisations/templates/cotisations/edit_facture.html b/cotisations/templates/cotisations/edit_facture.html
new file mode 100644
index 00000000..4b278097
--- /dev/null
+++ b/cotisations/templates/cotisations/edit_facture.html
@@ -0,0 +1,37 @@
+{% extends "cotisations/sidebar.html" %}
+{% load bootstrap3 %}
+{% load staticfiles%}
+
+{% block title %}Création et modification de factures{% endblock %}
+
+{% block content %}
+{% bootstrap_form_errors factureform %}
+
+<form class="form" method="post">
+    {% csrf_token %}
+    <h3>Editer la facture</h3>
+    {% bootstrap_form factureform %}
+    {{ venteform.management_form }}
+    <h3>Articles de la facture</h3>
+    <table class="table table-striped">
+        <thead>
+            <tr>
+                <th>Désignation</th>
+                <th>Quantité</th>
+            </tr>
+        </thead>
+            {% for form in venteform.forms %}
+            {% bootstrap_form_errors form %}
+        <tr>
+            <td>{{ form.name }}</td>
+            <td>{{ form.number }}</td>
+            {% for hidden in form.hidden_fields %}
+            {{ hidden }}
+            {% endfor %}
+         </tr>
+         {% endfor %}
+    </table>
+    {% bootstrap_button "Créer ou modifier" button_type="submit" icon="star" %}
+</form>
+
+{% endblock %}
diff --git a/cotisations/templates/cotisations/facture.html b/cotisations/templates/cotisations/facture.html
index 7b9bc89e..d5a10270 100644
--- a/cotisations/templates/cotisations/facture.html
+++ b/cotisations/templates/cotisations/facture.html
@@ -10,11 +10,6 @@
 <form class="form" method="post">
     {% csrf_token %}
     {% bootstrap_form factureform %}
-    {{ venteform.management_form }}
-    {% for form in venteform.forms %}
-            {% bootstrap_form_errors form %}
-            {{ form.as_p }}
-    {% endfor %}
     {% bootstrap_button "Créer ou modifier" button_type="submit" icon="star" %}
 </form>
 
diff --git a/cotisations/templates/cotisations/new_facture.html b/cotisations/templates/cotisations/new_facture.html
index 2795718a..57b0f9e4 100644
--- a/cotisations/templates/cotisations/new_facture.html
+++ b/cotisations/templates/cotisations/new_facture.html
@@ -9,16 +9,22 @@
 
 <form class="form" method="post">
     {% csrf_token %}
+    <h3>Nouvelle facture</h3>
     {% bootstrap_form factureform %}
     {{ venteform.management_form }}
+    <h3>Articles de la facture</h3>
     <div id="form_set">
     {% for form in venteform.forms %}
         <div class='product_to_sell'>
-            {{ form.as_p }}
+        <p>
+            {{ form.as_table }}
+        </p>
         </div>
     {% endfor %}
     </div>
+    <p>
     <input class="btn btn-primary btn-sm" role="button" value="Ajouter un article" id="add_one">
+    </p>
     <p>
         Prix total : <span id="total_price">0,00</span> €
     </p>
@@ -35,7 +41,7 @@
         prices[{{ article.id|escapejs }}] = {{ article.prix }};
     {% endfor %}
 
-    var template = `{{ venteform.empty_form.as_p }}`;
+    var template = `<p>{{ venteform.empty_form.as_table }}</p>`;
 
     function add_article(){
         // Index start at 0 => new_index = number of items
diff --git a/cotisations/views.py b/cotisations/views.py
index b12248bd..6cc533c6 100644
--- a/cotisations/views.py
+++ b/cotisations/views.py
@@ -134,7 +134,7 @@ def edit_facture(request, factureid):
         vente_form.save()
         messages.success(request, "La facture a bien été modifiée")
         return redirect("/cotisations/")
-    return form({'factureform': facture_form, 'venteform': vente_form}, 'cotisations/facture.html', request)
+    return form({'factureform': facture_form, 'venteform': vente_form}, 'cotisations/edit_facture.html', request)
 
 @login_required
 @permission_required('cableur')
@@ -241,7 +241,7 @@ def add_banque(request):
 @permission_required('trésorier')
 def edit_banque(request, banqueid):
     try:
-        banque_instance = Article.objects.get(pk=banqueid)
+        banque_instance = Banque.objects.get(pk=banqueid)
     except Banque.DoesNotExist:
         messages.error(request, u"Entrée inexistante" )
         return redirect("/cotisations/index_banque/")