diff --git a/src/Run.py b/src/Run.py index 7079b49..b6285d0 100644 --- a/src/Run.py +++ b/src/Run.py @@ -128,6 +128,8 @@ def add_nutrition(): conn.commit() return redirect(url_for('nutrition')) + except Exception as e: + return jsonify({"error": str(e)}), 500 finally: if conn: conn.close() @@ -146,13 +148,14 @@ def get_token(): @app.route('/get_database_entries') +@oidc.require_login def get_database_entries(): try: # Ersetzen Sie diese Werte mit Ihren Datenbank-Verbindungsinformationen conn = psycopg2.connect() cursor = conn.cursor() with conn.cursor() as cursor: - cursor.execute("SELECT name, kcal, ew, fett, kh, bst, ca FROM nutrition_table") + cursor.execute("SELECT name, kcal, ew, fett, kh, bst, ca FROM nutrition_table ORDER BY name") entries = cursor.fetchall() # Umwandeln der Daten in ein JSON-freundliches Format diff --git a/src/db.py b/src/db.py index f218d62..f47ebb0 100644 --- a/src/db.py +++ b/src/db.py @@ -13,13 +13,16 @@ cursor = conn.cursor() # Erstellen der Tabelle (falls noch nicht vorhanden) cursor.execute(''' CREATE TABLE IF NOT EXISTS nutrition_table ( - name TEXT, + id serial not null, + name TEXT not null, kcal REAL, EW REAL, Fett REAL, KH REAL, BST REAL, - Ca REAL + Ca REAL, + constraint nutrition_table_pk primary key (id), + constraint nutrition_table_name_uk unique (name) ) ''') diff --git a/src/nu.csv b/src/nu.csv index 61dbd26..252af41 100644 --- a/src/nu.csv +++ b/src/nu.csv @@ -6,7 +6,6 @@ Hühnerei,137,11.9,9.3,1.5,0.0,51 Pflanzenmargarine,722,0.2,80.0,0.4,0.0,8 Sahne 30%,309,2.4,31.7,3.4,0.0,80 Maisstärke,353,0.4,0.1,85.9,1.0,0 -Paniermehl,368,10.1,2.1,73.5,5.3,50 Weizengrieß,335,9.6,0.8,69.0,7.1,17 Mehl405,343,9.8,1.0,71.8,4.0,15 Rapsöl,884,0,100.0,0,0,0 @@ -43,13 +42,11 @@ Knoblauch,145,6.1,0.1,28.4,1.8,38 Senf,88,6.0,4.0,6.0,1.0,124 Blattspinat roh,21,2.7,0.3,0.6,2.6,117 Buttermilch,37,3.5,0.5,4.0,0.0,109 -Himbeere,37,1.3,0.3,4.8,4.7,40 Salz dill gurken,9,0.4,0.1,1.3,0.5,18 Schmand 20%,205,2.8,20.0,3.6,0.0,100 Aspikpulver,338,84.2,0.1,0.0,0.0,11 Lachs atlantischer,210,20.4,13.4,0.3,0.0,4 Pinienkerne,589,24.0,50.7,7.3,7.2,26 -Zwieback,385,9.9,4.3,73.1,5.2,42 Speisequark,72,13.5,0.3,3.2,0.0,92 Basilikum,47,3.1,0.8,5.1,3.1,369 Mayonaise 50%,490,0.5,52.0,5.0,0.0,10 @@ -83,7 +80,6 @@ Naturreis,349,7.2,2.2,74.1,2.2,16 Mehl Type 405,343,9.8,1.0,71.8,4.0,15 Mehl Type 550,346,9.8,1.1,72.0,4.3,17 Milchreis,316,6.4,0.8,80.2,1.1,6 -Kartoffelstärke,341,0.6,0.1,83.1,0.1,35 Hmilch fettarm 1.5%,47,3.4,1.5,4.9,0.0,123 Edamer 30%,254,26.4,16.2,0,0.0,800 Gouda alt 48%,414,24.6,33.7,0.1,0.0,871 @@ -98,7 +94,6 @@ Butterkeks,441,8.2,11.0,74.7,3.3,47 Zwieback,385,9.9,4.3,73.1,5.2,42 Schokolade 75% Kakaomasse,598,7.8,42.6,35.0,10.9,73 Paniermehl,368,10.1,0.1,73.5,5.3,50 -Senf,88,6.0,4.0,6.0,1.0,124 Schinken geräuchert,152,20.7,7.7,0.0,0.0,2 Rinderkeule,148,20.0,7.6,0.0,0.0,6 Kirsche süß,62,0.9,0.3,13.3,1.3,17 @@ -107,7 +102,6 @@ Eisbergsalat,16,1.0,0.2,2.0,1.1,19 Endivie,18,1.8,0.2,1.2,1.9,54 Feldsalat,18,1.8,0.4,0.8,1.5,32 Gurke,14,0.6,0.2,1.8,0.9,15 -Kopfsalat,14,1.2,0.2,1.1,1.4,20 Schalotte,25,1.5,0.2,3.3,1.5,37 Gemüsebrühe verz,7,1.6,0,0,0,12 Fleischbrühe,4,0.2,0,1,0,5 @@ -122,8 +116,7 @@ Paprika rot,43,1.3,0.5,6.4,3.6,10 Knollensellerie,27,1.6,0.3,2.3,4.2,50 Erdbeeren tiefgefroren,38,0.9,0.4,5.8,2.1,24 Himbeeren tiefgefroren,45,1.4,0.3,5.0,4.8,42 -Dill,65,3.7,0.8,8.0,5.3,230 Kerbel,58,4.1,0.6,6.2,5.3,400 Majoran,52,2.1,1.1,6.9,2.9,322 Oregano,72,2.2,2.0,9.7,2.5,310 -Thymian,52,1.5,1.2,7.4,3.0,307 \ No newline at end of file +Thymian,52,1.5,1.2,7.4,3.0,307