From d0239a1613cb1e1ec7deb2b67fe871f73e68904d Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Fri, 27 Oct 2017 22:08:53 +0200
Subject: [PATCH] Affiche les id factures et id user

---
 .../templates/cotisations/aff_cotisations.html      | 13 +++++--------
 cotisations/templates/cotisations/control.html      |  8 ++++++--
 re2o/utils.py                                       |  5 ++++-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/cotisations/templates/cotisations/aff_cotisations.html b/cotisations/templates/cotisations/aff_cotisations.html
index 59d558bf..81feb0bf 100644
--- a/cotisations/templates/cotisations/aff_cotisations.html
+++ b/cotisations/templates/cotisations/aff_cotisations.html
@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 <th>Prix total</th>
                 <th>{% include "buttons/sort.html" with prefix='cotis' col='paiement' text='Moyen de paiement' %}</th>
                 <th>{% include "buttons/sort.html" with prefix='cotis' col='date' text='Date' %}</th>
-                <th></th>
+		<th>{% include "buttons/sort.html" with prefix='cotis' col='id' text='Id facture' %}</th>
                 <th></th>
                 <th></th>
             </tr>
@@ -46,17 +46,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ facture.prix_total }}</td>
             <td>{{ facture.paiement }}</td>
             <td>{{ facture.date }}</td>
+	    <td>{{ facture.id }}</td>
             {% if is_cableur %}
             <td>
             <div class="dropdown">
             <button class="btn btn-default dropdown-toggle" type="button" id="editionfacture" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-            Modifier
+            Edition
             <span class="caret"></span>
             </button>
             <ul class="dropdown-menu" aria-labelledby="editionfacture">
             {% if facture.valid and not facture.control or is_trez %}
-                <li><a href="{% url 'cotisations:edit-facture' facture.id %}"><i class="glyphicon glyphicon-bitcoin"></i> Editer</a></li>
+                <li><a href="{% url 'cotisations:edit-facture' facture.id %}"><i class="glyphicon glyphicon-bitcoin"></i> Modifier</a></li>
                 <li><a href="{% url 'cotisations:del-facture' facture.id %}"><i class="glyphicon glyphicon-trash"></i> Supprimer</a></li>
+                <li><a href="{% url 'cotisations:history' 'facture' facture.id %}"><i class="glyphicon glyphicon-time"></i> Historique</a></li>
             {% else %}
                 <li>Facture controlée</li>
             {% endif %}
@@ -74,11 +76,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 <font color="red">Facture invalide</font>
             {% endif %}
             </td>
-            <td class="text-right">
-                <a class="btn btn-info btn-sm" role="button" title="Historique" href="{% url 'cotisations:history' 'facture' facture.id %}">
-                    <i class="glyphicon glyphicon-time"></i>
-                </a>
-            </td>
         </tr>
         {% endfor %}
     </table>
diff --git a/cotisations/templates/cotisations/control.html b/cotisations/templates/cotisations/control.html
index 461494dd..6e9ccbc5 100644
--- a/cotisations/templates/cotisations/control.html
+++ b/cotisations/templates/cotisations/control.html
@@ -42,7 +42,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 <th>Profil</th>
                 <th>{% include "buttons/sort.html" with prefix='control' col='name' text='Nom' %}</th>
                 <th>{% include "buttons/sort.html" with prefix='control' col='surname' text='Prénom' %}</th>
-                <th>Designation</th>
+                <th>{% include "buttons/sort.html" with prefix='control' col='id' text='Id facture' %}</th>
+                <th>{% include "buttons/sort.html" with prefix='control' col='user-id' text='Id user' %}</th>
+		<th>Designation</th>
                 <th>Prix total</th>
                 <th>{% include "buttons/sort.html" with prefix='control' col='paiement' text='Moyen de paiement' %}</th>
                 <th>{% include "buttons/sort.html" with prefix='control' col='date' text='Date' %}</th>
@@ -58,7 +60,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             </td>
             <td>{{ form.instance.user.name }}</td>
             <td>{{ form.instance.user.surname }}</td>
-            <td>{{ form.instance.name }}</td>
+            <td>{{ form.instance.id }}</td>
+            <td>{{ form.instance.user.id }}</td>
+	    <td>{{ form.instance.name }}</td>
             <td>{{ form.instance.prix_total }}</td>
             <td>{{ form.instance.paiement }}</td>
             <td>{{ form.instance.date }}</td>
diff --git a/re2o/utils.py b/re2o/utils.py
index 2560e6c2..d3c87557 100644
--- a/re2o/utils.py
+++ b/re2o/utils.py
@@ -179,15 +179,18 @@ class SortTable:
         'cotis_user': ['user__pseudo'],
         'cotis_paiement': ['paiement__moyen'],
         'cotis_date': ['date'],
+        'cotis_id': ['id'],
         'default': ['-date']
     }
     COTISATIONS_CONTROL = {
-        'control_name': ['user__name'],
+        'control_name': ['user__adherent__name'],
         'control_surname': ['user__surname'],
         'control_paiement': ['paiement'],
         'control_date': ['date'],
         'control_valid': ['valid'],
         'control_control': ['control'],
+        'control_id': ['id'],
+        'control_user-id': ['user__id'],
         'default': ['-date']
     }
     TOPOLOGIE_INDEX = {