logging, 3

Dockerfile

@@ -15,4 +15,3 @@ EXPOSE 8080
 
 CMD "./start.sh"
 
-

src/Run.py

@@ -5,6 +5,7 @@ from werkzeug.middleware.proxy_fix import ProxyFix
 import os
 import json
 import psycopg2
+import logging
 
 app = Flask(__name__)
 app.config.update({
@@ -20,8 +21,6 @@ app.config.update({
 oidc = OpenIDConnect(app)
 
 
-
-
 def calculate_nutrition(food, weight):
     try:
         conn = psycopg2.connect()
@@ -51,6 +50,7 @@ def calculate_nutrition(food, weight):
             conn.close()
 
 
+
 # Index-Route
 @app.route('/')
 @oidc.require_login
@@ -67,7 +67,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:
@@ -98,28 +97,38 @@ 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(['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'))
+    app.logger.info("add_nutrition")
+
+    food = request.form.get('food')
+    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()
         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()
     
         return redirect(url_for('nutrition'))
+    except Exception as e:
+        app.logger.warn(f"error in add_nutrition: {e}")
+        return jsonify({"error": str(e)}), 500
     finally:
         if conn:
             conn.close()
@@ -130,9 +139,43 @@ def add_nutrition():
 def nutrition():
     return render_template('nutrition.html')
 
+@app.route('/get_token')
+@oidc.require_login
+def get_token():
+    return jsonify(token=oidc.get_access_token())
 
 
-app = ProxyFix(app, x_for=1, x_host=1)
+@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 ORDER BY name")
+            entries = cursor.fetchall()
+
+        # Umwandeln der Daten in ein JSON-freundliches Format
+        entries_list = []
+        for entry in entries:
+            entries_list.append({
+                "food": entry[0],
+                "kcal": entry[1],
+                "ew": entry[2],
+                "fett": entry[3],
+                "kh": entry[4],
+                "bst": entry[5],
+                "ca": entry[6]
+            })
+        return jsonify(entries_list)
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+    finally:
+        if conn:
+            conn.close()
+
+exposed_app = ProxyFix(app, x_for=1, x_host=1)
 
 
 

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)
     )
 ''')
 

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
+Thymian,52,1.5,1.2,7.4,3.0,307

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: #e5b5b5; /* Hervorhebung der Auswahl */
 }
 
 tr:hover:not(.selected) {
@@ -145,3 +152,65 @@ tr:hover:not(.selected) {
         overflow-x: auto; /* Ermöglicht horizontales Scrollen auf kleinen Bildschirmen */
     }
 }
+
+#table-container {
+    overflow-y: auto;
+    max-height: 400px; /* Passen Sie die Höhe nach Bedarf an */
+    border-radius: 10px;
+    margin-top: 20px;
+}
+
+#database-nutrition-table {
+    width: 100%;
+    border-collapse: collapse;
+}
+
+#database-nutrition-table th, #database-nutrition-table td {
+    border: 1px solid #ddd;
+    padding: 8px;
+    text-align: left;
+}
+
+#database-nutrition-table tr.selected {
+    background-color: #f0e68c;
+}
+
+
+#password-prompt {
+    margin-top: 10px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+#password-prompt input[type="password"] {
+    padding: 8px;
+    margin-right: 10px;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+}
+
+#password-prompt button {
+    padding: 8px 15px;
+    margin-right: 10px;
+    border: none;
+    border-radius: 4px;
+    cursor: pointer;
+    color: white;
+}
+
+#password-prompt button[type="submit"] {
+    background-color: #008C50; /* Helles Grün */
+}
+
+#password-prompt button[type="submit"]:hover {
+    background-color: #007344; /* Dunkleres Grün */
+}
+
+#password-prompt button[type="button"] {
+    background-color: #640000; /* Helles Rot */
+}
+
+#password-prompt button[type="button"]:hover {
+    background-color: #490000; /* Dunkleres Rot */
+}

src/templates/index.html

@@ -7,8 +7,6 @@
     <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();
@@ -177,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>
@@ -212,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>
@@ -220,6 +220,8 @@ function updateTotalNutrition() {
                 <th>CA</th>
             </tr>
             <tr>
+                <td>Gesamtwerte</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

@@ -13,38 +13,129 @@
             document.getElementById('submit-button').disabled = !allFilled;
         }
 
+        function getBearerToken(callback) {
+            fetch('/get_token')
+                .then(response => response.json())
+                .then(data => {
+                    callback(data.token);
+                })
+                .catch(error => {
+                    console.error('Fehler beim Abrufen des Tokens:', error);
+                });
+        }
+
         function addNutritionEntry() {
+            getBearerToken(token => {
+                const form = document.getElementById('nutrition-form');
+                const formData = new FormData(form);
 
-            const form = document.getElementById('nutrition-form');
-    const formData = new FormData(form);
+                fetch('/add_nutrition', {
+                    method: 'POST',
+                    headers: {
+                        'Authorization': 'Bearer ' + token
+                    },
+                    body: formData
+                }).then(response => {
+                    // Behandlung der Serverantwort
+                    // Beispielsweise das Formular zurücksetzen
+                    form.reset();
+                    updateSubmitButtonState();
+                }).catch(error => {
+                    console.error('Fehler:', error);
+                });
+                // ... Code, um den Eintrag zur Datenbank hinzuzufügen
 
-    fetch('/add_nutrition', {
-        method: 'POST',
-        body: formData
-    }).then(response => {
-        // Behandlung der Serverantwort
-        // Beispielsweise das Formular zurücksetzen
-        form.reset();
-        updateSubmitButtonState();
-    }).catch(error => {
-        console.error('Fehler:', error);
-    });
-    // ... Code, um den Eintrag zur Datenbank hinzuzufügen
+                // Nach dem Hinzufügen, setze alle Eingabefelder zurück
+                document.querySelectorAll('#nutrition-form input').forEach(input => {
+                    input.value = ''; // Setzt den Wert jedes Eingabefeldes zurück
+                });
 
-    // Nach dem Hinzufügen, setze alle Eingabefelder zurück
-    document.querySelectorAll('#nutrition-form input').forEach(input => {
-        input.value = ''; // Setzt den Wert jedes Eingabefeldes zurück
-    });
+                // Deaktiviere den "Hinzufügen"-Button wieder
+                document.getElementById('submit-button').disabled = true;
+            });
+        }
+
+
+        document.addEventListener('DOMContentLoaded', function() {
+            const table = document.getElementById('database-nutrition-table');
+            table.addEventListener('click', function(e) {
+                if (e.target.tagName === 'TD') {
+                    e.target.parentNode.classList.toggle('selected');
+                    updateDeleteButtonState(); 
+                }
+            });
+            updateDeleteButtonState(); 
+        });
+
+        function deleteSelectedRows() {
+            const table = document.getElementById('database-nutrition-table');
+            Array.from(table.rows).forEach(row => {
+                if (row.classList.contains('selected')) {
+                    // Logik zum Löschen der Zeile aus der Datenbank
+                    table.deleteRow(row.rowIndex);
+                }
+            });
+        }
+
+        function showPasswordPrompt() {
+            document.getElementById('delete-row-button').style.display = 'none';
+            document.getElementById('password-prompt').style.display = 'block';
+        }
+
+        function hidePasswordPrompt() {
+            document.getElementById('delete-row-button').style.display = 'block';
+            document.getElementById('password-prompt').style.display = 'none';
+        }
+
+        function deleteRowsIfPasswordCorrect() {
+            const password = document.getElementById('password-input').value;
+            if (password === 'wowmuchsecurity') {
+                deleteSelectedRows();  // Funktion, die die ausgewählten Zeilen löscht
+                hidePasswordPrompt();
+            } else {
+                alert('Falsches Passwort!');
+            }
+        }
+
+        function updateDeleteButtonState() {
+            const selectedRows = document.querySelectorAll('#nutrition-table .selected').length;
+            const deleteButton = document.getElementById('delete-row-button');
+            deleteButton.disabled = selectedRows === 0;
+            if (selectedRows === 0) {
+                hidePasswordPrompt(); // Versteckt die Passwort-Eingabe, falls keine Zeile ausgewählt ist
+            }
+        }
+
+
+        function loadDatabaseEntries() {
+            fetch('/get_database_entries') // Pfad zur entsprechenden Flask-Route
+                .then(response => response.json())
+                .then(data => {
+                    const tableBody = document.getElementById('database-nutrition-table').getElementsByTagName('tbody')[0];
+                    data.forEach(entry => {
+                        const row = tableBody.insertRow();
+                        row.insertCell(0).innerHTML = entry.food;
+                        row.insertCell(1).innerHTML = entry.kcal;
+                        row.insertCell(2).innerHTML = entry.ew;
+                        row.insertCell(3).innerHTML = entry.fett;
+                        row.insertCell(4).innerHTML = entry.kh;
+                        row.insertCell(5).innerHTML = entry.bst;
+                        row.insertCell(6).innerHTML = entry.ca;
+
+                        // ... Fügen Sie weitere Zellen für die anderen Werte hinzu ...
+                    });
+                })
+                .catch(error => console.error('Fehler:', error));
+        }
+
+document.addEventListener('DOMContentLoaded', loadDatabaseEntries);
 
-    // Deaktiviere den "Hinzufügen"-Button wieder
-    document.getElementById('submit-button').disabled = true;
-}
 
     </script>
 </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>
@@ -65,16 +156,44 @@
                 </tr>
                 <tr>
                     <td><input type="text" name="food" placeholder="Lebensmittel" 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})?" placeholder="g" 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})?" placeholder="g" 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})?" placeholder="mg" 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})?" placeholder="g" 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})?" placeholder="g" 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})?" placeholder="mg" oninput="updateSubmitButtonState()"></td>
                 </tr>
             </table>
             <button type="submit" id="submit-button" disabled>Hinzufügen</button>
         </form>
+
+        <div id="table-container">
+            <table id="database-nutrition-table">
+                <thead>
+                    <tr>
+                        <th>Lebensmittel</th>
+                        <th>kcal</th>
+                        <th>EW</th>
+                        <th>Fett</th>
+                        <th>KH</th>
+                        <th>BST</th>
+                        <th>CA</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <!-- Die Zeilen werden dynamisch aus der Datenbank geladen -->
+                </tbody>
+            </table>
+        </div>
+        <button id="delete-row-button" onclick="showPasswordPrompt()">Zeilen löschen</button>
+
+        <div id="password-prompt" style="display: none;">
+            <input type="password" id="password-input" placeholder="Passwort">
+            <button onclick="deleteRowsIfPasswordCorrect()">OK</button>
+            <button onclick="hidePasswordPrompt()">Abbrechen</button>
+        </div>
+        
+        
     </div>
 </body>
 </html>

start.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-gunicorn 'Run:app' --bind 0.0.0.0:8080 --log-level=info --workers=4
+gunicorn 'Run:exposed_app' --bind 0.0.0.0:8080 --log-level=debug --workers=4