Einstellungen ausgelagert: eigene Seite für Druckerabschreibung, Arbeitskosten, Gewinnmarge

- Neue /settings-Route mit eigener Seite (Einstellungen für Drucker, Arbeit, Marge)
- Settings-Cards aus index.html entfernt
- /save_config merged mit bestehenden Werten (kein Überschreiben)
- Navigation im Header: Kalkulation ↔ Einstellungen (alle Seiten)
- Port auf 5001 geändert (macOS AirPlay blockiert 5000)

app.py

@@ -124,19 +124,32 @@ def index():
     return render_template('index.html', config=config, calc=calc)
 
 
+@app.route('/settings')
+def settings():
+    """Einstellungsseite fuer Druckerabschreibung, Arbeitskosten und Marge."""
+    config = load_config()
+    return render_template('settings.html', config=config)
+
+
 @app.route('/calculate', methods=['POST'])
 def calc_json():
-    """AJAX-Endpunkt: Nimmt Formular-JSON entgegen, gibt Berechnung zurueck."""
+    """AJAX-Endpunkt: Nimmt Formular-JSON entgegen, gibt Berechnung zurueck.
+    Fehlende Werte werden aus der gespeicherten Config ergaenzt."""
     data = request.get_json()
-    calc = calculate(data)
+    config = load_config()
+    merged = {**config, **data}
+    calc = calculate(merged)
     return jsonify(calc)
 
 
 @app.route('/save_config', methods=['POST'])
 def save_config_route():
-    """AJAX-Endpunkt: Speichert aktuelle Formularwerte in YAML."""
+    """AJAX-Endpunkt: Speichert aktuelle Formularwerte in YAML.
+    Vorhandene Werte (z.B. aus Einstellungen) werden nicht ueberschrieben."""
     data = request.get_json()
-    save_config(data)
+    existing = load_config()
+    existing.update(data)
+    save_config(existing)
     return jsonify({'status': 'ok'})
 
 
@@ -210,7 +223,9 @@ def invoice_pdf():
 def export():
     """Exportiert die Kalkulation als TXT-Datei."""
     data = request.get_json()
-    calc = calculate(data)
+    config = load_config()
+    merged = {**config, **data}
+    calc = calculate(merged)
 
     lines = [
         "3D-DRUCK KOSTENKALKULATION",
@@ -239,4 +254,4 @@ def export():
 
 
 if __name__ == '__main__':
-    app.run(host='0.0.0.0', debug=True)
+    app.run(host='0.0.0.0', port=5001, debug=True)

templates/index.html

@@ -22,6 +22,11 @@
                     <span class="fw-semibold">3D Druck Kostenkalkulator</span>
                 </div>
                 <div class="navbar-nav flex-row order-md-last">
+                    <div class="nav-item me-3">
+                        <a href="{{ url_for('settings') }}" class="nav-link px-0" title="Einstellungen">
+                            <i class="ti ti-settings icon icon-1"></i>
+                        </a>
+                    </div>
                     <div class="nav-item">
                         <button class="nav-link px-0" id="dark-mode-btn" onclick="toggleDarkMode()" title="Dark Mode umschalten">
                             <i class="ti ti-{% if config.dark_mode %}sun{% else %}moon{% endif %} icon icon-1" id="dark-mode-icon"></i>
@@ -84,48 +89,6 @@
                             </div>
                         </div>
 
-                        <div class="card mb-3">
-                            <div class="card-header"><i class="ti ti-tools me-2"></i>Drucker Abschreibung</div>
-                            <div class="card-body">
-                                <div class="mb-3">
-                                    <label class="form-label">Anschaffungspreis (EUR)</label>
-                                    <input type="number" step="1" class="form-control" data-var="druckerAnschaffung" data-type="number" value="{{ config.druckerAnschaffung }}">
-                                </div>
-                                <div class="mb-3">
-                                    <label class="form-label">Nutzungsdauer (Jahre)</label>
-                                    <input type="number" step="0.5" class="form-control" data-var="druckerNutzungsdauer" data-type="number" value="{{ config.druckerNutzungsdauer }}">
-                                </div>
-                                <div class="mb-3">
-                                    <label class="form-label">Betriebsstunden pro Jahr</label>
-                                    <input type="number" step="1" class="form-control" data-var="druckerBetriebsstunden" data-type="number" value="{{ config.druckerBetriebsstunden }}">
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="card mb-3">
-                            <div class="card-header"><i class="ti ti-users me-2"></i>Arbeitskosten</div>
-                            <div class="card-body">
-                                <div class="mb-3">
-                                    <label class="form-label">Arbeitszeit (Minuten)</label>
-                                    <input type="number" step="1" class="form-control" data-var="arbeitszeit" data-type="number" value="{{ config.arbeitszeit }}">
-                                </div>
-                                <div class="mb-3">
-                                    <label class="form-label">Stundenlohn (EUR)</label>
-                                    <input type="number" step="0.5" class="form-control" data-var="stundenlohn" data-type="number" value="{{ config.stundenlohn }}">
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="card mb-3">
-                            <div class="card-header"><i class="ti ti-currency-euro me-2"></i>Gewinnmarge</div>
-                            <div class="card-body">
-                                <div class="mb-0">
-                                    <label class="form-label">Gewinnmarge (%)</label>
-                                    <input type="number" step="0.5" class="form-control" data-var="gewinnmarge" data-type="number" value="{{ config.gewinnmarge }}">
-                                </div>
-                            </div>
-                        </div>
-
                     </form>
                 </div>
 

templates/invoice.html

@@ -22,6 +22,11 @@
                     <span class="fw-semibold"><i class="ti ti-file-invoice me-1"></i>Rechnung erstellen</span>
                 </div>
                 <div class="navbar-nav flex-row order-md-last">
+                    <div class="nav-item me-3">
+                        <a href="{{ url_for('settings') }}" class="nav-link px-0" title="Einstellungen">
+                            <i class="ti ti-settings icon icon-1"></i>
+                        </a>
+                    </div>
                     <div class="nav-item">
                         <a href="{{ url_for('index') }}" class="nav-link px-0" title="Zuruck zur Kalkulation">
                             <i class="ti ti-arrow-left icon icon-1"></i>

templates/settings.html

@@ -0,0 +1,118 @@
+<!DOCTYPE html>
+<html lang="de" data-bs-theme="{% if config.dark_mode %}dark{% else %}light{% endif %}">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
+    <title>Einstellungen</title>
+    <link href="https://cdn.jsdelivr.net/npm/@tabler/core@latest/dist/css/tabler.min.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/npm/@tabler/icons-webfont@latest/dist/tabler-icons.min.css" rel="stylesheet">
+    <link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">
+    <style>
+        @import url("https://rsms.me/inter/inter.css");
+    </style>
+</head>
+<body>
+    <div class="page">
+
+        <header class="navbar navbar-expand-md">
+            <div class="container-xl">
+                <div class="navbar-brand navbar-brand-autodark pe-0 pe-md-3 py-2 d-flex align-items-center gap-2">
+                    <span class="fw-bold">JET Design</span>
+                    <span class="text-secondary" style="opacity:0.5;">|</span>
+                    <span class="fw-semibold">Einstellungen</span>
+                </div>
+                <div class="navbar-nav flex-row order-md-last">
+                    <div class="nav-item me-3">
+                        <a href="{{ url_for('index') }}" class="nav-link px-0" title="Zur Kalkulation">
+                            <i class="ti ti-calculator icon icon-1"></i>
+                        </a>
+                    </div>
+                    <div class="nav-item">
+                        <a href="{{ url_for('settings') }}" class="nav-link px-0 active" title="Einstellungen">
+                            <i class="ti ti-settings icon icon-1"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </header>
+
+        <div class="container-xl my-4">
+            <div class="row justify-content-center">
+                <div class="col-lg-8">
+
+                    <form id="settings-form" onchange="onInputChange()" onkeyup="onInputChange()">
+
+                        <div class="card mb-3">
+                            <div class="card-header"><i class="ti ti-tools me-2"></i>Drucker Abschreibung</div>
+                            <div class="card-body">
+                                <div class="row g-3">
+                                    <div class="col-md-4">
+                                        <label class="form-label">Anschaffungspreis (EUR)</label>
+                                        <input type="number" step="1" class="form-control" data-var="druckerAnschaffung" data-type="number" value="{{ config.druckerAnschaffung }}">
+                                    </div>
+                                    <div class="col-md-4">
+                                        <label class="form-label">Nutzungsdauer (Jahre)</label>
+                                        <input type="number" step="0.5" class="form-control" data-var="druckerNutzungsdauer" data-type="number" value="{{ config.druckerNutzungsdauer }}">
+                                    </div>
+                                    <div class="col-md-4">
+                                        <label class="form-label">Betriebsstunden/Jahr</label>
+                                        <input type="number" step="1" class="form-control" data-var="druckerBetriebsstunden" data-type="number" value="{{ config.druckerBetriebsstunden }}">
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="card mb-3">
+                            <div class="card-header"><i class="ti ti-users me-2"></i>Arbeitskosten</div>
+                            <div class="card-body">
+                                <div class="row g-3">
+                                    <div class="col-md-6">
+                                        <label class="form-label">Arbeitszeit (Minuten)</label>
+                                        <input type="number" step="1" class="form-control" data-var="arbeitszeit" data-type="number" value="{{ config.arbeitszeit }}">
+                                    </div>
+                                    <div class="col-md-6">
+                                        <label class="form-label">Stundenlohn (EUR)</label>
+                                        <input type="number" step="0.5" class="form-control" data-var="stundenlohn" data-type="number" value="{{ config.stundenlohn }}">
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="card mb-3">
+                            <div class="card-header"><i class="ti ti-currency-euro me-2"></i>Gewinnmarge</div>
+                            <div class="card-body">
+                                <div class="row g-3">
+                                    <div class="col-md-6">
+                                        <label class="form-label">Gewinnmarge (%)</label>
+                                        <input type="number" step="0.5" class="form-control" data-var="gewinnmarge" data-type="number" value="{{ config.gewinnmarge }}">
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                    </form>
+
+                    <div class="card mb-3">
+                        <div class="card-header"><i class="ti ti-info-circle me-2"></i>Hinweis</div>
+                        <div class="card-body text-secondary">
+                            Die Einstellungen werden automatisch gespeichert und in der
+                            Kalkulation sowie der Rechnung verwendet.
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+        </div>
+
+        <div class="toast-container position-fixed top-0 end-0 p-3" id="notification" style="z-index:9999;display:none">
+            <div class="toast show bg-primary text-white">
+                <div class="toast-body fw-semibold" id="notification-msg"></div>
+            </div>
+        </div>
+
+    </div>
+
+    <script src="https://cdn.jsdelivr.net/npm/@tabler/core@latest/dist/js/tabler.min.js"></script>
+    <script src="{{ url_for('static', filename='script.js') }}"></script>
+</body>
+</html>