Merge branch 'fix/profile-page-board-role' into 'master'

Profile page board role

Closes #365

See merge request !446

website/members/locale/nl/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-30 16:12+0200\n"
-"PO-Revision-Date: 2017-03-30 16:12+0200\n"
+"POT-Creation-Date: 2017-04-12 19:40+0200\n"
+"PO-Revision-Date: 2017-04-12 19:40+0200\n"
 "Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
 "Language-Team: \n"
 "Language: nl\n"
@@ -74,15 +74,15 @@ msgstr "Studentnummer"
 msgid "Download student number label for selected users"
 msgstr "Download studentnummers voor geselecteerde gebruikers"
 
-#: forms.py:37
+#: forms.py:42
 msgid "Send welcome email"
 msgstr "Stuur welkomste-mails"
 
-#: forms.py:38
+#: forms.py:43
 msgid "This email will include the generated password"
 msgstr "Deze e-mail zal het gegenereerde wachtwoord bevatten"
 
-#: forms.py:68
+#: forms.py:75
 msgid "Welcome to Study Association Thalia"
 msgstr "Welkom bij Studievereniging Thalia"
 
@@ -507,6 +507,10 @@ msgid "Achievements for Thalia"
 msgstr "Verdiensten voor Thalia"
 
 #: templates/members/profile.html:62
+msgid "Chair"
+msgstr "Voorzitter"
+
+#: templates/members/profile.html:64
 msgid "today"
 msgstr "heden"
 

website/members/templates/members/profile.html

@@ -56,8 +56,10 @@
                     <span>{{ achievement.name }}</span>
                     <br>
                     {% for period in achievement.periods %}
-                        {% if period.chair %}
-                        <span style="text-transform:inherit;">Voorzitter: </span>
+                        {% if period.role %}
+                        <span style="text-transform:inherit;">{{ period.role }}: </span>
+                        {% elif period.chair %}
+                        <span style="text-transform:inherit;">{% trans "Chair" %}: </span>
                         {% endif %}
                         <i>{% if period.since|date:'Y m d' == '1970 01 01' %}?{% else %}{{ period.since }}{% endif %} - {% if period.until %}{{ period.until }}{% else %}{% trans "today" %}{% endif %}</i>
                     <br>

website/members/views.py

@@ -106,6 +106,9 @@ def profile(request, pk=None):
             'chair': membership.chair
         }
 
+        if hasattr(membership.committee, 'board'):
+            period['role'] = membership.role
+
         if (membership.until is None and
                 hasattr(membership.committee, 'board')):
             period['until'] = membership.committee.board.until