{% for user in top_manual_users %}
+ onclick="window.location.href = '../coffee.html?tag={{ user.tag.hex() }}&manually&can-oneswipe'">
{{- user.name }} {{ user.prename -}}
{% for user in userlist %}
+ onclick="window.location.href = '../coffee.html?tag={{ user.tag.hex() }}&manually&can-oneswipe'">
{{- user.name }} {{ user.prename -}}
{% endfor %}
diff --git a/coffeebuddy/ui/base/templates/welcome.html b/coffeebuddy/ui/base/templates/welcome.html
index ef3b35b..7dafdd5 100644
--- a/coffeebuddy/ui/base/templates/welcome.html
+++ b/coffeebuddy/ui/base/templates/welcome.html
@@ -5,7 +5,7 @@
$(() => {
var socket = io.connect(window.location.host);
socket.on('card_connected', (msg) => {
- window.location.href = `../coffee.html?tag=${msg['tag']}`;
+ window.location.href = `../coffee.html?tag=${msg['tag']}&can-oneswipe`;
});
});
diff --git a/coffeebuddy/ui/coffee/__init__.py b/coffeebuddy/ui/coffee/__init__.py
index 73236be..abdcf35 100644
--- a/coffeebuddy/ui/coffee/__init__.py
+++ b/coffeebuddy/ui/coffee/__init__.py
@@ -47,15 +47,22 @@ def post():
if request.method == "POST":
return post()
+ has_coffeemaker = flask.current_app.config.get("COFFEEMAKER", None) is not None
+
+ if (
+ not has_coffeemaker
+ and "can-oneswipe" in flask.request.args
+ and user.option_oneswipe
+ ):
+ return flask.redirect(url("oneswipe.html", **flask.request.args))
+
variants_favorites, variants = CoffeeVariant.all_for_user(user)
return flask.render_template(
"coffee.html",
user=user,
variants_favorites=variants_favorites,
variants=variants,
- coffeemaker=flask.current_app.config.get("COFFEEMAKER", False)
- or flask.current_app.config.get("COFFEEMAKER_MOCK_BREW_TIME", False)
- is not False,
+ coffeemaker=has_coffeemaker,
price=flask.current_app.config["PRICE"],
)
@@ -160,12 +167,28 @@ def post():
)
-@blueprint.route("/oneswipe.html", methods=["POST"])
+@blueprint.route("/oneswipe.html", methods=["GET", "POST"])
@require_tag
def oneswipe(user: User):
db = flask.current_app.db
+ selected_manually = "manually" in flask.request.args
+
if "coffee" in flask.request.form:
- db.session.add(Drink(user=user, price=flask.current_app.config["PRICE"]))
+ db.session.add(
+ Drink(
+ user=user,
+ price=flask.current_app.config["PRICE"],
+ selected_manually=selected_manually,
+ )
+ )
db.session.commit()
- return ""
+ elif "undo" in flask.request.form:
+ return flask.redirect(
+ url(
+ "coffee.html",
+ tag=user.tag,
+ **{"manually" if selected_manually else None: None},
+ )
+ )
+ return flask.render_template("oneswipe.html", user=user)
diff --git a/coffeebuddy/ui/coffee/templates/oneswipe.html b/coffeebuddy/ui/coffee/templates/oneswipe.html
index dea53fe..2126745 100644
--- a/coffeebuddy/ui/coffee/templates/oneswipe.html
+++ b/coffeebuddy/ui/coffee/templates/oneswipe.html
@@ -1,26 +1,33 @@
-
-
+{% extends "_base.html" %}
-
-
-
-
-
-
-
+{% block header %}
+
-
-
+{% block main_nav_items %}
+{% endblock main_nav_items %}
-
-
-
{{ user.prename }} {{ user.name }}
-
{{ hexstr(user.tag) }}
-
Your bill:
-
{{ "%.2f €" | format(user.unpayed) }}
-
-
-
-
-
+{% block main_content %}
+
-
-
-
+{% endblock main_content %}
diff --git a/coffeebuddy/ui/user/__init__.py b/coffeebuddy/ui/user/__init__.py
index 7f161c5..49fd027 100644
--- a/coffeebuddy/ui/user/__init__.py
+++ b/coffeebuddy/ui/user/__init__.py
@@ -33,13 +33,13 @@ def post():
try:
user.tag = escapefromhex(request.form["tag"])
user.tag2 = escapefromhex(request.form["tag2"])
- user.name = request.form["last_name"]
- user.prename = request.form["first_name"]
+ user.name = request.form["name"]
+ user.prename = request.form["prename"]
user.email = request.form["email"]
- user.option_oneswipe = "oneswipe" in request.form
+ user.option_oneswipe = request.form["option_oneswipe"] == "true"
if flask_login.current_user.is_authenticated:
- user.enabled = "enabled" in request.form
+ user.enabled = request.form["enabled"] == "true"
balance = float(request.form["balance"])
if not math.isclose(balance, user.balance):
user.update_balance(balance)
diff --git a/coffeebuddy/ui/user/templates/edituser.html b/coffeebuddy/ui/user/templates/edituser.html
index b715dca..097c721 100644
--- a/coffeebuddy/ui/user/templates/edituser.html
+++ b/coffeebuddy/ui/user/templates/edituser.html
@@ -82,10 +82,21 @@
function submit_edituser() {
const form = $('#edituser-form');
- user = {};
+ /* beautify ignore:start */
+ user = {
+ {% for key in user.serialize() -%}
+ {{ key }}: undefined,
+ {%- endfor %}
+ };
+ /* beautify ignore:end */
form.find('input').map(function() {
user[$(this).attr('name')] = $(this).val();
});
+ for (const key in user) {
+ const item = form.find(`input[name='${key}']`);
+ user[key] = item.attr('type') == 'checkbox' ? item[0].checked : item.val();
+ }
+ console.log(user);
$.post(window.location.href, user, (data) => {
console.log(data);
@@ -150,105 +161,115 @@
{{ "Edit User" if user.id else "Add User" }}
class="btn btn-secondary"
onclick="updatetag(1)"
value="Update Tag">
-
-