From c0d9cf8ff06333dc7bf4374b45209e56bec01218 Mon Sep 17 00:00:00 2001
From: Bernhard Stampfer <stampfer@mail.com>
Date: Fri, 26 Feb 2016 14:24:46 +0100
Subject: [PATCH] - added lists on personal page

---
 app/templates/personal.html | 47 ++++++++++++++++++++++++++++++++-----
 app/views.py                |  7 +++++-
 2 files changed, 47 insertions(+), 7 deletions(-)

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 %}
-	<h3>TODO: </h3>
-	<ul>
-		<li>add money owed</li>
-	</ul>
 	<h1> Statistik </h1>
-
+	<div>
 	<h2> Bierkonsum </h2>
 	<img src="{{ url_for('static', filename='total.png') }}">
 	{% if user %}
         {% set fils = "total%03d.png" % user.id %}
     	<img src="{{ url_for('static', filename=fils) }}">
 	{% endif %}
-
+	</div>
+	<h1> Abrechnung </h1>
+	<div>
+		<h2>Gesamt</h2>
+		<p>Einzahlungen (TODO): {{ "%0.2f" % deposited }} €</p>
+		<p>Konsumationen: {{ "%0.2f" % owed }} €</p>
+		<p>Total: {{ "%0.2f" % (deposited - owed)}} €</p>
+	</div>
+	<div>
+		<h2>Einzahlungen (TODO)</h2>
+		<table>
+			<tr>
+				<th>Datum</th>
+				<th>Betrag</th>
+			</tr>
+			{% for deposit in deposits %}
+			<tr>
+				<td>{{deposit.time}}</td>
+				<td>{{ "%0.2f" % deposit.amount}} €</td>
+			</tr>
+			{% endfor %}
+		</table>
+	</div>
+	<div>
+		<h2>Konsumationen</h2>
+		<table>
+			<tr>
+				<th>Datum</th>
+				<th>Produkt</th>
+				<th>Preis</th>
+			</tr>
+			{% for consumption in consumed %}
+			<tr>
+				<td>{{consumption.time}}</td>
+				<td>{{products[consumption.prodnr-1].name}}</td> <!-- #is there a better way? -->
+				<td>{{ "%0.2f" % consumption.price}} €</td>
+			</tr>
+			{% endfor %}
+		</table>
+	</div>
 {% 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