- Coffee - list.iid.ciirc.cvut.cz

[PATCH] Remove last coffe pack opened button
by Jiri Vlasak 22 Mar '19

22 Mar '19

As it has showed to be annoying and misused. --- Bude třeba více systematické řešení. templates/hello.html | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/hello.html b/templates/hello.html index f6247da..0e709ce 100644 --- a/templates/hello.html +++ b/templates/hello.html @@ -1,6 +1,5 @@ <center> <div id="user"></div> -<p id="pLastCovfefe"><input type="button" value="The last coffee pack opened!" onclick="tellCoffeebot('Yay, <@U539N17JL|Tonda>, buy me a new covfefe pack! Thanks!')" /></p> <p>Hack me: <tt>https://rtime.felk.cvut.cz/gitweb/coffee/main.git</tt></p> <p>Debug: <span id="log"></span></p> </center> -- 2.11.0

1 0

Coffee Terminal refreshing when error raised in `app.py`
by Jiri Vlasak 08 Mar '19

08 Mar '19

Testoval jsem ten refresh stránky v případě, že dojde k chybě. Myslím, že je třeba ošetřovat všechny možné chyby (přes `try...except`) a neměl by být problém. Testoval jsem změnou kódu v `app.py`: ``` diff --git a/app.py b/app.py index 4ef7ca3..4800953 100644 --- a/app.py +++ b/app.py @@ -23,6 +23,7 @@ app.secret_key = b'_5#y2L"F4Q8z\n\xec]/' @app.route('/') def hello(): + raise ValueError if "uid" in session: uid = session["uid"] return render_template('hello.html', name=db.get_name(uid)) ``` Traceback z `app.py`: ``` 127.0.0.1 - - [12/Feb/2019 15:34:31] "GET / HTTP/1.1" 500 - Traceback (most recent call last): File "/usr/lib/python3/dist-packages/flask/app.py", line 1997, in __call__ return self.wsgi_app(environ, start_response) File "/usr/lib/python3/dist-packages/flask/app.py", line 1985, in wsgi_app response = self.handle_exception(e) File "/usr/local/lib/python3.5/dist-packages/flask_cors/extension.py", line 161, in wrapped_function return cors_after_request(app.make_response(f(*args, **kwargs))) File "/usr/lib/python3/dist-packages/flask/app.py", line 1540, in handle_exception reraise(exc_type, exc_value, tb) File "/usr/lib/python3/dist-packages/flask/_compat.py", line 33, in reraise raise value File "/usr/lib/python3/dist-packages/flask/app.py", line 1982, in wsgi_app response = self.full_dispatch_request() File "/usr/lib/python3/dist-packages/flask/app.py", line 1614, in full_dispatch_request rv = self.handle_user_exception(e) File "/usr/local/lib/python3.5/dist-packages/flask_cors/extension.py", line 161, in wrapped_function return cors_after_request(app.make_response(f(*args, **kwargs))) File "/usr/lib/python3/dist-packages/flask/app.py", line 1517, in handle_user_exception reraise(exc_type, exc_value, tb) File "/usr/lib/python3/dist-packages/flask/_compat.py", line 33, in reraise raise value File "/usr/lib/python3/dist-packages/flask/app.py", line 1612, in full_dispatch_request rv = self.dispatch_request() File "/usr/lib/python3/dist-packages/flask/app.py", line 1598, in dispatch_request return self.view_functions[rule.endpoint](**req.view_args) File "/home/jiri/coffee/main/coffee-flask/app.py", line 26, in hello raise ValueError ValueError ``` A výpis z konzole prohlížeče: ``` Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at http://localhost:5000/. (Reason: CORS header ‘Access-Control-Allow-Origin’ missing). ``` Pěkný den, jiri

2 1

[PATCH coffee-flask] Add support for another beverages (namely club mate)
by Jaroslav Klapalek 07 Mar '19

07 Mar '19

This patch slightly changes structure of a `flavors` table. It adds another column called `ord`, which is used for ordering of coffee flavors / beverages on the graphs (to maintain the same color scheme). Scripts `app.py` and `coffee_db.py` are modified to work with this change. --- Drobná úprava skriptu, abychom zde mohli zaznamenávat i jiné nápoje -- v tomto případě jde o club mate. Tím pádem nebudeme potřebovat žádné další zařízení na počítání. (Záznam lze provést tlačítkem na spodní části obrazovky po přihlášení). app.py | 4 ++-- coffee_db.py | 3 ++- coffee_db.sql | 12 +++++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app.py b/app.py index d66eff1..a172f5d 100644 --- a/app.py +++ b/app.py @@ -49,7 +49,7 @@ def user(): uid = session["uid"] return render_template('user.html', name=db.get_name(uid), - flavors=db.flavors(), + flavors=[_name for (_name, _ord) in db.flavors()], count=db.coffee_count(uid, 0), stamp=time.time() ) @@ -111,7 +111,7 @@ def coffee_graph_history(): fig = plt.figure(figsize=(4, 3)) ax = fig.add_subplot(111) - list_flavor = sorted(db.flavors()) + list_flavor = [_name for (_name, _ord) in sorted(db.flavors(), key=lambda x: x[1])] l = [{} for i in range(len(list_flavor))] for ll in l: for d in unix_days: diff --git a/coffee_db.py b/coffee_db.py index 7e28f92..8e65c43 100644 --- a/coffee_db.py +++ b/coffee_db.py @@ -56,7 +56,7 @@ def add_coffee(uid, flavor, time=None): def flavors(): conn, c = open_db() - res = [row for row, in c.execute("select distinct name from flavors")] + res = list(c.execute("select distinct name, ord from flavors")) close_db(conn) return res @@ -91,6 +91,7 @@ def coffee_flavors(uid=None, days=0, start=0): left join (select * from coffees """+query+""") c on f.name=c.flavor group by f.name + order by f.ord asc """, variables)) close_db(conn) diff --git a/coffee_db.sql b/coffee_db.sql index d9f7d8e..77a2f52 100644 --- a/coffee_db.sql +++ b/coffee_db.sql @@ -6,14 +6,16 @@ create table if not exists users ( ); create table if not exists flavors ( - name varchar(255) primary key not null + name varchar(255) primary key not null, + ord integer not null default 999 ); insert or ignore into flavors values - ("espresso"), - ("espresso lungo"), - ("cappuccino"), - ("latte macchiato") + ("espresso", 2), + ("espresso lungo", 3), + ("cappuccino", 1), + ("latte macchiato", 4), + ("club mate", 5) ; create table if not exists coffees ( -- 2.7.4

4 5

[PATCH coffee-flask] Fix duplicate recording of coffees
by Jaroslav Klapalek 27 Feb '19

27 Feb '19

In case that coffee machine loses connection during recording of a coffee, this coffee is added once again as a part of offlineQueue. This patch resolves this issue by checking the database for the same records before adding the new one. --- Vyřešení bugu z 18/02/2019. coffee_db.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/coffee_db.py b/coffee_db.py index 7e28f92..d21b36c 100644 --- a/coffee_db.py +++ b/coffee_db.py @@ -51,7 +51,11 @@ def add_coffee(uid, flavor, time=None): if time is None: c.execute("insert into coffees (id, flavor) values (?,?)", (uid,flavor)) else: - c.execute("insert into coffees (id, flavor, time) values (?,?,?)", (uid, flavor, time)) + res = list(c.execute("select * from coffees where id = ? and flavor = ? and time = ?", (uid, flavor, time))) + + if len(res) < 1: + c.execute("insert into coffees (id, flavor, time) values (?,?,?)", (uid, flavor, time)) + close_db(conn) def flavors(): -- 2.7.4

4 6

[PATCH v5] Add last coffee pack button
by Jiri Vlasak 14 Feb '19

14 Feb '19

When clicked, the message notifying Tonda about the lack of coffee is sent to the Slack. There must be `.config` file in `coffee-flask` folder. The `.config` file is JSON formated. For this patch the following is needed: ``` { "coffeebot": { "url": "https://hooks.slack.com/services/..." } } ``` --- Ještě chyběl ten gitignore, teď už by to mělo být opravdu všechno. jiri .gitignore | 1 + app.py | 26 ++++++++++++++++++++++++++ templates/hello.html | 1 + templates/main.js | 5 +++++ 4 files changed, 33 insertions(+) diff --git a/.gitignore b/.gitignore index 7b25ae2..80ba91d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ __pycache__ coffee.db +.config diff --git a/app.py b/app.py index d66eff1..4ef7ca3 100644 --- a/app.py +++ b/app.py @@ -12,6 +12,9 @@ import coffee_db as db import time from datetime import date, timedelta +from json import loads +from requests import post + db.init_db() app = Flask(__name__) CORS(app, supports_credentials=True) @@ -186,3 +189,26 @@ def log(): print("Log:", data) return data return "nope" + +(a)app.route("/tellCoffeebot", methods=["POST"]) +def tell_coffeebot(): + """Send message to Slack notifying Tonda about the lack of coffee. + + Returned string is shown as log message in ``Debug:`` paragraph. + """ + err = "Don't worry now! There is a NEW HOPE Tonda is buying NEW PACK!" + if request.method == "POST": + what = loads(request.data.decode("utf-8")) + try: + with open(".config", "r") as f: + conf = loads(f.read()) + except: + return "Config needed! Please find in git history how it should look." + try: + res = post(conf["coffeebot"]["url"], json=what) + print("res is {}".format(res)) + except: + err = "No connection! No covfefe! We all die here!" + if not res.ok: + err = "Slack don't like the request! It's discrimination!" + return err diff --git a/templates/hello.html b/templates/hello.html index 0e709ce..f6247da 100644 --- a/templates/hello.html +++ b/templates/hello.html @@ -1,5 +1,6 @@ <center> <div id="user"></div> +<p id="pLastCovfefe"><input type="button" value="The last coffee pack opened!" onclick="tellCoffeebot('Yay, <@U539N17JL|Tonda>, buy me a new covfefe pack! Thanks!')" /></p> <p>Hack me: <tt>https://rtime.felk.cvut.cz/gitweb/coffee/main.git</tt></p> <p>Debug: <span id="log"></span></p> </center> diff --git a/templates/main.js b/templates/main.js index 8135983..b28b826 100644 --- a/templates/main.js +++ b/templates/main.js @@ -205,3 +205,8 @@ function addCoffee(flavor, time = new Date()) { function sendLog(json) { ajax("POST", "log", json, "log"); } + +function tellCoffeebot(what) +{ + ajax("POST", "tellCoffeebot", JSON.stringify({text: what}), "log"); +} -- 2.11.0

1 0

[PATCH v2] Add last coffee pack button
by Jiri Vlasak 13 Feb '19

13 Feb '19

When clicked, the message notifying Tonda about the lack of coffee is sent to the Slack. --- app.py | 19 +++++++++++++++++++ templates/hello.html | 1 + templates/main.js | 5 +++++ 3 files changed, 25 insertions(+) diff --git a/app.py b/app.py index d66eff1..1d54d70 100644 --- a/app.py +++ b/app.py @@ -12,6 +12,9 @@ import coffee_db as db import time from datetime import date, timedelta +from json import loads +from requests import post + db.init_db() app = Flask(__name__) CORS(app, supports_credentials=True) @@ -186,3 +189,19 @@ def log(): print("Log:", data) return data return "nope" + +(a)app.route("/tellCoffeebot", methods=["POST"]) +def tell_coffeebot(): + err = "Don't worry now! There is a NEW HOPE Tonda is buying NEW PACK!" + if request.method == "POST": + what = loads(request.data.decode("utf-8")) + with open(".config", "r") as f: + conf = loads(f.read()) + try: + res = post(conf["coffeebot"]["url"], json=what) + print("res is {}".format(res)) + except: + err = "No connection! No covfefe! We all die here!" + if not res.ok: + err = "Slack don't like the request! It's discrimination!" + return err diff --git a/templates/hello.html b/templates/hello.html index 0e709ce..f6247da 100644 --- a/templates/hello.html +++ b/templates/hello.html @@ -1,5 +1,6 @@ <center> <div id="user"></div> +<p id="pLastCovfefe"><input type="button" value="The last coffee pack opened!" onclick="tellCoffeebot('Yay, <@U539N17JL|Tonda>, buy me a new covfefe pack! Thanks!')" /></p> <p>Hack me: <tt>https://rtime.felk.cvut.cz/gitweb/coffee/main.git</tt></p> <p>Debug: <span id="log"></span></p> </center> diff --git a/templates/main.js b/templates/main.js index 8135983..b28b826 100644 --- a/templates/main.js +++ b/templates/main.js @@ -205,3 +205,8 @@ function addCoffee(flavor, time = new Date()) { function sendLog(json) { ajax("POST", "log", json, "log"); } + +function tellCoffeebot(what) +{ + ajax("POST", "tellCoffeebot", JSON.stringify({text: what}), "log"); +} -- 2.11.0

2 2

[PATCH v4] Add last coffee pack button
by Jiri Vlasak 12 Feb '19

12 Feb '19

When clicked, the message notifying Tonda about the lack of coffee is sent to the Slack. There must be `.config` file in `coffee-flask` folder. The `.config` file is JSON formated. For this patch the following is needed: ``` { "coffeebot": { "url": "https://hooks.slack.com/services/..." } } ``` --- app.py | 26 ++++++++++++++++++++++++++ templates/hello.html | 1 + templates/main.js | 5 +++++ 3 files changed, 32 insertions(+) diff --git a/app.py b/app.py index d66eff1..4ef7ca3 100644 --- a/app.py +++ b/app.py @@ -12,6 +12,9 @@ import coffee_db as db import time from datetime import date, timedelta +from json import loads +from requests import post + db.init_db() app = Flask(__name__) CORS(app, supports_credentials=True) @@ -186,3 +189,26 @@ def log(): print("Log:", data) return data return "nope" + +(a)app.route("/tellCoffeebot", methods=["POST"]) +def tell_coffeebot(): + """Send message to Slack notifying Tonda about the lack of coffee. + + Returned string is shown as log message in ``Debug:`` paragraph. + """ + err = "Don't worry now! There is a NEW HOPE Tonda is buying NEW PACK!" + if request.method == "POST": + what = loads(request.data.decode("utf-8")) + try: + with open(".config", "r") as f: + conf = loads(f.read()) + except: + return "Config needed! Please find in git history how it should look." + try: + res = post(conf["coffeebot"]["url"], json=what) + print("res is {}".format(res)) + except: + err = "No connection! No covfefe! We all die here!" + if not res.ok: + err = "Slack don't like the request! It's discrimination!" + return err diff --git a/templates/hello.html b/templates/hello.html index 0e709ce..f6247da 100644 --- a/templates/hello.html +++ b/templates/hello.html @@ -1,5 +1,6 @@ <center> <div id="user"></div> +<p id="pLastCovfefe"><input type="button" value="The last coffee pack opened!" onclick="tellCoffeebot('Yay, <@U539N17JL|Tonda>, buy me a new covfefe pack! Thanks!')" /></p> <p>Hack me: <tt>https://rtime.felk.cvut.cz/gitweb/coffee/main.git</tt></p> <p>Debug: <span id="log"></span></p> </center> diff --git a/templates/main.js b/templates/main.js index 8135983..b28b826 100644 --- a/templates/main.js +++ b/templates/main.js @@ -205,3 +205,8 @@ function addCoffee(flavor, time = new Date()) { function sendLog(json) { ajax("POST", "log", json, "log"); } + +function tellCoffeebot(what) +{ + ajax("POST", "tellCoffeebot", JSON.stringify({text: what}), "log"); +} -- 2.11.0

1 0

[PATCH v3] Add last coffee pack button
by Jiri Vlasak 12 Feb '19

12 Feb '19

When clicked, the message notifying Tonda about the lack of coffee is sent to the Slack. There must be `.config` file in `coffee-flask` folder. The `.config` file is JSON formated. For this patch the following is needed: ``` { "coffeebot": { "url": "https://hooks.slack.com/services/..." } } ``` --- app.py | 22 ++++++++++++++++++++++ templates/hello.html | 1 + templates/main.js | 5 +++++ 3 files changed, 28 insertions(+) diff --git a/app.py b/app.py index d66eff1..389aa28 100644 --- a/app.py +++ b/app.py @@ -12,6 +12,9 @@ import coffee_db as db import time from datetime import date, timedelta +from json import loads +from requests import post + db.init_db() app = Flask(__name__) CORS(app, supports_credentials=True) @@ -186,3 +189,22 @@ def log(): print("Log:", data) return data return "nope" + +(a)app.route("/tellCoffeebot", methods=["POST"]) +def tell_coffeebot(): + err = "Don't worry now! There is a NEW HOPE Tonda is buying NEW PACK!" + if request.method == "POST": + what = loads(request.data.decode("utf-8")) + try: + with open(".config", "r") as f: + conf = loads(f.read()) + except: + return "Config needed! Please find in git history how it should look." + try: + res = post(conf["coffeebot"]["url"], json=what) + print("res is {}".format(res)) + except: + err = "No connection! No covfefe! We all die here!" + if not res.ok: + err = "Slack don't like the request! It's discrimination!" + return err diff --git a/templates/hello.html b/templates/hello.html index 0e709ce..f6247da 100644 --- a/templates/hello.html +++ b/templates/hello.html @@ -1,5 +1,6 @@ <center> <div id="user"></div> +<p id="pLastCovfefe"><input type="button" value="The last coffee pack opened!" onclick="tellCoffeebot('Yay, <@U539N17JL|Tonda>, buy me a new covfefe pack! Thanks!')" /></p> <p>Hack me: <tt>https://rtime.felk.cvut.cz/gitweb/coffee/main.git</tt></p> <p>Debug: <span id="log"></span></p> </center> diff --git a/templates/main.js b/templates/main.js index 8135983..b28b826 100644 --- a/templates/main.js +++ b/templates/main.js @@ -205,3 +205,8 @@ function addCoffee(flavor, time = new Date()) { function sendLog(json) { ajax("POST", "log", json, "log"); } + +function tellCoffeebot(what) +{ + ajax("POST", "tellCoffeebot", JSON.stringify({text: what}), "log"); +} -- 2.11.0

1 0

kalendar
by Jiri Vlasak 06 Feb '19

06 Feb '19

Ahoj, chtěl bych ještě prodiskutovat kalendář. Už proběhlo dost patchů a dost práce na tom, ale stejně mi to nedá. Co se mi nezdá je, jestli se vyplatí do repozitáře přidávat submoduly/další knihovny jen pro vypsání informací o posledním čištění stroje? Poslední patch, co jsem dohledal na tohle téma [1] přidává 5 submodulů a spousta souborů/řádků kódu. Tak jestli to není overkill :/ Navrhnul bych začít jen tlačítkama + logování do databáze + výpis posledního čištění, třeba. jiri [1] http://rtime.felk.cvut.cz/pipermail/coffee/2018q3/000015.html

1 0

[PATCH] Add last coffee pack button
by Jiri Vlasak 06 Feb '19

06 Feb '19

When clicked, the message notifying Tonda about the lack of coffee is sent to the Slack. --- templates/hello.html | 1 + templates/main.js | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/templates/hello.html b/templates/hello.html index 0e709ce..e8f985d 100644 --- a/templates/hello.html +++ b/templates/hello.html @@ -1,5 +1,6 @@ <center> <div id="user"></div> +<p id="pLastCovfefe"><input type="button" value="The last covfefe pack opened!" onclick="tellCoffeebot('Yay, <@U539N17JL|Tonda>, buy me a new covfefe pack! Thanks!')" /></p> <p>Hack me: <tt>https://rtime.felk.cvut.cz/gitweb/coffee/main.git</tt></p> <p>Debug: <span id="log"></span></p> </center> diff --git a/templates/main.js b/templates/main.js index 8135983..3d42820 100644 --- a/templates/main.js +++ b/templates/main.js @@ -205,3 +205,21 @@ function addCoffee(flavor, time = new Date()) { function sendLog(json) { ajax("POST", "log", json, "log"); } + +function tellCoffeebot(what) +{ + var xhr = new XMLHttpRequest(); + xhr.onreadystatechange = function() { + if (this.readyState == 4) { + if (this.status == 200) { + document.getElementById("pLastCovfefe").innerHTML = "Don't worry now! There is a NEW HOPE Tonda is buying NEW PACK!"; + } else { + document.getElementById("pLastCovfefe").innerHTML = "No connection! No covfefe! We all die here!"; + } + } + }; + xhr.open("POST", "https://hooks.slack.com/services/T53CK6RB3/BC7J3TE94/dDlbPHNVaPILB8LyLHRjAA…", true); + xhr.setRequestHeader("Content-type", "application/json"); + xhr.send(JSON.stringify({text: what})); + console.log(JSON.stringify({text: what})); +} -- 2.11.0

2 1