Merge branch 'main' of gitea.hottis.de:moerp/elo-rezept-rechner

Dockerfile

@@ -7,7 +7,9 @@ COPY start.sh ${APP_DIR}/
 
 WORKDIR ${APP_DIR}
 
-RUN pip install -r requirements.txt
+RUN \
+  apk add --no-cache build-base libpq-dev && \
+  pip install -r requirements.txt
 
 EXPOSE 8080
 

src/Run.py

@@ -4,6 +4,7 @@ from flask_oidc import OpenIDConnect
 from werkzeug.middleware.proxy_fix import ProxyFix
 import os
 import json
+import psycopg2
 
 app = Flask(__name__)
 app.config.update({
@@ -19,61 +20,15 @@ app.config.update({
 oidc = OpenIDConnect(app)
 
 
-# Datenbankverbindung konfigurieren
-def get_db_connection():
-    conn = sqlite3.connect('nutrition.db')  # 'nutrition.db' ist der Name der Datenbankdatei
-    conn.row_factory = sqlite3.Row  # Ermöglicht den Zugriff auf Daten durch Spaltennamen
-    return conn
-
-
-#def init_db():
-#    conn = get_db_connection()
-#    cursor = conn.cursor()
-#
-#    # Erstellen der Tabelle
-#    cursor.execute('''
-#        CREATE TABLE IF NOT EXISTS nutrition_table (
-#            id INTEGER PRIMARY KEY,
-#            name TEXT NOT NULL,
-#            kcal REAL,
-#            EW REAL,
-#            Fett REAL,
-#            KH REAL,
-#            BST REAL,
-#            CA REAL
-#        )
-#    ''')
-#
-#    # Testdaten einfügen
-#    test_data = [
-#        ('Apfel', 52, 0.3, 0.2, 14, 0.2, 6),
-#        ('Banane', 89, 1.1, 0.3, 23, 0.3, 5),
-#        ('Karotte', 41, 0.9, 0.2, 10, 0.2, 3),
-#        ('Tomate', 18, 0.9, 0.2, 3.9, 0.2, 4),
-#        ('Brokkoli', 34, 2.8, 0.4, 6.6, 0.4, 2),
-#        ('Spinat', 23, 2.9, 0.4, 3.6, 0.4, 99),
-#        ('Kartoffel', 77, 2, 0.1, 17, 0.1, 12),
-#        ('Huhn', 239, 27, 14, 0, 0, 2),
-#        ('Lachs', 208, 20, 13, 0, 0, 1),
-#        ('Ei', 155, 13, 11, 1.1, 1, 1)
-#    ]
-#
-#    cursor.executemany('INSERT INTO nutrition_table (name, kcal, EW, Fett, KH, BST, CA) VALUES (?, ?, ?, ?, ?, ?, ?)', test_data)
-#
-#    conn.commit()
-#    conn.close()
-
-
-
 def calculate_nutrition(food, weight):
-    conn = get_db_connection()
+    try:
-    cursor = conn.cursor()
+        conn = psycopg2.connect()
 
+        with conn.cursor() as cursor:
             # Abfrage der Nährwertdaten aus der Datenbank
-    cursor.execute('SELECT kcal, EW, Fett, KH, BST, CA FROM nutrition_table WHERE name = ?', (food,))
+            cursor.execute('SELECT kcal, EW, Fett, KH, BST, CA FROM nutrition_table WHERE name = %s', (food,))
 
             result = cursor.fetchone()
-    conn.close()
 
             if result:
                 # Runden und Berechnen der Nährwerte basierend auf dem Gewicht
@@ -89,12 +44,15 @@ def calculate_nutrition(food, weight):
                 return nutrition_values
             else:
                 return None
+    finally:
+        if conn:
+            conn.close()
+
 
 
 # Index-Route
 @app.route('/')
 @oidc.require_login
-@oidc.require_keycloak_role('user')
 def index():
     return render_template('index.html')
 
@@ -102,24 +60,21 @@ def index():
 
 @app.route('/get_products')
 @oidc.require_login
-@oidc.require_keycloak_role('user')
 def get_products():
-    conn = get_db_connection()
+    try:
-    cursor = conn.cursor()
+        conn = psycopg2.connect()
+        with conn.cursor() as cursor:
             cursor.execute('SELECT name FROM nutrition_table')
             products = cursor.fetchall()
-    conn.close()
-    print("ter")
             return {'products': [product[0] for product in products]}
-
+    finally:
-
+        if conn:
-
+            conn.close()
 
 
 # Route zum Hinzufügen und Berechnen von Lebensmitteln
 @app.route('/add_lm', methods=['GET'])
 @oidc.require_login
-@oidc.require_keycloak_role('user')
 def add_lm():
     food = request.args.get('food')
     weight = float(request.args.get('weight'))
@@ -141,33 +96,40 @@ 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'])
+@oidc.accept_token()
 def add_nutrition():
     food = request.form.get('food')
-    kcal = float(request.form.get('kcal'))
+    kcal = convert_decimal(request.form.get('kcal'))
-    ew = float(request.form.get('ew'))
+    ew = convert_decimal(request.form.get('ew'))
-    fett = float(request.form.get('fett'))
+    fett = convert_decimal(request.form.get('fett'))
-    kh = float(request.form.get('kh'))
+    kh = convert_decimal(request.form.get('kh'))
-    bst = float(request.form.get('bst'))
+    bst = convert_decimal(request.form.get('bst'))
-    ca = float(request.form.get('ca'))
+    ca = convert_decimal(request.form.get('ca'))
 
-    print("test")
     # Verbindung zur Datenbank herstellen und Daten einfügen
-    conn = get_db_connection()
+    try:
-    cursor = conn.cursor()
+        conn = psycopg2.connect()
-    cursor.execute("INSERT INTO nutrition_table (name, kcal, ew, fett, kh, bst, ca) VALUES (?, ?, ?, ?, ?, ?, ?)",
+        with conn.cursor() as cursor:
+            cursor.execute("INSERT INTO nutrition_table (name, kcal, ew, fett, kh, bst, ca) VALUES (%s, %s, %s, %s, %s, %s, %s)",
                         (food, kcal, ew, fett, kh, bst, ca))
-    conn.commit()
+
-    conn.close()
     
         return redirect(url_for('nutrition'))
+    finally:
+        if conn:
+            conn.close()
 
 
 @app.route('/nutrition')
 @oidc.require_login
-@oidc.require_keycloak_role('user')
 def nutrition():
     return render_template('nutrition.html')
 

src/db.py

@@ -1,14 +1,13 @@
 import csv
-import sqlite3
+import psycopg2
 
 # Pfad zur Ihrer CSV-Datei
 csv_file_path = 'nu.csv'
 
 # Pfad zur Ihrer SQLite-Datenbank
-sqlite_db_path = 'nutrition.db'
 
 # Verbindung zur SQLite-Datenbank herstellen
-conn = sqlite3.connect(sqlite_db_path)
+conn = psycopg2.connect()
 cursor = conn.cursor()
 
 # Erstellen der Tabelle (falls noch nicht vorhanden)
@@ -29,8 +28,9 @@ with open(csv_file_path, newline='', encoding='utf-8') as csvfile:
     reader = csv.reader(csvfile)
     next(reader, None)  # Überspringen der Kopfzeile
     for row in reader:
-        cursor.execute('INSERT INTO nutrition_table (name, kcal, EW, Fett, KH, BST, Ca) VALUES (?, ?, ?, ?, ?, ?, ?)', row)
+        cursor.execute('INSERT INTO nutrition_table (name, kcal, EW, Fett, KH, BST, Ca) VALUES (%s, %s, %s, %s, %s, %s, %s)', row)
 
 # Änderungen speichern und Verbindung schließen
 conn.commit()
 conn.close()
+

src/requirements.txt

@@ -13,6 +13,8 @@ itsdangerous==2.1.2
 Jinja2==3.1.3
 MarkupSafe==2.1.4
 packaging==23.2
+psycopg==3.1.17
+psycopg2==2.9.9
 pycparser==2.21
 requests==2.31.0
 typing_extensions==4.9.0

src/static/style.css

@@ -34,13 +34,20 @@ button:not(:disabled):hover {
 }
 
 button#remove-button {
-    background-color: #f443366f; /* Helles Rot */
+    background-color: #640000; /* Helles Rot */
+}
+
+button#remove-button:disabled {
+    background-color: #cccccc;
+    color: #666666;
 }
 
 button#remove-button:not(:disabled):hover {
-    background-color: #d32f2f3d; /* Dunkleres Rot */
+    background-color: #490000; /* Dunkleres Rot */
 }
 
+
+
 table {
     width: 100%;
     border-collapse: collapse;
@@ -65,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) {
@@ -121,3 +128,27 @@ tr:hover:not(.selected) {
     padding: 20px;
     margin: 20px 0;
 }
+
+
+#nutrition-input-table {
+    width: 100%; /* Tabelle nimmt die volle Breite ein */
+    border-collapse: collapse; /* Entfernt doppelte Ränder */
+}
+
+#nutrition-input-table th, #nutrition-input-table td {
+    border: 1px solid #ddd; /* Fügt Ränder hinzu */
+    padding: 8px; /* Fügt Innenabstand hinzu */
+    text-align: left; /* Ausrichtung des Textes */
+}
+
+#nutrition-input-table input {
+    width: 100%; /* Eingabefelder nehmen die volle Breite der Zelle ein */
+    box-sizing: border-box; /* Box-Modell für die Breitenberechnung */
+}
+
+@media screen and (max-width: 600px) {
+    #nutrition-input-table {
+        display: block;
+        overflow-x: auto; /* Ermöglicht horizontales Scrollen auf kleinen Bildschirmen */
+    }
+}

src/templates/index.html

@@ -4,10 +4,9 @@
     <meta charset="UTF-8">
     <title>Nährwertberechnungs-App</title>
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='style.css') }}">
+    <link rel="shortcut icon" href="../static/images/favicon.ico">
 
     <script>
-
-        // JavaScript-Funktion, um die Produkte beim Laden der Seite zu holen
         document.addEventListener('DOMContentLoaded', function() {
             cleanUpLocalStorage();
             restoreTableFromLocalStorage();
@@ -176,7 +175,7 @@ function updateTotalNutrition() {
 </head>
 <body>
     <nav id="navbar">
-        <h1>Elos Rezept Rechner</h1>
+        <h1>Elo's Rezept Rechner</h1>
         <ul>
             <li><a href="/" class="active">Rechner</a></li>
             <li><a href="/nutrition">Neue Lebensmittel</a></li>
@@ -211,6 +210,8 @@ function updateTotalNutrition() {
         <button id="remove-button" onclick="removeSelectedRow()" disabled>Entfernen</button>
         <table id="total-nutrition-table">
             <tr>
+                <th>Lebensmittel</th>
+                <th>Gewicht (g)</th>
                 <th>kcal</th>
                 <th>EW</th>
                 <th>Fett</th>
@@ -219,6 +220,8 @@ function updateTotalNutrition() {
                 <th>CA</th>
             </tr>
             <tr>
+                <t>Gesamtwerte</td>
+                <td></td>-</td>
                 <td id="total-kcal">0</td>
                 <td id="total-ew">0</td>
                 <td id="total-fett">0</td>

src/templates/nutrition.html

@@ -4,6 +4,8 @@
     <meta charset="UTF-8">
     <title>Neue Lebensmittel hinzufügen</title>
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='style.css') }}">
+    <link rel="shortcut icon" href="../static/images/favicon.ico">
+    
     <script>
         function updateSubmitButtonState() {
             const inputs = document.querySelectorAll('#nutrition-form input');
@@ -42,7 +44,7 @@
 </head>
 <body>
     <nav id="navbar">
-        <h1>Elos Rezept Rechner</h1>
+        <h1>Elo's Rezept Rechner</h1>
         <ul>
             <li><a href="/">Rechner</a></li>
             <li><a href="/nutrition" class="active">Neue Lebensmittel</a></li>
@@ -62,13 +64,13 @@
                     <th>CA</th>
                 </tr>
                 <tr>
-                    <td><input type="text" name="food" oninput="updateSubmitButtonState()"></td>
+                    <td><input type="text" name="food" placeholder="Lebensmittel" oninput="updateSubmitButtonState()"></td>
-                    <td><input <input type="text" name="kcal" pattern="\d+(\.\d{1,2})?" oninput="updateSubmitButtonState()"></td>
+                    <td><input <input type="text" name="kcal" pattern="\d+([.,]\d{1,2})?" placeholder="g" oninput="updateSubmitButtonState()"></td>
-                    <td><input <input type="text" name="ew" pattern="\d+(\.\d{1,2})?" oninput="updateSubmitButtonState()"></td>
+                    <td><input <input type="text" name="ew" pattern="\d+([.,]\d{1,2})?" placeholder="g" oninput="updateSubmitButtonState()"></td>
-                    <td><input <input type="text" name="fett" pattern="\d+(\.\d{1,2})?" oninput="updateSubmitButtonState()"></td>
+                    <td><input <input type="text" name="fett" pattern="\d+([.,]\d{1,2})?" placeholder="g" oninput="updateSubmitButtonState()"></td>
-                    <td><input <input type="text" name="kh" pattern="\d+(\.\d{1,2})?" oninput="updateSubmitButtonState()"></td>
+                    <td><input <input type="text" name="kh" pattern="\d+([.,]\d{1,2})?" placeholder="g" oninput="updateSubmitButtonState()"></td>
-                    <td><input <input type="text" name="bst" pattern="\d+(\.\d{1,2})?" oninput="updateSubmitButtonState()"></td>
+                    <td><input <input type="text" name="bst" pattern="\d+([.,]\d{1,2})?" placeholder="g" oninput="updateSubmitButtonState()"></td>
-                    <td><input <input type="text" name="ca" pattern="\d+(\.\d{1,2})?" oninput="updateSubmitButtonState()"></td>
+                    <td><input <input type="text" name="ca" pattern="\d+([.,]\d{1,2})?" placeholder="mg" oninput="updateSubmitButtonState()"></td>
                 </tr>
             </table>
             <button type="submit" id="submit-button" disabled>Hinzufügen</button>

start.sh

@@ -3,3 +3,4 @@
 gunicorn 'Run:app' --bind 0.0.0.0:8080 --log-level=info --workers=4
 
 
+