rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-05 01:16:27 +00:00
Code Issues Releases Wiki Activity

Affiche les id factures et id user

Browse source
This commit is contained in:
Gabriel Detraz 2017-10-27 22:08:53 +02:00 committed by root
parent 31234e7178
commit d0239a1613
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cotisations/templates/cotisations/aff_cotisations.html
View file

@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<th>Prix total</th> <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='paiement' text='Moyen de paiement' %}</th>
<th>{% include "buttons/sort.html" with prefix='cotis' col='date' text='Date' %}</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>
<th></th> <th></th>
</tr> </tr>
@ -46,17 +46,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<td>{{ facture.prix_total }}</td> <td>{{ facture.prix_total }}</td>
<td>{{ facture.paiement }}</td> <td>{{ facture.paiement }}</td>
<td>{{ facture.date }}</td> <td>{{ facture.date }}</td>
<td>{{ facture.id }}</td>
{% if is_cableur %} {% if is_cableur %}
<td> <td>
<div class="dropdown"> <div class="dropdown">
<button class="btn btn-default dropdown-toggle" type="button" id="editionfacture" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> <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> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu" aria-labelledby="editionfacture"> <ul class="dropdown-menu" aria-labelledby="editionfacture">
{% if facture.valid and not facture.control or is_trez %} {% 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: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 %} {% else %}
<li>Facture controlée</li> <li>Facture controlée</li>
{% endif %} {% endif %}
@ -74,11 +76,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<font color="red">Facture invalide</font> <font color="red">Facture invalide</font>
{% endif %} {% endif %}
</td> </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> </tr>
{% endfor %} {% endfor %}
</table> </table>

8
cotisations/templates/cotisations/control.html
View file

@ -42,7 +42,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<th>Profil</th> <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='name' text='Nom' %}</th>
<th>{% include "buttons/sort.html" with prefix='control' col='surname' text='Pré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>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='paiement' text='Moyen de paiement' %}</th>
<th>{% include "buttons/sort.html" with prefix='control' col='date' text='Date' %}</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>
<td>{{ form.instance.user.name }}</td> <td>{{ form.instance.user.name }}</td>
<td>{{ form.instance.user.surname }}</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.prix_total }}</td>
<td>{{ form.instance.paiement }}</td> <td>{{ form.instance.paiement }}</td>
<td>{{ form.instance.date }}</td> <td>{{ form.instance.date }}</td>

5
re2o/utils.py
View file

@ -179,15 +179,18 @@ class SortTable:
'cotis_user': ['user__pseudo'], 'cotis_user': ['user__pseudo'],
'cotis_paiement': ['paiement__moyen'], 'cotis_paiement': ['paiement__moyen'],
'cotis_date': ['date'], 'cotis_date': ['date'],
'cotis_id': ['id'],
'default': ['-date'] 'default': ['-date']
} }
COTISATIONS_CONTROL = { COTISATIONS_CONTROL = {
'control_name': ['user__name'], 'control_name': ['user__adherent__name'],
'control_surname': ['user__surname'], 'control_surname': ['user__surname'],
'control_paiement': ['paiement'], 'control_paiement': ['paiement'],
'control_date': ['date'], 'control_date': ['date'],
'control_valid': ['valid'], 'control_valid': ['valid'],
'control_control': ['control'], 'control_control': ['control'],
'control_id': ['id'],
'control_user-id': ['user__id'],
'default': ['-date'] 'default': ['-date']
} }
TOPOLOGIE_INDEX = { TOPOLOGIE_INDEX = {