diff --git a/bda/templates/bda-participants.html b/bda/templates/bda-participants.html index c21d4248..a54242d5 100644 --- a/bda/templates/bda-participants.html +++ b/bda/templates/bda-participants.html @@ -2,6 +2,7 @@ {% block realcontent %}

{{ spectacle }}

+

Ajouter une attribution

@@ -25,11 +26,16 @@ - {% endfor %}
-
- {% if participant.given %}Oui{% else %}Non{%endif%} +
+ {% if participant.given == participant.nb_places %}Oui + {% elif participant.given == 0 %}Non + {% else %}{{participant.given}}/{{participant.nb_places}} + {%endif%}
@@ -41,8 +47,7 @@
diff --git a/bda/views.py b/bda/views.py index 6e1f4de3..1eab066d 100644 --- a/bda/views.py +++ b/bda/views.py @@ -303,11 +303,12 @@ def spectacle(request, tirage_id, spectacle_id): 'name': participant.user.get_full_name, 'username': participant.user.username, 'email': participant.user.email, - 'given': attrib.given, + 'given': int(attrib.given), 'paid': participant.paid, 'nb_places': 1} if participant.id in participants: - participants[participant.id]['nb_places'] += 1 + participants[participant.id]['nb_places'] += 1 + participants[participant.id]['given'] += attrib.given else: participants[participant.id] = participant_info diff --git a/gestioncof/templatetags/utils.py b/gestioncof/templatetags/utils.py index c8bd96ea..5847f9a6 100644 --- a/gestioncof/templatetags/utils.py +++ b/gestioncof/templatetags/utils.py @@ -35,4 +35,3 @@ def highlight_clipper(clipper, q): text = clipper.username return highlight_text(text, q) -