Commit 55884f01 authored by Pierre-antoine Comby's avatar Pierre-antoine Comby

Merge branch 'transaction_history' into 'master'

Transaction history

See merge request !4
parents 2a2e78f8 66b70e69
Pipeline #1444 passed with stage
in 2 minutes and 55 seconds
......@@ -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):
......
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)
{% extends "base.html" %}
{% load i18n static %}
{% load i18n static pretty_money django_tables2 %}
{% block content %}
<h3>Compte n° {{ object.pk }}</h3>
......@@ -20,8 +20,10 @@
<dt class="col-6 col-md-3">{% trans 'address'|capfirst %}</dt>
<dd class="col-6 col-md-3">{{ object.address }}</dd>
<dt class="col-6 col-md-3">{% trans 'balance'|capfirst %}</dt>
<dd class="col-6 col-md-3">{{ object.user.note.balance }}</dd>
<dd class="col-6 col-md-3">{{ object.user.note.balance | pretty_money }}</dd>
</dl>
<a href="{% url "password_change" %}">{% trans 'Change password' %}</a>
{% render_table history_list %}
{% endblock %}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment