From 2f743738a1d6493e90bc80042b655f58b8bf61d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lie=20Bouttier?= <elie@bouttier.eu>
Date: Wed, 14 Sep 2016 22:31:57 +0200
Subject: [PATCH] show users preferences and constraints

---
 .../templates/proposals/user_details.html     | 21 ++++++++++++++++++-
 proposals/views.py                            |  8 ++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/proposals/templates/proposals/user_details.html b/proposals/templates/proposals/user_details.html
index 7e5dec1..eeca0a8 100644
--- a/proposals/templates/proposals/user_details.html
+++ b/proposals/templates/proposals/user_details.html
@@ -20,8 +20,27 @@
 {% include "proposals/_talk_list.html" %}
 
 {% if request|edit_profile:profile %}
+
+<h2>{% trans "Preferences" %}</h2>
+
+<ul>
+    <li><b>{% trans "Need transport:" %}</b> {{ participation.need_transport|yesno }}</li>
+    <li><b>{% trans "Arrival:" %}</b> {{ participation.arrival }}</li>
+    <li><b>{% trans "Departure:" %}</b> {{ participation.departure }}</li>
+    <li><b>{% trans "Ok to travel by:" %}</b> {% for transport in participation.transport.all %}{% if not forloop.first %}, {% endif %}{{ transport }}{% endfor %}</li>
+    <li><b>{% trans "Need hosting:" %}</b> {{ participation.need_hosting|yesno }}</li>
+    <li><b>{% trans "Ok for homstay:" %}</b> {{ participation.homestay|yesno }}</li>
+    <li><b>{% trans "Video output:" %}</b> {% for conn in participation.connector.all %}{% if not forloop.first %}, {% endif %}{{ conn }}{% endfor %}</li>
+    <li><b>{% trans "Need sound:" %}</b> {{ participation.sound|yesno }}</li>
+    <li><b>{% trans "Ok to be recorded on video:" %}</b> {{ participation.videotaped|yesno }}</li>
+    <li><b>{% trans "Video licence:" %}</b> {{ participation.video_licence|yesno }}</li>
+</ul>
+
+<h2>{% trans "Constaints" %}</h2>
+<p>{{ profile.constraints|linebreaksbr }}</p>
+
 <h2>{% trans "Notes" %}</h2>
-<p>{{ profile.notes }}</p>
+<p>{{ profile.notes|linebreaksbr }}</p>
 {% endif %}
 
 
diff --git a/proposals/views.py b/proposals/views.py
index 10d46a2..26e1565 100644
--- a/proposals/views.py
+++ b/proposals/views.py
@@ -191,8 +191,10 @@ def talk_decide(request, talk, accepted):
 
 @login_required
 def user_details(request, username):
-    speaker = get_object_or_404(User, username=username)
+    user = get_object_or_404(User, username=username)
+    participation = get_object_or_404(Participation, user=user, site=get_current_site(request))
     return render(request, 'proposals/user_details.html', {
-        'profile': speaker.profile,
-        'talk_list': allowed_talks(Talk.objects.filter(site=get_current_site(request), speakers=speaker), request),
+        'profile': user.profile,
+        'participation': participation,
+        'talk_list': allowed_talks(Talk.objects.filter(site=get_current_site(request), speakers=user), request),
     })