diff --git a/apps/member/views.py b/apps/member/views.py index 37c47212..d664df70 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -9,9 +9,11 @@ from django.views.generic import CreateView, ListView, DetailView from django.http import HttpResponseRedirect from django.contrib.auth.forms import UserCreationForm from django.urls import reverse_lazy +from django.db.models import Q from .models import Profile, Club from .forms import ProfileForm, ClubForm +from note.models.transactions import Transaction class UserCreateView(CreateView): """ @@ -39,9 +41,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): diff --git a/apps/note/templatetags/__init__.py b/apps/note/templatetags/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/note/templatetags/pretty_money.py b/apps/note/templatetags/pretty_money.py new file mode 100644 index 00000000..5b7acd12 --- /dev/null +++ b/apps/note/templatetags/pretty_money.py @@ -0,0 +1,12 @@ +from django import template + + +def pretty_money(value): + if value%100 == 0: + return str(value//100) + '€' + else: + return str(value//100) + '€ ' + str(value%100) + + +register = template.Library() +register.filter('pretty_money', pretty_money) diff --git a/templates/member/profile_detail.html b/templates/member/profile_detail.html index ea2f0f07..82be255a 100644 --- a/templates/member/profile_detail.html +++ b/templates/member/profile_detail.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load i18n static %} +{% load i18n static pretty_money django_tables2 %} {% block content %}