From be8f2dc35bb4b9b3c1fc1a2bac6541727c016c0a Mon Sep 17 00:00:00 2001
From: Pierre-antoine Comby <comby@crans.org>
Date: Thu, 15 Aug 2019 23:11:16 +0200
Subject: [PATCH] use accordion + history table for profil view
---
apps/member/views.py | 14 ++++++----
templates/member/profile_detail.html | 40 +++++++++++++++++++++++++---
2 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/apps/member/views.py b/apps/member/views.py
index f54103e7..487da98b 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -47,13 +47,17 @@ class UserCreateView(CreateView):
class UserDetailView(LoginRequiredMixin,DetailView):
model = Profile
-
+ context_object_name = "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
+ user = context['profile'].user
+
+ history_list = \
+ Transaction.objects.all().filter(Q(source=user.note) | Q(destination=user.note))
+ context['history_list'] = HistoryTable(history_list)
+ club_list = \
+ Membership.objects.all().filter(user=user).only("club")
+ context['club_list'] = ClubTable(club_list)
return context
diff --git a/templates/member/profile_detail.html b/templates/member/profile_detail.html
index 82be255a..fd5ebd7f 100644
--- a/templates/member/profile_detail.html
+++ b/templates/member/profile_detail.html
@@ -23,7 +23,41 @@
<dd class="col-6 col-md-3">{{ object.user.note.balance | pretty_money }}</dd>
</dl>
- <a href="{% url "password_change" %}">{% trans 'Change password' %}</a>
+ <a class="btn btn-primary" href="{% url 'password_change' %}">{% trans 'Change password' %}</a>
- {% render_table history_list %}
-{% endblock %}
+<div class="accordion" id="accordionExample">
+ <div class="card">
+ <div class="card-header" id="headingOne">
+ <h5 class="mb-0">
+ <button class="btn btn-link" type="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
+ <i class="fa fa-users"></i> {% trans "View my memberships" %}
+ </button>
+ </h5>
+ </div>
+
+ <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordionExample">
+ <div class="card-body">
+ {% render_table club_list %}
+ </div>
+ </div>
+ </div>
+ <div class="card">
+ <div class="card-header" id="headingTwo">
+ <h5 class="mb-0">
+ <button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
+ <i class="fa fa-euro"></i> Historique des transactions
+ </button>
+ </h5>
+ </div>
+ <div id="collapseTwo" class="collapse" aria-labelledby="headingTwo" data-parent="#accordionExample">
+ <div class="card-body">
+ {% render_table history_list %}
+ </div>
+ </div>
+ </div>
+</div>
+
+
+
+
+ {% endblock %}
--
GitLab