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

src/Run.py

@@ -20,6 +20,7 @@ app.config.update({
 oidc = OpenIDConnect(app)
 
 
+
 def calculate_nutrition(food, weight):
     try:
         conn = psycopg2.connect()
@@ -104,7 +105,7 @@ def convert_decimal(value):
 
 
 @app.route('/add_nutrition', methods=['POST'])
-@oidc.require_login
+@oidc.accept_token(True)
 def add_nutrition():
     food = request.form.get('food')
     kcal = convert_decimal(request.form.get('kcal'))
@@ -133,8 +134,41 @@ 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.route('/get_database_entries')
+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")
+            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()
+
 app = ProxyFix(app, x_for=1, x_host=1)
 
 

src/static/style.css

@@ -72,7 +72,7 @@ tr:nth-child(even) {
 }
 
 .selected, tr.selected {
-    background-color: #e19595; /* Hervorhebung der Auswahl */
+    background-color: #e5b5b5; /* Hervorhebung der Auswahl */
 }
 
 tr:hover:not(.selected) {
@@ -152,3 +152,25 @@ 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;
+}

src/templates/index.html

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

@@ -13,13 +13,27 @@
             document.getElementById('submit-button').disabled = !allFilled;
         }
 
-        function addNutritionEntry() {
+        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);
 
                 fetch('/add_nutrition', {
                     method: 'POST',
+                    headers: {
+                        'Authorization': 'Bearer ' + token
+                    },
                     body: formData
                 }).then(response => {
                     // Behandlung der Serverantwort
@@ -38,8 +52,47 @@
 
                 // 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');
+                }
+            });
+        });
+
+        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 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;
+                        // ... Fügen Sie weitere Zellen für die anderen Werte hinzu ...
+                    });
+                })
+                .catch(error => console.error('Fehler:', error));
+        }
+
+document.addEventListener('DOMContentLoaded', loadDatabaseEntries);
+
+
     </script>
 </head>
 <body>
@@ -75,6 +128,27 @@
             </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="deleteSelectedRows()">Ausgewählte Zeilen löschen</button>
+        
     </div>
 </body>
 </html>