diff --git a/bda/templates/bda-participants.html b/bda/templates/bda-participants.html
index 64f260b8..593c3730 100644
--- a/bda/templates/bda-participants.html
+++ b/bda/templates/bda-participants.html
@@ -16,18 +16,18 @@
{% for participant in participants %}
- {{participant.user.get_full_name}}
- {{participant.user.username}}
+ {{participant.name}}
+ {{participant.username}}
{{participant.nb_places}} place{{participant.nb_places|pluralize:",s"}}
- {{participant.user.email}}
+ {{participant.email}}
- {{participant.paid|oui_ou_non}}
+ {% if participant.paid %}Oui{% else %}Non{%endif%}
- {{participant.given|oui_ou_non}}
+ {% if participant.given %}Oui{% else %}Non{%endif%}
@@ -49,16 +49,15 @@
-
- Afficher/Cacher mails participants
+ Afficher/Cacher mails participants
-{%for participant in participants %}{{participant.user.email}}, {%endfor%}
+{%for participant in participants %}{{participant.email}}, {%endfor%}
Afficher/Cacher liste noms
-{% for participant in participants %}{{participant.user.get_full_name}} {% if participant.nb_places == 2 %}
-{{participant.user.get_full_name}}{%endif%}
+{% for participant in participants %}{{participant.name}}{% if participant.nb_places == 2 %}
+{{participant.name}}{%endif%}
{% endfor %}
diff --git a/bda/templates/spectacle_list.html b/bda/templates/spectacle_list.html
index e1863eef..752a9315 100644
--- a/bda/templates/spectacle_list.html
+++ b/bda/templates/spectacle_list.html
@@ -1,16 +1,14 @@
{% extends "base_title.html" %}
{% block realcontent %}
- {{tirage_name}}
-
- Liste des spectacles
+ {{tirage_name}}
+ Liste des spectacles
-
- Exports
+ Exports
Mailing list impayƩs
Calendrier des spectacles (.ics)
diff --git a/bda/views.py b/bda/views.py
index 9c052c84..b95fb50e 100644
--- a/bda/views.py
+++ b/bda/views.py
@@ -298,14 +298,13 @@ def spectacle(request, tirage_id, spectacle_id):
participants = {}
for attrib in attributions:
participant = attrib.participant
- participant.given = attrib.given
- if (participant.id in participants):
- participants[participant.id].nb_places = 2
+ participant_info = {'lastname':participant.user.last_name, 'name': participant.user.get_full_name, 'username':participant.user.username, 'email':participant.user.email, 'given':attrib.given, 'paid':participant.paid, 'nb_places':1}
+ if participant.id in participants:
+ participants[participant.id]['nb_places'] = 2
else:
- participant.nb_places = 1
- participants[participant.id]=participant
+ participants[participant.id] = participant_info
- return render(request, "bda-participants.html", {"spectacle": spectacle, "participants": participants.values()})
+ return render(request, "bda-participants.html", {"spectacle": spectacle, "participants": sorted(participants.values(), key=lambda part: part['lastname'])})
@buro_required
def add_attrib(request, tirage_id, spectacle_id):
diff --git a/gestioncof/templatetags/utils.py b/gestioncof/templatetags/utils.py
index 5f90722e..5847f9a6 100644
--- a/gestioncof/templatetags/utils.py
+++ b/gestioncof/templatetags/utils.py
@@ -35,9 +35,3 @@ def highlight_clipper(clipper, q):
text = clipper.username
return highlight_text(text, q)
-@register.filter
-def oui_ou_non(b):
- if b:
- return "Oui"
- else:
- return "Non"