diff --git a/app/templates/personal.html b/app/templates/personal.html
index 7d80673..60feb65 100644
--- a/app/templates/personal.html
+++ b/app/templates/personal.html
@@ -1,17 +1,52 @@
{% extends "base.html"%}
{% set title = "Personal" %}
{% block content %}
-
TODO:
-
Statistik
-
+
Bierkonsum
 }})
{% if user %}
{% set fils = "total%03d.png" % user.id %}
 }})
{% endif %}
-
+
+ Abrechnung
+
+
Gesamt
+
Einzahlungen (TODO): {{ "%0.2f" % deposited }} €
+
Konsumationen: {{ "%0.2f" % owed }} €
+
Total: {{ "%0.2f" % (deposited - owed)}} €
+
+
+
Einzahlungen (TODO)
+
+
+ | Datum |
+ Betrag |
+
+ {% for deposit in deposits %}
+
+ | {{deposit.time}} |
+ {{ "%0.2f" % deposit.amount}} € |
+
+ {% endfor %}
+
+
+
+
Konsumationen
+
+
+ | Datum |
+ Produkt |
+ Preis |
+
+ {% for consumption in consumed %}
+
+ | {{consumption.time}} |
+ {{products[consumption.prodnr-1].name}} |
+ {{ "%0.2f" % consumption.price}} € |
+
+ {% endfor %}
+
+
{% endblock %}
diff --git a/app/views.py b/app/views.py
index ee915c6..c87c712 100644
--- a/app/views.py
+++ b/app/views.py
@@ -220,7 +220,12 @@ def consume():
@app.route('/personal')
@requires_login
def personal():
- return render_template('personal.html', user=get_user_by_name(session.get('name')))
+ name = session.get('name')
+ consumed=get_consumed(name)
+ owed = 0
+ for consumption in consumed:
+ owed += consumption.price
+ return render_template('personal.html', user=get_user_by_name(name), consumed=consumed, products=get_products(), deposited=555.55, owed=owed)
@app.route('/billing', methods=['POST', 'GET'])
@requires_baron