diff --git a/app/database.py b/app/database.py index a9c8365..716f7e2 100644 --- a/app/database.py +++ b/app/database.py @@ -4,6 +4,7 @@ from app import app from user import User from product import Product from consumption import Consumption +from deposit import Deposit import random as rand import datetime @@ -183,6 +184,24 @@ def add_consume(username, productid): return +def get_deposits(userid = None): + #ID|USERID|AMOUNT|TIME + if userid == None: + rows = query_db("SELECT * FROM DEPOSITS") + else: + rows = query_db("SELECT * FROM DEPOSITS WHERE USERID = ?", [str(userid)]) + deposits = [] + if rows == None: + return deposits + for row in rows: + d = Deposit() + d.id = row[0] + d.userid = row[1] + d.amount = row[2] + d.time = datetime.datetime.strptime(row[3], "%Y-%m-%d %H:%M:%S") + deposits.append(d) + return deposits + ##for testing only def generate_test_users(): diff --git a/app/deposit.py b/app/deposit.py new file mode 100644 index 0000000..809b34d --- /dev/null +++ b/app/deposit.py @@ -0,0 +1,10 @@ +import datetime as dt + +class Deposit: + + def __init__(self): + #ID|USERID|AMOUNT|TIME + self.id = 0 + self.userid = 0 + self.amount = 0.0 + self.time = dt.datetime \ No newline at end of file diff --git a/app/templates/personal.html b/app/templates/personal.html index 60feb65..ccbaaf5 100644 --- a/app/templates/personal.html +++ b/app/templates/personal.html @@ -13,7 +13,7 @@
Einzahlungen (TODO): {{ "%0.2f" % deposited }} €
+Einzahlungen: {{ "%0.2f" % deposited }} €
Konsumationen: {{ "%0.2f" % owed }} €
Total: {{ "%0.2f" % (deposited - owed)}} €