Merge branch 'master' into 'app_member'

# Conflicts:
#   apps/member/views.py

apps/member/locale/fr/LC_MESSAGES/django.po

@@ -1,116 +0,0 @@
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-16 15:21+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: apps.py:11
-msgid "member"
-msgstr "adhérent"
-
-#: models.py:24
-msgid "phone number"
-msgstr "numéro de téléphone"
-
-#: models.py:30
-msgid "section"
-msgstr "section"
-
-#: models.py:31
-msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\""
-msgstr "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\""
-
-#: models.py:37
-msgid "address"
-msgstr "adresse"
-
-#: models.py:43
-msgid "paid"
-msgstr "payé"
-
-#: models.py:48 models.py:49
-msgid "user profile"
-msgstr "profil utilisateur"
-
-#: models.py:57 models.py:102
-msgid "name"
-msgstr "nom"
-
-#: models.py:62
-msgid "email"
-msgstr "courriel"
-
-#: models.py:67
-msgid "membership fee"
-msgstr "cotisation pour adhérer"
-
-#: models.py:71
-msgid "membership duration"
-msgstr "durée de l'adhésion"
-
-#: models.py:72
-msgid "The longest time a membership can last (NULL = infinite)."
-msgstr "La durée maximale d'une adhésion (NULL = infinie)."
-
-#: models.py:77
-msgid "membership start"
-msgstr "début de l'adhésion"
-
-#: models.py:78
-msgid "How long after January 1st the members can renew their membership."
-msgstr ""
-
-#: models.py:83
-msgid "membership end"
-msgstr "fin de l'adhésion"
-
-#: models.py:84
-msgid ""
-"How long the membership can last after January 1st of the next year after "
-"members can renew their membership."
-msgstr ""
-
-#: models.py:90
-msgid "club"
-msgstr "club"
-
-#: models.py:91
-msgid "clubs"
-msgstr "clubs"
-
-#: models.py:108
-msgid "role"
-msgstr "rôle"
-
-#: models.py:109
-msgid "roles"
-msgstr "rôles"
-
-#: models.py:126
-msgid "membership starts on"
-msgstr "l'adhésion commence le"
-
-#: models.py:129
-msgid "membership ends on"
-msgstr "l'adhésion finie le"
-
-#: models.py:133
-msgid "fee"
-msgstr "cotisation"
-
-#: models.py:137
-msgid "membership"
-msgstr "adhésion"
-
-#: models.py:138
-msgid "memberships"
-msgstr "adhésions"

apps/member/views.py

@@ -45,9 +45,16 @@ class UserCreateView(CreateView):
         return super().form_valid(form)
 
 
-
 class UserDetailView(LoginRequiredMixin,DetailView):
     model = Profile
+    
+    def get_context_data(slef,**kwargs):
+        context = super().get_context_data(**kwargs)
+        user = context['object'].user.note
+        user_transactions = \
+                Transaction.objects.all().filter(Q(source=user) | Q(destination=user))
+        context['history_list'] = user_transactions
+        return context
 
 
 class ClubCreateView(LoginRequiredMixin,CreateView):