From 22a0058027e9416c9425e26e0b93a020a797eaf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lie=20Bouttier?= <elie@bouttier.eu>
Date: Fri, 3 Nov 2017 15:17:33 +0100
Subject: [PATCH] volunteers: minor improvements

---
 cfp/templates/cfp/staff/volunteer_list.html |   5 +-
 cfp/views.py                                |   2 +-
 locale/fr/LC_MESSAGES/django.mo             | Bin 17409 -> 17522 bytes
 locale/fr/LC_MESSAGES/django.po             |  76 ++++++++++----------
 4 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/cfp/templates/cfp/staff/volunteer_list.html b/cfp/templates/cfp/staff/volunteer_list.html
index e06fbd8..f003d5c 100644
--- a/cfp/templates/cfp/staff/volunteer_list.html
+++ b/cfp/templates/cfp/staff/volunteer_list.html
@@ -42,7 +42,10 @@
     <tbody>
     {% endif %}
         <tr>
-            <td><a href="{% url 'volunteer-details' volunteer.pk %}">{{ volunteer.name }}</a></td>
+            <td>
+                <a href="{% url 'volunteer-details' volunteer.pk %}">{{ volunteer.name }}</a>
+                {% if volunteer.notes %}<span class="glyphicon glyphicon-envelope pull-right" data-toggle="tooltip" data-placement="bottom" title="{% trans "The volunteer made a few remarks to the staff." %}"></span>{% endif %}
+            </td>
             <td>{{ volunteer.email }}</td>
             <td>{{ volunteer.phone_number }}</td>
             <td>
diff --git a/cfp/views.py b/cfp/views.py
index 9149b04..9943ef0 100644
--- a/cfp/views.py
+++ b/cfp/views.py
@@ -110,7 +110,7 @@ def volunteer_list(request):
     show_filters = False
     filter_form = VolunteerFilterForm(request.GET or None, site=site)
     # Filtering
-    volunteers = Volunteer.objects.filter(site=site).order_by('pk').distinct()
+    volunteers = Volunteer.objects.filter(site=site).order_by('pk').distinct().prefetch_related('activities')
     if filter_form.is_valid():
         data = filter_form.cleaned_data
         if len(data['activity']):
diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo
index 04f2f113997a821d014a658c88c57b83bdf10f0b..6635a947fa83d3bc1ae0c407f6c945a7e8250466 100644
GIT binary patch
delta 4404
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

delta 4295
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
K!~Vg`0{;OjyUb?*

diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 6ef496f..c0bc783 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-03 13:39+0000\n"
-"PO-Revision-Date: 2017-11-03 14:42+0100\n"
+"POT-Creation-Date: 2017-11-03 14:15+0000\n"
+"PO-Revision-Date: 2017-11-03 15:16+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "Pending decision"
 msgstr "Décision en attente"
 
-#: cfp/forms.py:18 cfp/forms.py:102 cfp/forms.py:194
+#: cfp/forms.py:18 cfp/forms.py:103 cfp/forms.py:195
 msgid "Accepted"
 msgstr "Accepté"
 
@@ -34,7 +34,7 @@ msgstr "Décliné"
 msgid "Waiting"
 msgstr "En attente"
 
-#: cfp/forms.py:29 cfp/forms.py:108 cfp/forms.py:200 cfp/models.py:343
+#: cfp/forms.py:29 cfp/forms.py:109 cfp/forms.py:201 cfp/models.py:343
 msgid "Confirmed"
 msgstr "Confirmé"
 
@@ -42,133 +42,137 @@ msgstr "Confirmé"
 msgid "Cancelled"
 msgstr "Annulé"
 
-#: cfp/forms.py:50
+#: cfp/forms.py:41 cfp/models.py:437
+msgid "Activity"
+msgstr "Activité"
+
+#: cfp/forms.py:51
 msgctxt "activity"
 msgid "None"
 msgstr "Aucune"
 
-#: cfp/forms.py:76
+#: cfp/forms.py:77
 #, python-format
 msgid "Default duration: %(duration)d min"
 msgstr "Durée par défaut : %(duration)d min"
 
-#: cfp/forms.py:84 cfp/forms.py:96 cfp/forms.py:188
+#: cfp/forms.py:85 cfp/forms.py:97 cfp/forms.py:189
 #: cfp/templates/cfp/staff/talk_details.html:15
 msgid "Category"
 msgstr "Catégorie"
 
-#: cfp/forms.py:85 cfp/templates/cfp/staff/talk_list.html:43
+#: cfp/forms.py:86 cfp/templates/cfp/staff/talk_list.html:43
 msgid "Title"
 msgstr "Titre"
 
-#: cfp/forms.py:86 cfp/models.py:137 cfp/models.py:432
+#: cfp/forms.py:87 cfp/models.py:137 cfp/models.py:432
 #: cfp/templates/cfp/staff/talk_details.html:64
 msgid "Description"
 msgstr "Description"
 
-#: cfp/forms.py:87 cfp/models.py:105 cfp/models.py:413
+#: cfp/forms.py:88 cfp/models.py:105 cfp/models.py:413
 #: cfp/templates/cfp/staff/participant_details.html:16
 #: cfp/templates/cfp/staff/talk_details.html:78
 #: cfp/templates/cfp/staff/volunteer_details.html:20
 msgid "Notes"
 msgstr "Notes"
 
-#: cfp/forms.py:90
+#: cfp/forms.py:91
 msgid "Visible by speakers"
 msgstr "Visible par les orateurs"
 
-#: cfp/forms.py:114 cfp/forms.py:206 cfp/models.py:300
+#: cfp/forms.py:115 cfp/forms.py:207 cfp/models.py:300
 #: cfp/templates/cfp/staff/talk_details.html:21
 #: cfp/templates/cfp/staff/talk_list.html:46
 #: cfp/templates/cfp/staff/track_form.html:14
 msgid "Track"
 msgstr "Session"
 
-#: cfp/forms.py:120
+#: cfp/forms.py:121
 msgid "Tag"
 msgstr "Étiquette"
 
-#: cfp/forms.py:126 cfp/templates/cfp/staff/talk_details.html:83
+#: cfp/forms.py:127 cfp/templates/cfp/staff/talk_details.html:83
 msgid "Vote"
 msgstr "Vote"
 
-#: cfp/forms.py:127
+#: cfp/forms.py:128
 msgid "Filter talks you already / not yet voted for"
 msgstr ""
 "Filtrer les propositions pour lesquelles vous avez déjà voté / pas encore "
 "voté"
 
-#: cfp/forms.py:130 cfp/templates/cfp/staff/room_form.html:14
+#: cfp/forms.py:131 cfp/templates/cfp/staff/room_form.html:14
 #: cfp/templates/cfp/staff/talk_details.html:38
 msgid "Room"
 msgstr "Salle"
 
-#: cfp/forms.py:131
+#: cfp/forms.py:132
 msgid "Filter talks already / not yet affected to a room"
 msgstr "Filtrer les exposés déjà / pas encore affectées à une salle"
 
-#: cfp/forms.py:134
+#: cfp/forms.py:135
 msgid "Scheduled"
 msgstr "Programmé"
 
-#: cfp/forms.py:135
+#: cfp/forms.py:136
 msgid "Filter talks already / not yet scheduled"
 msgstr "Filtrer les exposés déjà / pas encore planifiées"
 
-#: cfp/forms.py:138 cfp/models.py:317
+#: cfp/forms.py:139 cfp/models.py:317
 #: cfp/templates/cfp/staff/talk_details.html:54
 msgid "Materials"
 msgstr "Supports"
 
-#: cfp/forms.py:139
+#: cfp/forms.py:140
 msgid "Filter talks with / without materials"
 msgstr "Filtrer les exposés avec / sans supports"
 
-#: cfp/forms.py:142 cfp/templates/cfp/staff/talk_details.html:58
+#: cfp/forms.py:143 cfp/templates/cfp/staff/talk_details.html:58
 msgid "Video"
 msgstr "Vidéo"
 
-#: cfp/forms.py:143
+#: cfp/forms.py:144
 msgid "Filter talks with / without video"
 msgstr "Filtrer les exposés avec / sans vidéo"
 
-#: cfp/forms.py:152 cfp/forms.py:218
+#: cfp/forms.py:153 cfp/forms.py:219
 msgid "Not assigned"
 msgstr "Pas encore assignée"
 
-#: cfp/forms.py:158
+#: cfp/forms.py:159
 msgid "Accept talk?"
 msgstr "Accepter la proposition ?"
 
-#: cfp/forms.py:159
+#: cfp/forms.py:160
 msgid "Assign to a track"
 msgstr "Assigner à une session"
 
-#: cfp/forms.py:160
+#: cfp/forms.py:161
 msgid "Add a tag"
 msgstr "Ajouter une étiquette"
 
-#: cfp/forms.py:161
+#: cfp/forms.py:162
 msgid "Put in a room"
 msgstr "Assigner à une salle"
 
-#: cfp/forms.py:182 cfp/models.py:135 cfp/models.py:187 cfp/models.py:430
+#: cfp/forms.py:183 cfp/models.py:135 cfp/models.py:187 cfp/models.py:430
 #: cfp/templates/cfp/staff/participant_list.html:35
 #: cfp/templates/cfp/staff/volunteer_list.html:29
 msgid "Name"
 msgstr "Nom"
 
-#: cfp/forms.py:237
+#: cfp/forms.py:238
 msgid "New staff members will be informed of their new position by e-mail."
 msgstr ""
 "Les nouveaux membres du staff seront informés de leur nouveau rôle par "
 "courrier électronique."
 
-#: cfp/forms.py:257
+#: cfp/forms.py:258
 msgid "An user with that firstname and that lastname already exists."
 msgstr "Un utilisateur avec ce prénom et ce nom existe déjà."
 
-#: cfp/forms.py:262
+#: cfp/forms.py:263
 msgid "A user with that email already exists."
 msgstr "Un utilisateur avec cet email existe déjà."
 
@@ -371,10 +375,6 @@ msgstr "Si vous avez des contraintes, vous pouvez les indiquer ici."
 msgid "Volunteer"
 msgstr "Bénévole"
 
-#: cfp/models.py:437
-msgid "Activity"
-msgstr "Activité"
-
 #: cfp/models.py:438 cfp/templates/cfp/staff/volunteer_details.html:25
 #: cfp/templates/cfp/staff/volunteer_list.html:32
 msgid "Activities"
@@ -832,6 +832,10 @@ msgstr "bénévole"
 msgid "Phone"
 msgstr "Téléphone"
 
+#: cfp/templates/cfp/staff/volunteer_list.html:47
+msgid "The volunteer made a few remarks to the staff."
+msgstr "Le bénévole a fait quelques remarques au staff."
+
 #: cfp/templates/cfp/volunteer.html:9 cfp/templates/cfp/volunteer_enrole.html:9
 msgid "Become a volunteers!"
 msgstr "Devenez un bénévole !"