Merge branch 'master' of https://github.com/ulrichknecht/baroness

app/database.py

@@ -7,6 +7,7 @@ from consumption import Consumption
 from deposit import Deposit
 import random as rand
 import datetime
+from settings import settings
 
 DATABASE = 'test/database.db'
 
@@ -56,6 +57,7 @@ def get_user(u):
     u.isblack=row[6]
     u.isbaron=row[7]
     u.isshown=row[8]
+    u.autoblack=row[9]
     print u
     return u
 
@@ -73,6 +75,7 @@ def get_user_by_name(name):
     u.isblack=row[6]
     u.isbaron=row[7]
     u.isshown=row[8]
+    u.autoblack=row[9]
     print u
     return u
 
@@ -108,6 +111,7 @@ def get_users():
         u.isblack=row[6]
         u.isbaron=row[7]
         u.isshown=row[8]
+        u.autoblack=row[9]
         users.append(u)
     return users
 
@@ -119,7 +123,7 @@ def add_user(u):
 
 def update_user(u):
     #query_db("UPDATE users SET (NAME, LONGNAME, EMAIL, RFID_ID, ISBLACK, ISBARON, ISSHOWN) VALUES (?, ?, ?, ?, ?, ?, ?) WHERE ID=?", (u.name, u.longname, u.email, u.rfid_id, u.isblack, u.isbaron, u.isshown, u.id))
-    query_db("UPDATE users SET NAME=?, LONGNAME=?, EMAIL=?, RFID_ID=?, ISBLACK=?, ISBARON=?, ISSHOWN=? WHERE ID=?", (u.name, u.longname, u.email, u.rfid_id, u.isblack, u.isbaron, u.isshown, u.id))
+    query_db("UPDATE users SET NAME=?, LONGNAME=?, EMAIL=?, RFID_ID=?, ISBLACK=?, ISBARON=?, ISSHOWN=?, AUTOBLACK=? WHERE ID=?", (u.name, u.longname, u.email, u.rfid_id, u.isblack, u.isbaron, u.isshown, u.autoblack, u.id))
     get_db().commit()
 
 
@@ -199,6 +203,12 @@ def add_consume(username, productid):
     #INSERT INTO USERS (NAME, PASSWORD, LONGNAME, EMAIL, RFID_ID) VALUES (? ,? ,?, ?, ?)", (u.name, u.password, u.longname, u.email, u.rfid_id))
     query_db("INSERT INTO CONSUMED (PRODNR, CONSUMER, PRICE, TIME) VALUES (?, ?, ?, ?)", (str(product.id), str(consumerid), product.price, datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")))
     get_db().commit()
+
+    if settings.autoBlack:
+        if get_debt(name=username) > settings.blockLimit:
+            u = get_user_by_name(username)
+            u.isblack = True
+            update_user(u)
     print "consumed"
 
     return
@@ -213,6 +223,8 @@ def get_debt(name=None):
     deposits = get_deposits(get_user_by_name(name).id)
     for deposit in deposits:
         debt -= deposit.amount
+
+    debt = round(debt, 2)
     return debt
 
 
@@ -234,6 +246,21 @@ def get_deposits(userid = None):
         deposits.append(d)
     return deposits
 
+def add_deposit(username, amount):
+    consumerid = query_db("SELECT ID FROM USERS WHERE NAME = ?", [username], one=True)
+    consumerid = int(consumerid[0])
+    query_db("INSERT INTO DEPOSITS (USERID, AMOUNT, TIME) VALUES (?, ?, ?)", (str(consumerid), amount, datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")))
+    get_db().commit()
+    if settings.autoUnblack:
+        if get_debt(name=username) < settings.blockLimit:
+            u = get_user_by_name(username)
+            u.isblack = False
+            update_user(u)
+    print "deposit"
+
+    return
+
+
 ##for testing only
 def generate_test_users():
 
@@ -267,4 +294,4 @@ def add_test_consume(consumerid, productid, daysago):
     product = get_product_by_id(productid)
     query_db("INSERT INTO CONSUMED (PRODNR, CONSUMER, PRICE, TIME) VALUES (?, ?, ?, ?)", (str(product.id), str(consumerid), product.price, (datetime.datetime.now()-datetime.timedelta(days=daysago)).strftime("%Y-%m-%d %H:%M:%S")))
     get_db().commit()
-    return
+    return