From c84212e1510550d1d35dbf956e0f226ab8ca63bf Mon Sep 17 00:00:00 2001 From: Ulrich Knechtelsdorfer Date: Sat, 13 Feb 2016 16:18:48 +0100 Subject: [PATCH] inital commit --- .gitignore | 1 + LICENSE.md | 16 + README.md | 10 + app/__init__.py | 4 + app/__init__.pyc | Bin 0 -> 250 bytes app/check_rights.py | 40 ++ app/check_rights.pyc | Bin 0 -> 1396 bytes app/consumption.py | 12 + app/consumption.pyc | Bin 0 -> 626 bytes app/database.py | 157 ++++++ app/database.pyc | Bin 0 -> 5711 bytes app/gui.py | 33 ++ app/gui.pyc | Bin 0 -> 1681 bytes app/product.py | 6 + app/product.pyc | Bin 0 -> 526 bytes app/static/style.css | 1 + app/templates/base.html | 39 ++ app/templates/billing.html | 10 + app/templates/consume.html | 18 + app/templates/index.html | 27 + app/templates/login.html | 17 + app/templates/manage_beverages.html | 14 + app/templates/manage_products_add.html | 16 + app/templates/manage_users.html | 34 ++ app/templates/manage_users_add.html | 21 + app/templates/manage_users_edit.html | 23 + app/templates/not_baron.html | 6 + app/templates/not_logged_in.html | 6 + app/user.py | 71 +++ app/user.pyc | Bin 0 -> 1495 bytes app/users.pyc | Bin 0 -> 658 bytes app/views.py | 157 ++++++ app/views.pyc | Bin 0 -> 5292 bytes doc/database.txt | 79 +++ gpl-3.0.txt | 674 +++++++++++++++++++++++++ run.py | 19 + test/database.db | Bin 0 -> 4096 bytes 37 files changed, 1511 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE.md create mode 100644 README.md create mode 100644 app/__init__.py create mode 100644 app/__init__.pyc create mode 100644 app/check_rights.py create mode 100644 app/check_rights.pyc create mode 100644 app/consumption.py create mode 100644 app/consumption.pyc create mode 100644 app/database.py create mode 100644 app/database.pyc create mode 100644 app/gui.py create mode 100644 app/gui.pyc create mode 100644 app/product.py create mode 100644 app/product.pyc create mode 100644 app/static/style.css create mode 100644 app/templates/base.html create mode 100644 app/templates/billing.html create mode 100644 app/templates/consume.html create mode 100644 app/templates/index.html create mode 100644 app/templates/login.html create mode 100644 app/templates/manage_beverages.html create mode 100644 app/templates/manage_products_add.html create mode 100644 app/templates/manage_users.html create mode 100644 app/templates/manage_users_add.html create mode 100644 app/templates/manage_users_edit.html create mode 100644 app/templates/not_baron.html create mode 100644 app/templates/not_logged_in.html create mode 100644 app/user.py create mode 100644 app/user.pyc create mode 100644 app/users.pyc create mode 100644 app/views.py create mode 100644 app/views.pyc create mode 100644 doc/database.txt create mode 100644 gpl-3.0.txt create mode 100755 run.py create mode 100644 test/database.db diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1c2d52b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea/* diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..b6a6210 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,16 @@ +Baroness is made to simplify the billing of the beverages consumed +from the open fridge in the "FET-Gemeinschaftsraum". +Copyright (C) 2016 Ulrich Knechtelsdorfer + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . diff --git a/README.md b/README.md new file mode 100644 index 0000000..4dc53ae --- /dev/null +++ b/README.md @@ -0,0 +1,10 @@ +Baroness +======== + +This programm is made for simplifying the billig for beverages at an open fridge. Registered users can identify via a RFID tag and add their consumed beverages to their bill. The administrator of the system, called "Beer-Baron" can send the current bill of users via email and of course add some payments that are taken. This can be done via a web interface + +Hardware +======== + +The hardware used for this system consists of an raspberry pi, an RFID reader and a small touch screen connected via SPI. + diff --git a/app/__init__.py b/app/__init__.py new file mode 100644 index 0000000..a6c9e33 --- /dev/null +++ b/app/__init__.py @@ -0,0 +1,4 @@ +from flask import Flask + +app = Flask(__name__) +from app import views diff --git a/app/__init__.pyc b/app/__init__.pyc new file mode 100644 index 0000000000000000000000000000000000000000..fd48e136bb575456bbc8c4fd22e42508b767f0ac GIT binary patch literal 250 zcmYk0K?=e!5Je|V1rY^rVOB&P0hPfWfp%U7hJwwZ%z;P>JC@^;eq%9$ zQ|zH^Ock0RUbMP~ElW;kACp}mLF}Ul(N#dl_7T>OPABE6AfQ6x z5AhH9HT(dWZyX*a2NEmWJ7bUM@y+MP*Mt6-+n>)9+J6E6U+}c&yreu7>Ga}qPY&j z8EdnubhlWpO_`cHa;8}4u`{89QInTf*3@3Z)?2-Ai>ffAG^rt{W$ttR|`NG+g z^`$#v`_v>=%{@({*``b!cN}Hd0WTEv)Ug_7O3k*!4br`Wr84nVaw zZ#G$NtcMl|SwtdrubccMg#gb_3Z1gT6j}=DJag<5G-}TbrqGYmKVXLR(*i@VBCqCi z1~K!@(1__-fvyW7G+vcPb<%5ngC!3pz}5#)QLSM6R}Gbh9J33H@Dv>Vx5jbxS$PMM z_l;|f!#=D0B$=LhY*!uvsSnA?JCVnb#x9=5);RD^I9OG=6{_h&SOQ_sG8VjaZI%J` XXGN86a`PONut@H%8mhh;HhP2aN16nY literal 0 HcmV?d00001 diff --git a/app/consumption.py b/app/consumption.py new file mode 100644 index 0000000..5d127d5 --- /dev/null +++ b/app/consumption.py @@ -0,0 +1,12 @@ +import datetime as dt + +class Consumption: + + def __init__(self): + #ID|PRODNR|CONSUMER|PRICE|TIME + self.id = 0 + self.prodnr = 0 + self.consumer = 0 + self.price = 0 + self.time = dt.datetime + diff --git a/app/consumption.pyc b/app/consumption.pyc new file mode 100644 index 0000000000000000000000000000000000000000..11a3bdd12e199efb95c0e2a543aca00632c36c59 GIT binary patch literal 626 zcmbtRK~BRk5Zokfpal-RflI`J9N>r$qMUn3rAqW-wXqR~CbnYtfW!?R!#j8hf8YTy zyQ#_@oa}gay_%Ug+1Jtd^W%M9({^RpuMyz{pz$WOCR!wM7XS#n5UE`P7kx*x z`6#0}pvR$%FvHXWsMrHUuC0zaHs3kjc5xqREj~>b*}v~>ZDdeKIn~Q(qHPSw z!GJ_eN)^odzCf1*!YQ)y!8NAT)@f7Tn(!2zFITJca_N29>&Sha`DYl*Z9x5;p>jb`;Jnh-IQSlvBY)fYTCnH~R N+55iYKPz&F=?@`mdzJtI literal 0 HcmV?d00001 diff --git a/app/database.py b/app/database.py new file mode 100644 index 0000000..fa754f2 --- /dev/null +++ b/app/database.py @@ -0,0 +1,157 @@ +import sqlite3 +from flask import g +from app import app +from user import User +from product import Product +from consumption import Consumption +import datetime + +DATABASE = 'test/database.db' + +def get_db(): + db = getattr(g, '_database',None) + if db is None: + db = g._database = sqlite3.connect(DATABASE) + return db + +@app.teardown_appcontext +def close_connection(exception): + db = getattr(g,'_database', None) + if db is not None: + db.close() + +def query_db(query, args=(), one=False): + closeflag = False + try: + db = get_db() + except RuntimeError: + print "GUI DB acces" + db = sqlite3.connect(DATABASE) + closeflag = True + + print query + print args + #print "Sqlite: " + query % args + cur = db.execute(query, args) + rows = cur.fetchall() + cur.close() + if closeflag is True: + db.close() + + return (rows[0] if rows else None) if one else rows + +def get_user(u): + row = query_db("SELECT * FROM USERS WHERE NAME = ?", [u.name], one=True) + u = User() + if row is None: + return None + u.id=row[0] + u.name=row[1] + u.password=row[2] + u.longname=row[3] + u.email=row[4] + u.rfid_id=row[5] + u.isblack=row[6] + u.isbaron=row[7] + u.isshown=row[8] + print u + return u + +def get_user_by_name(name): + row = query_db("SELECT * FROM USERS WHERE NAME = ?", [name], one=True) + u = User() + if row is None: + return None + u.id=row[0] + u.name=row[1] + u.password=row[2] + u.longname=row[3] + u.email=row[4] + u.rfid_id=row[5] + u.isblack=row[6] + u.isbaron=row[7] + u.isshown=row[8] + print u + return u + +def get_users(): + rows = query_db("SELECT * FROM USERS") + users = [] + for row in rows: + u = User() + u.id=row[0] + u.name=row[1] + u.password=row[2] + u.longname=row[3] + u.email=row[4] + u.rfid_id=row[5] + u.isblack=row[6] + u.isbaron=row[7] + u.isshown=row[8] + users.append(u) + return users + + +def add_user(u): + query_db("INSERT INTO USERS (NAME, PASSWORD, LONGNAME, EMAIL, RFID_ID) VALUES (? ,? ,?, ?, ?)", (u.name, u.password, u.longname, u.email, u.rfid_id)) + get_db().commit() + + +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)) + get_db().commit() + + +def get_products(): + rows = query_db("SELECT * FROM PRODUCTS") + products = [] + for row in rows: + p = Product() + p.id = row[0] + p.name = row[1] + p.price = row[2] + products.append(p) + return products + + +def get_product_by_id(id): + row = query_db("SELECT * FROM PRODUCTS WHERE ID = ?", str(id), one=True) + print row + p = Product() + p.id = row[0] + p.name = row[1] + p.price = row[2] + return p + + +def get_consumed(user=None, startdate=None, enddate=None): + + if user is None and startdate is None and enddate is None: + rows = query_db('SELECT * FROM CONSUMED') + + consumed = [] + for row in rows: + #ID|PRODNR|CONSUMER|PRICE|TIME + c = Consumption() + c.id = int(row[0]) + c.prodnr = int(row[1]) + c.consumer = int(row[2]) + #2016-01-27 12:59:04 + c.price = float(row[3]) + c.time = datetime.datetime.strptime(row[4], "%Y-%m-%d %H:%M:%S") + consumed.append(c) + + return consumed + +def add_consume(username, productid): + + consumerid = query_db("SELECT ID FROM USERS WHERE NAME = ?", [username], one=True) + print "consumerid = " + print consumerid + consumerid = int(consumerid[0]) + product = get_product_by_id(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() + print "consumed" \ No newline at end of file diff --git a/app/database.pyc b/app/database.pyc new file mode 100644 index 0000000000000000000000000000000000000000..cc0caff088218691277d42e3e00738984a92ad94 GIT binary patch literal 5711 zcmcgw-A^0Y6+bin06P!@WH-qsZKuuBbsDm0o2{yDlO_Z^U@aJQ4VxBeWf{*v2K+&0 zhK5K%szhEY^<~wkzV@L~`?6AB`cL$~snplq-|yV94Tz>)A{E<*bMC!!KhF7`k2{%v zjTf)|{vThoB>l_c|6}~(e}nk=I?@)|w7e^AM>?)-y5g`eBkhcIGP0Sma#q?|>EvWH zXXTu<^U@iS%@Hf-r9CR0f@~J7jJb=lSri{bE{Q)XZ?M#u1R2>K7r#L9*pbc4;$M|u zLj0n+~jk{!!tz&7{yt&oMV5eJc#Mj)+4J^!GU*oI4JSm<@*gU)^u z;{O%MNf0Mjv5rzi5X^a9{aWuiFh; zNivE7<@xpbC-e1+$w9E^;tKv&2~?ECAAy^D-s=Q&e%SMaxpENiCB6N*t*!fWP}cCg z`>&Eb#$p!@e~apgxr8`V&X{w&Yk98gSHK4J$1U-Oc zWp{*7fpqN3QBGdxWOr1j%`0C}RlUyeaf0a&!e?wN0pv>b7kQnR=+C6SD>q*JRn-cq zUgG|1@fhghM%61n@tUnx5QmVZMAZS3B2Sy`I4~TPkeGvR5_W=06!juQYa2q-6xmPv ztVahHfWcwVI!FQq-FA?)o;TZVGtRM8nT0Ute{m2*uk_Jov=c)sBE&FfRsC%Vq z?P?uFIyUOPj4xjgP0z_#egTLA!o zFk*#K6-KR4P@!Ojq6$STTvFkZ6~?$lfQimT3)bQvfz~U_m4$WhC*D)Dy5emhAk@8Q zOBGY`YV#`<@1gg|P&o>Qkd7SElS7&(q@6>mBBV2fv}Z`ImejmA!Ksb9%}!vZAQ?Vt z-Bl;?6%_l;IDXlStkCXtcQ{@l7j&9oTO(Jr9r}&XS3Zol+RfHppKnIJZpz2cdoR1z z|GCoxMG6q|4gg_DJ3uP9i}_N3+;j>6LsmgTpbS4b8|tW=0YJWnFaSu34tlYo126$P zT(y!#$0w)I;YuT`okRx&3l*XR!Vn!0hUkDWL!k#haeiX?BE}>ZH8_5T_ANa#P{vo*m~6<{vMz$wfFV6 z*_$iU4QTTP{NiCiKo*DN@4 R7*USN`%VT02b$8ETxN7-72s3_xH+fM9!Qa|i$c zdT4V9000C=1PA~C1V#i1000C=1PA~C1V#i1000C=1PBU%U05E0$r0zp4S9yJQr9qF zi>Gmda{|J5bAHVZbbjmZ-^Hj}MWC_>x_*gTH6MUzD4-9<=3On#WYV{EyaFLL@ff21 zILthB#fb#>(5qAdDdHAtu5NN%F29odDb&etK~+ue8>A@etDx( z_ezhvS$=0de(#hRfsN|_7P<3WNwYX(cB|Lvgtn}G7Z2i+P2bl@*#IBYc;eh0Dvx!6 zDz66Se^DM)2!N~NNJnKG1rOD!Rn2bktU6nmcw-G^ZN*ctc=gJ<=CFrQOJ9lPRgGj) zMUt)7pDfQWe4euNX0>M7`qJt%uxUoDmLEP+PdTC9w+1O2(bOSku{|xb-$lu2IeiO91m%#a&I2=(;+C~O7h4mwVR00L~^-ob1X(7W6I1p__}!Z6UEaTjvT0!5J6 zPey{&`?q?JbU(5V zZc2;~3mo%L5GWB)Wo>-_L?r|sX{+B3U8BY(j&V7%Sv4z%xaMR4}(rO`Apq!3MV|1RHiB?IPPE260lPP~5Ok zH6gk)kv>Ku&BBUA>UqAfuv)8ctW?Tpd|_Bf$5iCZZ|==>?#=k#%+hBwE1%8OZ7I#v zV;zQyQ|pG^L>)&{CV||Iw3@~(6)z@&NPTI$-D@UlaP4E@;H6Ckzyp_K2s$Mg>vLR6 zn;1m(_7x}1DA7mRhty2oW@a8XUC`I$tZv!5Ad>oS*`M)um_5D@BJPLIgbT-X3(hn@ z?zD5unRHvcMR5Cr)ch5ML3TM+Z39agTi?PxZM9`>&w>nC=!1(-10C>Iyp7RUG30?Q zU=dOiQCv)>eKAU{K! z`IO{7iN+0v5%UWWg=4q(vX825qDo&B7)^SLFCvAA(z{&&LK=Hl;9lXeF2fyOsVut=PsH6WGbMtN?Kb4=jTA0LVs*o$>3uA@i G)bzKrc{Ln?JXQH2;M7e+qJsz%+h}GNOJd2b3x5 z>5vT3en7j5^a33beIt6;4_UVxRdCP##-|f0h@RPfUk87k+I+|6x;Q-X7GS##axE|z z?ZYCm#eTrnSb$l`Ass2|FU>P%mMbBsRA`N&F%fB2H|?emviBCfgMu9q&0`#m>h=79&U` z%-w<1`cNF0mbQg9t!Ku4^u?$(7(8mFqfu*bVjqmY#B7r9J2p$|Mj%14Q_k8t$Q^?* zc9h{feN$y1$Q5G2!XwI%&ruCTJX4GiLCyl&14jlcG+Ut06Hddk_Xjkq5Z|eAW^|RN z722HlbvFbL6hBR@7h~NI#i0nj@x(;j zJu&yR;2H@oMty>bjg?NUcJfHAn4Bv}PH}$rZsydV1G$@Eq?-6%3Tmo~Z&N)~4YjJ4 zgB2x(9CGEDxCrYY$FR_pFE)|=zwZ-UB=4>ah;>cOF3t|_DsJ5ZIW9PWdv;{kacdPc9|9E>@ko$POA_uF z%po2JNpgU$%CMBV5p%j@4l8C0r+!8H*9pYovmv(xRt;*E+QmjFb1`1Vj-b$~PY0

e;&o+<1&&b>|MfcsCw`R58FP= literal 0 HcmV?d00001 diff --git a/app/product.py b/app/product.py new file mode 100644 index 0000000..98bc1aa --- /dev/null +++ b/app/product.py @@ -0,0 +1,6 @@ +class Product: + + def __init__(self): + self.id = 0 + self.name = "" + self.price = 0.0 \ No newline at end of file diff --git a/app/product.pyc b/app/product.pyc new file mode 100644 index 0000000000000000000000000000000000000000..11c6e6cfb414f4ca57d96cdd2624a00fb400819e GIT binary patch literal 526 zcmbVIJx{|h5WP6i(n<_WjBHh=dSFEe0ds{?35hIL8ym3NG**2KNQeb~1vCGUKfpU1 z(HZRA%lSUuJG=Zk9KU{i-nR6!O8hTi@fcw7m1GNgCwe2gYj9RHulA7RA>d})+ozU) zy9>lFVetsyh?+t;(A_Ai=ar;e0Wk%;g2fX6G+u~I;ui;fWr`>v$ci(MLSlgj0a=yI z%R=QX%UGL5=Xf7Z*!tEb#T1WjeP1C=3E~8ve(XD^t?#YV*DkKO4|=&g)r$~x$QPT2 zXFfowF@EFO7*UG@02L$btey)**ccwC>JHDc#<7;#o$Oz=>!bvTa>Id|Wh!~Sl=?q& Oy46`8^IZ5MjJ^Tq@Lsn7 literal 0 HcmV?d00001 diff --git a/app/static/style.css b/app/static/style.css new file mode 100644 index 0000000..9f6da40 --- /dev/null +++ b/app/static/style.css @@ -0,0 +1 @@ +static css style sheet diff --git a/app/templates/base.html b/app/templates/base.html new file mode 100644 index 0000000..2260046 --- /dev/null +++ b/app/templates/base.html @@ -0,0 +1,39 @@ + + + + + + + {% if title %} + {{ title }} - Baroness + {% else %} + Des Bierbarons Helferin - Baroness + {% endif %} + + + + +

+ {% if user %} + Du bist eingeloggt als {{user.longname}}. + {% endif %} + + {% block content %}{% endblock %} + + + + diff --git a/app/templates/billing.html b/app/templates/billing.html new file mode 100644 index 0000000..956b986 --- /dev/null +++ b/app/templates/billing.html @@ -0,0 +1,10 @@ +{% extends "base.html"%} +{% set title = "Konsumatverwaltung" %} +{% block content %} +

TODO:

+
    +
  • everything
    • +
+

Abrechnung

+ +{% endblock %} \ No newline at end of file diff --git a/app/templates/consume.html b/app/templates/consume.html new file mode 100644 index 0000000..054966c --- /dev/null +++ b/app/templates/consume.html @@ -0,0 +1,18 @@ +{% extends "base.html"%} +{% set title = "Konsumieren" %} +{% block content %} +

TODO:

+
    +
  • add photos for products, add photos in database
    • +
+

Konsumieren

+ {% if message %} +

{{ message }}

+ {% endif %} +

+ Möchtest du etwas konsumieren? + {% for product in products %} +

{{ product.id }}, {{product.name}} , {{product.price}} €

+ {% endfor %} +

+{% endblock %} diff --git a/app/templates/index.html b/app/templates/index.html new file mode 100644 index 0000000..e115bff --- /dev/null +++ b/app/templates/index.html @@ -0,0 +1,27 @@ +{% extends "base.html"%} +{% set title = "Bierliste" %} +{% block content %} +

TODO:

+
    +
  • graphical beer list
    • +
+

Bierliste

+ + + + + + + + + {% for consumption in consumed %} + + + + + + + + {% endfor %} +
IDProdukt NummerKonsumentPreisZeit
{{consumption.id}}{{consumption.prodnr}}{{consumption.consumer}}{{consumption.price}}{{consumption.time}}
+{% endblock %} diff --git a/app/templates/login.html b/app/templates/login.html new file mode 100644 index 0000000..1604863 --- /dev/null +++ b/app/templates/login.html @@ -0,0 +1,17 @@ +{% extends "base.html"%} +{% set title = "Login" %} +{% block content %} +

TODO:

+
    +
  • encrypt and salt passwords
    • +
+

Login

+ {% if error %} +

{{ error }}

+ {% endif %} +
+ Username:
+ Passwort:
+ +
+{% endblock %} diff --git a/app/templates/manage_beverages.html b/app/templates/manage_beverages.html new file mode 100644 index 0000000..d1f7db6 --- /dev/null +++ b/app/templates/manage_beverages.html @@ -0,0 +1,14 @@ +{% extends "base.html"%} +{% set title = "Konsumatverwaltung" %} +{% block content %} +

TODO:

+
    +
  • add "change products pages"
    • +
+

Konsumatverwaltung

+ + {% for product in products %} +

{{ product.id }}, {{product.name}}, {{product.price}} €

+ {% endfor %} + Getränk Hinzufügen +{% endblock %} diff --git a/app/templates/manage_products_add.html b/app/templates/manage_products_add.html new file mode 100644 index 0000000..2207ff7 --- /dev/null +++ b/app/templates/manage_products_add.html @@ -0,0 +1,16 @@ +{% extends "base.html"%} +{% set title = "Produkt hinzufügen" %} +{% block content %} +

Produkt hinzufügen

+ {% if error %} +

Fehler: {{ error }}

+ {% endif %} + {% if success %} +

{{ success }}

+ {% endif %} +

TODO: many

+
+ Produktname:
+ Preis:
+
+{% endblock %} \ No newline at end of file diff --git a/app/templates/manage_users.html b/app/templates/manage_users.html new file mode 100644 index 0000000..b9a66fe --- /dev/null +++ b/app/templates/manage_users.html @@ -0,0 +1,34 @@ +{% extends "base.html"%} +{% set title = "Konsumentenverwaltung" %} +{% block content %} +

Konsumentenverwaltung

+

TODO: many

+ + + + + + + + + + + + + {% for user in users %} + + + + + + + + + + + + {% endfor %} +
IDUsernameNameE-mailRFID-IDGeschwärztBaronAngezeigt
{{user.id}}{{user.name}}{{user.longname}}{{user.email}}{{user.rfid_id}}{% if user.isblack %} ☑ {% else %} ☐ {% endif %} {% if user.isbaron %} ☑ {% else %} ☐ {% endif %} {% if user.isshown %} ☑ {% else %} ☐ {% endif %} bearbeiten
+
+ User Hinzufügen +{% endblock %} diff --git a/app/templates/manage_users_add.html b/app/templates/manage_users_add.html new file mode 100644 index 0000000..1c9dd08 --- /dev/null +++ b/app/templates/manage_users_add.html @@ -0,0 +1,21 @@ +{% extends "base.html"%} +{% set title = "Konsumentin hinzufügen" %} +{% block content %} +

Konsumentin hinzufügen

+ {% if error %} +

Fehler: {{ error }}

+ {% endif %} + {% if success %} +

{{ success }}

+ {% endif %} +

TODO: many

+
+ Username:
+ Passwort:
+ Passwort wiederholen:
+ Name:
+ Email:
+ Euml ID:
+ +
+{% endblock %} diff --git a/app/templates/manage_users_edit.html b/app/templates/manage_users_edit.html new file mode 100644 index 0000000..6d9ce67 --- /dev/null +++ b/app/templates/manage_users_edit.html @@ -0,0 +1,23 @@ +{% extends "base.html"%} +{% set title = "Konsumentin bearbeiten" %} +{% block content %} +

{{user.name}} bearbeiten

+ {% if error %} +

Fehler: {{ error }}

+ {% else %} + {% if success %} +

{{ success }}

+ {% endif %} +
+ Userid:
+ Username:
+ Name:
+ Email:
+ Euml ID:
+ Geschwärzt:
+ Baron:
+ Angezeigt:
+ +
+ {% endif %} +{% endblock %} diff --git a/app/templates/not_baron.html b/app/templates/not_baron.html new file mode 100644 index 0000000..eaedddc --- /dev/null +++ b/app/templates/not_baron.html @@ -0,0 +1,6 @@ +{% extends "base.html"%} +{% set title = "Fehler 401" %} +{% block content %} +

Fehler 401

+

Du musst Baron sein um auf diese Seite zugreifen zu könnnen.

+{% endblock %} \ No newline at end of file diff --git a/app/templates/not_logged_in.html b/app/templates/not_logged_in.html new file mode 100644 index 0000000..96038a8 --- /dev/null +++ b/app/templates/not_logged_in.html @@ -0,0 +1,6 @@ +{% extends "base.html"%} +{% set title = "Fehler 401" %} +{% block content %} +

Fehler 401

+

Du musst eingeloggt sein um auf diese Seite zugerreifen zu können.

+{% endblock %} \ No newline at end of file diff --git a/app/user.py b/app/user.py new file mode 100644 index 0000000..f6ba854 --- /dev/null +++ b/app/user.py @@ -0,0 +1,71 @@ +class User: + + def __init__(self): + self.id=0; + self.name="" + self.password="" + self.longname="" + self.email="" + self.rfid_id="" + self.isblack=False + self.isbaron=False + self.isshown=False + + + def __str__(self): + s = "User:" + if self.id: + s = "%s %d" % (s, self.id) + else: + s = "%s, None" % s + + if self.name: + s = "%s, %s" % (s, self.name) + else: + s = "%s, None" % s + + if self.password: + s = "%s, %s" % (s, self.password) + else: + s = "%s, None" % s + + if self.longname: + s = "%s, %s" % (s, self.longname) + else: + s = "%s, None" % s + + if self.email: + s = "%s, %s" % (s, self.email) + else: + s = "%s, None" % s + + if self.rfid_id: + s = "%s, %s" % (s, self.rfid_id) + else: + s = "%s, None" % s + + if self.isblack is None: + s = "%s, None" % s + else: + if self.isblack is 0 or self.isblack is False: + s = "%s, False" % s + else: + s = "%s, True" % s + + if self.isbaron is None: + s = "%s, None" % s + else: + if self.isbaron is 0 or self.isbaron is False: + s = "%s, False" % s + else: + s = "%s, True" % s + + if self.isshown is None: + s = "%s, None" % s + else: + if self.isshown is 0 or self. isshown is False: + s = "%s, False" % s + else: + s = "%s, True" % s + + return s diff --git a/app/user.pyc b/app/user.pyc new file mode 100644 index 0000000000000000000000000000000000000000..eefeaab0a2ced3d80a7c9508a8f5f06cdcffa1b4 GIT binary patch literal 1495 zcmbVMO>War5FXq4r%@4$f>@wRD3TYbSs+*-gb+bpX7NIi$mYq39qJ~rBafp9sjNWa z0!VDxaR+X|4Y&Xopci1iaok3fR6vq9nR)ZQZ|03>?47k+2cN#Y9Mk&a$^TPXd{aay zKaWC(-V?nedNmZ=rGZ}&Uk-7^QFeaRk&S1v__m0MXy|}Ijt<>5$Iv4)@Lh3_0mg#S zlf_3OB+@C7)hJMez||cgC=|)2P%5QTrM#w?dZ{!@rHS|hA6M$fA}ELOThI_U4)qdA zFpu(v*o%O9m1dzDvov|Fo~n4Fc@WR?x@g%X4y_!-?qM+FNOxl%&4Tf?)PpQd);b@j ztHj4mH5Ny+i7y7J;Jc!AkJEY74dXP7y3Zq?=INq48r|;(i$!-S^*va;(S)pxlQ_2) z*WnxBaGJk;wW_!oFg;m(CXuD8Z?&)|l72_)R+^YK#a9r1SHf0F z_+u-fBR!9H?lYPcBl<|S4)1qDhNr{#_WNlPacymMSm%SAYg;?}9Qq<#M*cN%8T6Jx zbD0VR_zgG=M#JE=b~(5W0vXJj!BL%hvjYT%fwlit{PhqZhP9k$*6xDhPy{(OnSnjG zNR?Gd9R=m)Vu(glUx*Eg^<|bLHdro0JhVB z#0E+H<+B~zpD(@7*>r!te^|re>e2g}3{MCQJv}fHd;q)yJg&%(VUhGH7Z{dkoA1(y z0ykuML|_3{5jUXHRSel8;q;n;Ehf7q!zBR?cmq(0;Hvg_ev7Ozy`ZIvp$*%jnwGje|f{7pqBGYODSZy3+p VM*JHk_20fC__CFF#odq$z5siOdO83A literal 0 HcmV?d00001 diff --git a/app/views.py b/app/views.py new file mode 100644 index 0000000..396890d --- /dev/null +++ b/app/views.py @@ -0,0 +1,157 @@ +from check_rights import * +from flask import render_template, request, redirect, session, send_from_directory +from app import app +from database import * +from user import User +from product import Product +from consumption import Consumption + + + +@app.route('/static/') +def static_proxy(path): + return send_from_directory('./static/', path) + + +@app.route('/') +@app.route('/index') +def index(): + consumed = get_consumed() + return render_template("index.html", consumed=consumed, user=get_user_by_name(session.get('name'))) + + +@app.route('/login', methods=['POST', 'GET']) +def login(): + error = None + + if 'name' in session: #check if usr is already logged in + return redirect('/') + + if request.method == 'POST': + u = User() + u.name = request.form['username'].lower() + + u = get_user(u) + + if u is None: + error = 'User does not exist!' + return render_template('login.html', error=error, user=get_user_by_name(session.get('name'))) + if u.password != request.form['password']: + error = 'Wrong password!' + return render_template('login.html', error=error, user=get_user_by_name(session.get('name'))) + + session['name'] = u.name + return redirect('/') + + return render_template('login.html', error=error, user=get_user_by_name(session.get('name'))) + + +@app.route('/logout') +@requires_login +def logout(): + session.pop('name', None) + return redirect('/') + + +@app.route('/manage_users') +@requires_baron +def manage_users(): + users = get_users() + return render_template('manage_users.html', users=users, user=get_user_by_name(session.get('name'))) + + +@app.route('/manage_users/add', methods=['POST', 'GET']) +@requires_baron +def manage_users_add(): + if request.method == 'POST': + u = User() + error = None + u.name = request.form['username'].lower() + if u.name is None: + error = "Username not unique!" + + if request.form['password1'] == request.form['password2']: + u.password = request.form['password1'] + else: + error="Passwords do not match!" + u.longname=request.form['longname'] + u.email = request.form['email'] + u.rfid_id = request.form['rfid_id'] + + if error is None: + add_user(u) + return render_template('manage_users_add.html', success="User created!", user=get_user_by_name(session.get('name'))); + + return render_template('manage_users_add.html', error=error, user=get_user_by_name(session.get('name'))) + return render_template('manage_users_add.html', user=get_user_by_name(session.get('name'))) + + +@app.route('/manage_users/edit', methods=['POST']) +@app.route('/manage_users/edit/', methods=['GET']) +@requires_baron +def manage_users_edit(name=None): + if request.method == 'GET': + error = None + u = User() + u.name = name + u = get_user(u) + + if u is None: + error = "User existiert nicht" + + return render_template('manage_users_edit.html', user_to_edit=u, error=error, user=get_user_by_name(session.get('name'))) + + if request.method == 'POST': + u = User() + #print request.form + u.id = request.form['id'] + u.name = request.form['username'].lower() + u.longname=request.form['longname'] + u.email = request.form['email'] + u.rfid_id = request.form['rfid_id'] + + if 'isblack' in request.form: + u.isblack = True + else: + u.isblack = False + + if 'isbaron' in request.form: + u.isbaron = True + else: + u.isbaron = False + + if 'isshown' in request.form: + u.isshown = True + else: + u.isshown = False + + update_user(u) + + return redirect('/manage_users') + + +@app.route('/manage_beverages') +@requires_baron +def manage_beverages(): + products = get_products() + return render_template('manage_beverages.html', products=products, user=get_user_by_name(session.get('name'))) + +@app.route('/consume') +@requires_login +def consume(): + products = get_products() + message = [] + prodid = request.args.get('prodid') + if prodid is not None: + prod = get_product_by_id(prodid) + username = session.get('name') + add_consume(username, prod.id) + message = "Du hast gerade ein %s konsumiert." % prod.name + return render_template('consume.html', products=products, message=message, user=get_user_by_name(session.get('name'))) + + +@app.route('/billing') +@requires_baron +def billing(): + + return render_template('billing.html', user=get_user_by_name(session.get('name'))) diff --git a/app/views.pyc b/app/views.pyc new file mode 100644 index 0000000000000000000000000000000000000000..fd299c32d48373149e36ec3895316cce8b60d139 GIT binary patch literal 5292 zcmb_gOK&5`5w0Fmlt@vJ)oWMUwM`{nfOZfuc7i;dh2vm1k3*m=Mw?oUz4OR{kkMe(qEFKA^nCJ($!?V zEXlI;m)#f~Rvd@AjGL0Qq~CHYOEO-Sq%Hln8#iRUCds<=*TqE3a=szqvRoMnSL6#} zr@tx1e3QeX-%^^@f`(*w%B8l1YZ9(YxFI7CWG37!S#6axca+t(gj*F3JLT%OuI@^> zQ(4_BS22H`e}tL63gz9B@@_#nG8Chb{GLuiHaCgA9SQg43l59F{(i~fpp@i(h5tdh z`aoB4i?=GP_si9{%f0VZRv+-VlkOqR9sdVEU6@>QHt%=o2l)n?ESiK-Hpru7Iu7zE zU)H%#XOYeG743&{77cS-BS^DLcR&q`!F1{dbqs!Eqs)!S z{ArekvtjNgRx$B7o!D72&B54`anI&K9uIqura^x85u1;P6q+CMevFS@LzAofzJlj? zxTc4hW7|Y~RC3TWd|q`S4Ec32Bih(^(d(V1Nz@DDG>m#rB72di)86UncYC-*@3T01 zVUMPlc^iaIu)#D-UtUsj%QMAOmG*1{{ay@hzSL-=xKyBudxQ?ey%PCcO@OdNyg_tC zQ|?J#lk>WS^};8vjCZ0II<_rrRGvp?c`{au3{_uIm{Yei=vF(EAc>q+Dd{N62PK_P zN%GBNmKz4AmjlxKR@s(@{K8|4E|!EDfy+{Pfo+ z&-CnH{Op-3jLMuVtOcP%)fQ9*1z$8Idq7n|ZHS$dLSr?#@Fe?E@+H+RNTJCFHMxHd zXc2j3WUwN6lO62)+^_@27b}weNx~(yM@vHNSyp?1c$Ej916s-$r9H6ie63{Pl>LjE zWdD$`^?xw{bDVDEQRO0Ua(I{CcI-1=eVW(bMWfC@bJCP{2Qv(`PMAivGfDGK^fI>j zp?Z*7zqfR+>*i|ap^EjP2hw?UD0${)$xZ=jmatvJI##RNS{z*K-B*4oc2?21zRSC83$$>}fT1Bl_5=TL_ zp*%qGzlgqi*_?EV;>U_IzJ}8d#zYrFje^T;5~D^q1h9&fVDZ7V(TA2hpO)AHT+)q6 zkPpue6%ocj8ZuP0h>{>4yXxb491h~p66312AHcZI8yUBDHXNcF(O6L28)gyem+)}m zp$aH^6-6umKDH@NxzK#T;ahAJSBXPDebj%C&HHFnN}PHVw-(M#Kl9&VL-4wdhf~ux zZ}}6<*>9kc8nLSZ%))=~z-)UBv&moL8c^(^v5c|nF%X4uZh4#6r+bg6Z&yy$K*8$b zF+MiB86sA*ujW$*iquPYSCdX#U%2v3y)tidW!IX(*q~#x(Z?dXhUFGX!E>T zRQ%X}Wojo311zs-77qxo?l8{7(HRan6ZzPUTZqp#NeW5a?5d-JFS~Kujn~WZnj7P> zQBJX#_%}-;^0^}u#NSrY$3w!gAx*~=G}{##l;E2cnkOaAPK9Pi@?A32pxu*DpCBht z)k&B3I`;Rd^c^(nx|*qD6mp$OJUq)SSFia5P3l~q*`Gi>$kPF5)$b}UuZ010;*jhtNMyv-i7kIU-w=@4R9K z6600Echzedx_l1I*T2G2E=m6YTyCSv3WUw&`U7|^5;f)P74MND`oj8f4nBXu071vl zM={|NGOBG)&H*E?Y@b6-Q?j!P1mX46P%?)|Kqpl3KpwmTRO!y#ky7E6Ck| zCA=??;(A8{Wylbr&@Z4A!PFAn`9x|)Od+-sOE)5h30CbvuJoR$l?)jT0!giIItHE{Yt50RAMV(^x>kyySl^&Aei4yt5L!V!f_#G~gQ5JnV!}l|G zpidv4MZ@)Zg?IlU=KXK8QSAOcdp~0H37emyxwXb9_@e~aGmbu{B@{nfrVAfvIkc?b hTWXv8jdu^)W~;%^J+rmHYj#b|?7oLFR=3vL=D%k6;g + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/run.py b/run.py new file mode 100755 index 0000000..9162559 --- /dev/null +++ b/run.py @@ -0,0 +1,19 @@ +#/bin/python +import wx +from app import app +from os import urandom +from app import gui +import thread + +if __name__ == '__main__': + #start gui + wx = wx.App() + gui.MainWindow(None) + + thread.start_new_thread(wx.MainLoop,()) + + # start flask + app.secret_key = urandom(24) + app.run(debug=True) + +#app.run() diff --git a/test/database.db b/test/database.db new file mode 100644 index 0000000000000000000000000000000000000000..c4318304e4290d080440d521c36146a996ddbb46 GIT binary patch literal 4096 zcmeHK&2G~`5MJ-5O>8K%MI{Om(n3|0AX5C7KTC)>iJ?&)yV!}^o{(GICL&FWlOo_& z#3OLxCAjedNF2B#Bpv`bbK<~>wPPoQD1iePAY*xVJm0t9&dkcPY~E2DT^sMWokOdO z1rP!h1@agJ021U5kvlM&I6pp90We`sfaK>>bA*5>3&7Vf;m()6uGM4s$5VN97L}$*tc>Cm$j;LTQTsaQLf0w4&G39uJ!RvLoaDY zpQGtjtkqO?K=36eQHXF+!6XkAmy}y_O|4>fjU7l-%M}HeNS3a{Bu?g_SJBC#SCN}R ztyndK84XnwM1Q{`O(wflm2FbUNHP6PH~Juxcq&ohXf#SaGrfFjrec`h0EaU1LVqX? z*)+Fwqcko}Ro8A$DnqHrWz}0eXtHsuT)In6+pT;MEt>^ZE^gq0uB(cy4bEqXA{)9k znPRT%TcZ??Nx1Lk415pJ8}tm_Knuj3+Oz|IcL$^y2E> z#p`yX^~8(k>%?7q!amC8g6nFC0p}KC%a_R7BfHh;kO6yRzR_80wp$16qjau!DTo1= zmW0Gggr@6_);+tmd+Z#zTWwm$P5iLk!t4F8OUU;aYqmo~`j&?bh%P0syXhX;UEA># zTnC$b^`^a7C$0zNJN~n$z~-`E=#!zE33YOWBCe>g$s74+^e zQ|U}L=Y5;e2Y|k!k7SzKv;)%)`~w|ePzc26ign+5XwAbASPH9+!}iV3`<_K85}^wX z+i~CjMT&g?KcTniC3=n?qZ;DS9Q*>`!B_AFJcip)faj@igfz9kqXWx}v*b4}EIG+uug%svQNz6!WW_fO`LXVV|Qo@DPz5E6#^e|2mv++~Dx}Q9kPCxDkD1f)sdh6@`~za0Jz&g`!_u^CbxO$)sS4{Z?(jfc>92#$xSQHYmPIf)g& E1C6bFYybcN literal 0 HcmV?d00001