diff --git a/src/Run.py b/src/Run.py index a22cd7f..3ef1905 100644 --- a/src/Run.py +++ b/src/Run.py @@ -66,7 +66,6 @@ def get_products(): with conn.cursor() as cursor: cursor.execute('SELECT name FROM nutrition_table') products = cursor.fetchall() - print("ter") return {'products': [product[0] for product in products]} finally: if conn: @@ -97,19 +96,24 @@ def add_lm(): return "Lebensmittel nicht gefunden.", 404 +def convert_decimal(value): + try: + return float(value.replace(',', '.')) + except (ValueError, TypeError): + return 0.0 # Rückgabe eines Standardwertes im Fehlerfall + @app.route('/add_nutrition', methods=['POST']) @oidc.accept_token(require_token=True, scopes_required=['openid']) def add_nutrition(): food = request.form.get('food') - kcal = float(request.form.get('kcal')) - ew = float(request.form.get('ew')) - fett = float(request.form.get('fett')) - kh = float(request.form.get('kh')) - bst = float(request.form.get('bst')) - ca = float(request.form.get('ca')) + kcal = convert_decimal(request.form.get('kcal')) + ew = convert_decimal(request.form.get('ew')) + fett = convert_decimal(request.form.get('fett')) + kh = convert_decimal(request.form.get('kh')) + bst = convert_decimal(request.form.get('bst')) + ca = convert_decimal(request.form.get('ca')) - print("test") # Verbindung zur Datenbank herstellen und Daten einfügen try: conn = psycopg2.connect() diff --git a/src/static/style.css b/src/static/style.css index a7d6ff7..9883c0e 100644 --- a/src/static/style.css +++ b/src/static/style.css @@ -34,7 +34,7 @@ button:not(:disabled):hover { } button#remove-button { - background-color: #f443366f; /* Helles Rot */ + background-color: #640000; /* Helles Rot */ } button#remove-button:disabled { @@ -43,7 +43,7 @@ button#remove-button:disabled { } button#remove-button:not(:disabled):hover { - background-color: #d32f2f3d; /* Dunkleres Rot */ + background-color: #490000; /* Dunkleres Rot */ } @@ -72,7 +72,7 @@ tr:nth-child(even) { } .selected, tr.selected { - background-color: #ffdd99; /* Hervorhebung der Auswahl */ + background-color: #e19595; /* Hervorhebung der Auswahl */ } tr:hover:not(.selected) { diff --git a/src/templates/index.html b/src/templates/index.html index 71f43f4..0697f0a 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -175,7 +175,7 @@ function updateTotalNutrition() {