Fix of some timezone problems

changes to the deisgn
changes toi the darkmode style to have iot be a better edesign
2026-09-15 10:51:00 +02:00 · 2026-09-14 11:02:11 +02:00 · 2026-09-14 10:54:19 +02:00 · 2026-09-14 10:24:45 +02:00 · 2026-09-14 09:40:59 +02:00 · 2026-09-14 09:23:09 +02:00
24 changed files with 2276 additions and 483 deletions
@@ -17,7 +17,6 @@ Features:
 - Booking and reservation of items
 """
 from random import random
-
 from flask import Flask, render_template, request, redirect, url_for, session, flash, send_from_directory, get_flashed_messages, jsonify, Response, make_response, send_file, abort
 from werkzeug.utils import secure_filename
 from werkzeug.middleware.proxy_fix import ProxyFix
@@ -228,7 +227,6 @@ def rollover_student_card_classes(dry_run=False, *, max_class=None, graduate_lab
            client.close()


-# Admin route to trigger rollover manually
@app.route('/admin/trigger_school_year_rollover', methods=['POST'])
 def admin_trigger_school_year_rollover():
    if 'username' not in session:
@@ -543,7 +541,8 @@ def _enforce_module_access():
            msg = {
                'library': "Bibliotheks-Modul ist deaktiviert.",
                'inventory': "Inventar-Modul ist deaktiviert.",
-                'student_cards': "Schülerausweis-Modul ist deaktiviert."
+                'student_cards': "Schülerausweis-Modul ist deaktiviert.",
+                'terminplaner': "Termin-Modul ist deaktiviert."
            }.get(name, f"{name.capitalize()}-Modul ist deaktiviert.")
            
            if request.path.startswith('/api/') or request.is_json:
@@ -555,6 +554,8 @@ def _enforce_module_access():
                return redirect(url_for('home_admin'))
            elif name != 'library' and cfg.MODULES.is_enabled('library'):
                return redirect('/library')
+            elif name != 'terminplaner' and cfg.MODULES.is_enabled('terminplaner'):
+                return redirect('/terminplaner')
            
            return redirect(url_for('my_borrowed_items'))

@@ -707,7 +708,7 @@ def _action_access_allowed(permissions, action_key):
 def _permission_denied_fallback_endpoint(permissions, current_endpoint=None):
    username = session.get('username')

-    for candidate in ('home_admin', 'my_borrowed_items', 'tutorial_page', 'notifications_view', 'impressum'):
+    for candidate in ('home_admin', 'library_view', 'terminplaner', 'my_borrowed_items', 'tutorial_page', 'notifications_view', 'impressum'):
        if current_endpoint and candidate == current_endpoint:
            continue
        if _page_access_allowed(permissions, candidate):
@@ -1379,11 +1380,31 @@ def update_appointment_statuses():
            activation_user = str(appointment.get('User') or '').strip()
            activation_item_name = str(appointment.get('Item') or 'Termin')

+            # is_library_item expects an item document, not the stored item id.
+            item_doc_for_status = None
+            item_id_for_status = appointment.get('Item')
+            if item_id_for_status:
+                item_lookup = [{'_id': item_id_for_status}]
+                try:
+                    item_lookup.insert(0, {'_id': ObjectId(str(item_id_for_status))})
+                except (InvalidId, TypeError):
+                    pass
+                try:
+                    item_doc_for_status = items_col.find_one(
+                        {'$or': item_lookup},
+                        {'ItemType': 1, 'is_library': 1}
+                    )
+                except Exception as item_lookup_error:
+                    app.logger.warning(
+                        f"Could not resolve item type for appointment {appointment.get('_id')}: {item_lookup_error}"
+                    )
+            item_is_library = it.is_library_item(item_doc_for_status)
+
            # Aktuellen Status bestimmen
            new_status = au.get_current_status(appointment, log_changes=True, user='scheduler')

            # Wenn sich der Status geändert hat, aktualisiere in der Datenbank
-            if new_status != old_status and not it.is_library_item(appointment.get('Item')):
+            if new_status != old_status and not item_is_library:
                extra_fields = {}

                # --- Conflict resolver: planned → active transition ---
@@ -1481,15 +1502,22 @@ def update_appointment_statuses():
            # -----------------------------------------------------------------
            # Mahnlauf für Bibliotheksartikel (Prüfung auf Überfälligkeit)
            # -----------------------------------------------------------------
-            elif it.is_library_item(appointment.get('Item')):
+            elif item_is_library:
                appt = appointment # Verwende das aktuelle Dokument aus der Schleife
                if appt.get('Status') != 'active':
                    continue

-                due_date_obj = appt.get('DueDate')
+                due_date_obj = appt.get('DueDate') or appt.get('End')
                if not due_date_obj:
                    continue

+                # Backfill the deadline for loans created before DueDate was stored.
+                if not appt.get('DueDate') and appt.get('End'):
+                    ausleihungen.update_one(
+                        {'_id': appt['_id'], 'DueDate': {'$exists': False}},
+                        {'$set': {'DueDate': due_date_obj}}
+                    )
+
                due_date_naive = due_date_obj.replace(tzinfo=None) if due_date_obj.tzinfo else due_date_obj
                days_overdue = (current_time_naive - due_date_naive).days

@@ -1516,6 +1544,7 @@ def update_appointment_statuses():
                student_card = _decrypt_student_card_doc(card) if '_decrypt_student_card_doc' in globals() else card
                student_name = student_card.get('SchülerName', target_ausweis_id)
                student_class = student_card.get('Klasse', '—')
+                student_ausleih_dauer = student_card.get('StandardAusleihdauer', 14)

                # Gegenstandsdetails laden
                item_name = "Unbekannter Artikel"
@@ -1530,8 +1559,8 @@ def update_appointment_statuses():
                    except Exception:
                        pass

-                # STUFE 2: >= 28 Tage überfällig -> Ausweis sperren, Stufe 2 setzen & Admins benachrichtigen
-                if days_overdue >= 28 and mahnstufe < 2:
+                # STUFE 2: >= 2 * student_ausleih_dauer Tage überfällig -> Ausweis sperren, Stufe 2 setzen & Admins benachrichtigen
+                if days_overdue >= (int(student_ausleih_dauer) * 2) and mahnstufe < 2:
                    ausleihungen.update_one(
                        {'_id': appt['_id']},
                        {'$set': {'Mahnstufe': 2, 'LastUpdated': current_time}}
@@ -1563,17 +1592,10 @@ def update_appointment_statuses():
                        except Exception as n_err:
                            app.logger.warning(f"Fehler beim Erstellen der Admin-Notif (Stufe 2): {n_err}")

-                    # 2. Web-Push Notification für Admins
-                    if 'create_return_reminders' in globals():
-                        try:
-                            create_return_reminders(title=title, body=body, url=target_url)
-                        except Exception as p_err:
-                            app.logger.error(f"Fehler beim Senden der Admin-Push (Stufe 2): {p_err}")
-
                    app.logger.warning(f"Mahnstufe 2 & Ausweis-Sperre für Schülerausweis '{student_name}' ({target_ausweis_id}) gesetzt.")

                # STUFE 1: >= 14 Tage überfällig -> Stufe 1 setzen & Admins benachrichtigen
-                elif days_overdue >= 14 and mahnstufe == 0:
+                elif days_overdue >= int(student_ausleih_dauer) and mahnstufe == 0:
                    ausleihungen.update_one(
                        {'_id': appt['_id']},
                        {'$set': {'Mahnstufe': 1, 'LastUpdated': current_time}}
@@ -1594,13 +1616,6 @@ def update_appointment_statuses():
                        except Exception as n_err:
                            app.logger.warning(f"Fehler beim Erstellen der Admin-Notif (Stufe 1): {n_err}")

-                    # 2. Web-Push Notification für Admins
-                    if 'create_return_reminders' in globals():
-                        try:
-                            create_return_reminders(title=title, body=body, url=target_url)
-                        except Exception as p_err:
-                            app.logger.error(f"Fehler beim Senden der Admin-Push (Stufe 1): {p_err}")
-
                    app.logger.info(f"Mahnstufe 1 für Schülerausweis '{student_name}' ({target_ausweis_id}) gesetzt.")

        if updated_count > 0:
@@ -2173,7 +2188,7 @@ def _upload_student_cards_excel():

    current_permissions = us.get_effective_permissions(session['username'])

-    if not current_permissions['actions'].get('can_manage_user', False):
+    if not current_permissions['actions'].get('can_manage_users', False):
        flash('Ihnen fehlen die nötigen Berechtigungen, um diese Aktion auszuführen.', 'error')
        return redirect(url_for('library_view'))

@@ -3037,42 +3052,6 @@ def optimized_image(filename):
        app.logger.error(f"Error serving optimized image {filename}: {str(e)}")
        return Response("Optimized image not found", status=404)

-
-# @app.route('/QRCodes/<filename>')
-# def qrcode_file(filename):
-#     """
-#     Serve QR code files from the QRCodes directory.
-#     
-#     Args:
-#         filename (str): Name of the QR code file to serve
-#         
-#     Returns:
-#         flask.Response: The requested QR code file or placeholder image if not found
-#     """
-#     try:
-#         # Check production path first
-#         prod_path = "/var/Inventarsystem/Web/QRCodes"
-#         dev_path = app.config['QR_CODE_FOLDER']
-#         if os.path.exists(os.path.join(prod_path, filename)):
-#             return send_from_directory(prod_path, filename)
-#         if os.path.exists(os.path.join(dev_path, filename)):
-#             return send_from_directory(dev_path, filename)
-#             
-#             # Use a placeholder image if file not found - first try SVG, then PNG
-#             svg_placeholder_path = os.path.join(app.static_folder, 'img', 'no-image.svg')
-#             png_placeholder_path = os.path.join(app.static_folder, 'img', 'no-image.png')
-#             
-#             if os.path.exists(svg_placeholder_path):
-#                 return send_from_directory(app.static_folder, 'img/no-image.svg')
-#             elif os.path.exists(png_placeholder_path):
-#                 return send_from_directory(app.static_folder, 'img/no-image.png')
-#             else:
-#                 return send_from_directory(app.static_folder, 'favicon.ico')
-#     except Exception as e:
-#         print(f"Error serving QR code {filename}: {str(e)}")
-#         return Response("QR code not found", status=404)
-
-
@app.route('/<path:filename>')
 def catch_all_files(filename):
    """
@@ -3135,32 +3114,6 @@ def test_connection():
    """
    return {'status': 'success', 'message': 'Connection successful', 'status_code': 200}

-""" if sucess in deployment the funktion can be removed
-@app.route('/user_status')
-def user_status():
-    
-    API endpoint to get the current user's status (username, admin status).
-    Used by JavaScript in templates to personalize the UI.
-    
-    Returns:
-        JSON: User status information or error if not authenticated
-    
-    if 'username' in session:
-        is_admin = us.check_admin(session['username'])
-        return jsonify({
-            'authenticated': True,
-            'username': session['username'],
-            'is_admin': is_admin
-        })
-    else:
-        return jsonify({
-            'authenticated': False,
-            'error': 'Not logged in'
-        }), 401
-"""
-
-
-##################################################### changes to be made to account for the new account permison managment system ##############################

@app.route('/')
 def home():
@@ -3202,6 +3155,8 @@ def home_admin():
        flash('Ihnen ist es nicht gestattet auf dieser Internetanwendung, die eben besuchte Adrrese zu nutzen, versuchen sie es erneut nach dem sie sich mit einem berechtigten Nutzer angemeldet haben!', 'error')
        return redirect(url_for('library_view'))

+    filter_names = it.get_filter_names()
+
    return render_template(
        'main_admin.html',
        username=session['username'],
@@ -3211,6 +3166,7 @@ def home_admin():
        student_default_borrow_days=cfg.STUDENT_DEFAULT_BORROW_DAYS,
        student_max_borrow_days=cfg.STUDENT_MAX_BORROW_DAYS,
        school_info=_get_school_info_for_export(),
+        filter_names=filter_names,
        open_item=request.args.get('open_item')
    )

@@ -3716,7 +3672,10 @@ def mahnungen_admin():

        overdue_records = list(ausleihungen_col.find({
            'Status': 'active',
-            'DueDate': {'$lt': current_time}
+            '$or': [
+                {'DueDate': {'$lt': current_time}},
+                {'DueDate': {'$exists': False}, 'End': {'$lt': current_time}},
+            ]
        }).sort('DueDate', 1))

        overdue_list = []
@@ -3751,8 +3710,6 @@ def mahnungen_admin():
                item_name = item_doc.get('Name', item_id)
                item_code = item_doc.get('Code_4', '')

-                # ENTFERNT: item_name = f"{item_name} ({item_code})" - Wir übergeben es separat ans Frontend
-
                raw_user = str(record.get('User') or '')
                decrypted_user = decrypt_text(raw_user)
                ausweis_id = (decrypted_user if decrypted_user else raw_user).strip().upper()
@@ -3763,7 +3720,7 @@ def mahnungen_admin():
                student_email = student_card.get('email') or student_card.get('Email', '')
                is_blocked = student_card.get('is_blocked', False)

-                due_date_obj = record.get('DueDate')
+                due_date_obj = record.get('DueDate') or record.get('End')
                if due_date_obj:
                    due_date_naive = due_date_obj.replace(tzinfo=None) if due_date_obj.tzinfo else due_date_obj
                    days_overdue = (current_time_naive - due_date_naive).days
@@ -3783,14 +3740,6 @@ def mahnungen_admin():
                'is_blocked': is_blocked
                })

-
-            return render_template(
-                'mahnungen_admin.html',
-                overdue_items=overdue_list,
-                # KORRIGIERT: 'overdue_items' statt 'overdue_list', damit es zum HTML passt
-                library_module_enabled=cfg.MODULES.is_enabled('library'),
-                student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
-            )
    except Exception as e:
        app.logger.error(f"Fehler beim Laden der Mahnungsverwaltung: {e}")
        flash('Fehler beim Laden der Mahnungsverwaltung.', 'error')
@@ -3799,6 +3748,14 @@ def mahnungen_admin():
        if client:
            client.close()

+    return render_template(
+        'mahnungen_admin.html',
+        overdue_items=overdue_list,
+        library_module_enabled=cfg.MODULES.is_enabled('library'),
+        student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
+        email_service_enabled=cfg.EMAIL_ENABLED
+    )
+
@app.route('/mahnungen_reset', methods=['POST'])
 def mahnungen_reset():
    """Setzt die Mahnstufe einer Ausleihe zurück, verlängert die Frist und entsperrt den Schülerausweis."""
@@ -4319,6 +4276,7 @@ def api_library_scan_action():
    - scan student card id
    - scan media code (ISBN/Code_4)
    - borrow if available, otherwise return (toggle behavior)
+    - action='borrow' can be used by scan modes that must never return an item
    """
    if 'username' not in session:
        return jsonify({'ok': False, 'message': 'Nicht angemeldet.'}), 401
@@ -4328,6 +4286,7 @@ def api_library_scan_action():
        return jsonify({'ok': False, 'message': 'Schülerausweis-Modul ist deaktiviert.'}), 403

    payload = request.get_json(silent=True) or {}
+    requested_action = str(payload.get('action') or 'toggle').strip().lower()
    student_card_id = us.normalize_student_card_id(payload.get('student_card_id') or payload.get('card_id'))
    item_code_raw = str(payload.get('item_code') or payload.get('code') or '').strip()
    duration_raw = str(payload.get('borrow_duration_days') or '').strip()
@@ -4400,7 +4359,13 @@ def api_library_scan_action():
            due_date = now + datetime.timedelta(days=borrow_duration_days)

            it.update_item_status(item_id, False, borrower_name)
-            au.add_ausleihung(item_id, borrower_name, now, due_date)
+            au.add_ausleihung(
+                item_id,
+                borrower_name,
+                now,
+                end_date=due_date,
+                due_date=due_date,
+            )

            _append_audit_event_standalone(
                event_type='ausleihung_borrowed',
@@ -4425,6 +4390,12 @@ def api_library_scan_action():
                'message': f"{item_doc.get('Name', 'Medium')} wurde ausgeliehen."
            }), 200

+        if requested_action == 'borrow':
+            return jsonify({
+                'ok': False,
+                'message': f"Medium ist bereits ausgeliehen und wurde nicht verändert.",
+            }), 409
+
        # Toggle back: item is currently borrowed -> return
        current_borrower = str(item_doc.get('User') or '').strip()
        current_permissions = us.get_effective_permissions(session['username'])
@@ -4708,12 +4679,15 @@ def upload_admin():
    if not _action_access_allowed(permissions, 'can_insert'):
        flash('Ihnen ist es nicht gestattet auf dieser Internetanwendung, die eben besuchte Adrrese zu nutzen, versuchen sie es erneut nach dem sie sich mit einem berechtigten Nutzer angemeldet haben!', 'error')
        return redirect(url_for('login'))
-    
+
+    filter_names = it.get_filter_names()
+
    return render_template(
        'upload_admin.html',
        username=session['username'],
        library_module_enabled=cfg.MODULES.is_enabled('library'),
        student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
+        filter_names=filter_names,
        show_library_features=False,
        upload_mode='item',
        page_title='Artikel hochladen',
@@ -5195,7 +5169,6 @@ def student_card_class_barcode_download():
    """
    Download PDF with student card barcodes filtered by a specific class from dropdown.
    """
-    from flask import request, session, redirect, url_for, send_file, flash

    if 'username' not in session:
        return redirect(url_for('login'))
@@ -5389,7 +5362,7 @@ def student_card_single_barcode_download(card_id):
        return redirect(url_for('login'))
    current_permissions = us.get_effective_permissions(session['username'])

-    if not current_permissions['actions'].get('can_manage_users', False):
+    if not current_permissions['actions'].get('can_manage_settings', False):
        flash('Ihnen fehlen die nötigen Berechtigungen, um diese Aktion auszuführen.', 'error')
        return redirect(url_for('library_view'))
    if not cfg.MODULES.is_enabled('student_cards'):
@@ -7006,12 +6979,15 @@ def item_edit(id):

        current_item['IndividualCodes'] = '\n'.join(individual_codes)

+        filter_names = it.get_filter_names()
+
        return render_template(
            'edit_library.html',
            username=session['username'],
            item=current_item,
            show_library_features=show_library_features,
            library_module_enabled=library_module_active,
+            filter_names=filter_names,
            page_title=f"Bearbeiten: {current_item.get('Name', '')}"
        )

@@ -7593,7 +7569,13 @@ def ausleihen(id):
        for unit in selected_units:
            unit_id = str(unit.get('_id'))
            it.update_item_status(unit_id, False, effective_borrower)
-            au.add_ausleihung(unit_id, effective_borrower, start_date, end_date=end_date)
+            au.add_ausleihung(
+                unit_id,
+                effective_borrower,
+                start_date,
+                end_date=end_date,
+                due_date=end_date if is_library_item else None,
+            )

        _append_audit_event_standalone(
            event_type='ausleihung_returned',
@@ -7684,7 +7666,13 @@ def ausleihen(id):
    if total_exemplare <= 1:
        it.update_item_status(id, False, effective_borrower)
        start_date = datetime.datetime.now(ZoneInfo("Europe/Berlin"))
-        au.add_ausleihung(id, effective_borrower, start_date, end_date=end_date)
+        au.add_ausleihung(
+            id,
+            effective_borrower,
+            start_date,
+            end_date=end_date,
+            due_date=end_date if is_library_item else None,
+        )
        _append_audit_event_standalone(
            event_type='ausleihung_returned',
            payload={
@@ -7729,10 +7717,17 @@ def ausleihen(id):
        start_date = datetime.datetime.now(ZoneInfo("Europe/Berlin"))
        for exemplar in new_borrowed_exemplars:
            exemplar_id = f"{id}_{exemplar['number']}"
-            au.add_ausleihung(exemplar_id, effective_borrower, start_date, end_date=end_date, exemplar_data={
+            au.add_ausleihung(
+                exemplar_id,
+                effective_borrower,
+                start_date,
+                end_date=end_date,
+                due_date=end_date if is_library_item else None,
+                exemplar_data={
                'parent_id': id,
                'exemplar_number': exemplar['number']
-            })
+                }
+            )

        _append_audit_event_standalone(
            event_type='ausleihung_returned',
@@ -7995,8 +7990,12 @@ def check_availability():
        items_col = db['items']

        # Collect potential conflicts (planned and active) for this day
-        same_day_start = datetime.datetime.combine(booking_date.date(), datetime.time.min)
-        same_day_end = datetime.datetime.combine(booking_date.date(), datetime.time.max)
+        same_day_start = datetime.datetime.combine(
+            booking_date.date(), datetime.time.min, tzinfo=ZoneInfo("Europe/Berlin")
+        )
+        same_day_end = datetime.datetime.combine(
+            booking_date.date(), datetime.time.max, tzinfo=ZoneInfo("Europe/Berlin")
+        )
        candidates = list(ausleihungen.find({
            'Item': item_id,
            'Status': {'$in': ['planned', 'active']},
@@ -8014,6 +8013,8 @@ def check_availability():
            if r_start is None:
                r_start = same_day_start
            # Overlap check: req_start < r_end and req_end > r_start
+            r_start = au.ensure_timezone_aware(r_start)
+            r_end = au.ensure_timezone_aware(r_end)
            if req_start < r_end and req_end > r_start:
                conflicts.append({
                    'id': str(r.get('_id')),
@@ -8228,16 +8229,19 @@ def add_booking():
    period = request.form.get('period')
    notes = request.form.get('notes', '')
    
-    # Parse dates as naive datetime objects
+    # Form timestamps represent local school time.
    try:
-        # Simple datetime parsing without timezone
        if start_date_str:
-            start_date = datetime.datetime.strptime(start_date_str, '%Y-%m-%d %H:%M:%S')
+            start_date = datetime.datetime.strptime(
+                start_date_str, '%Y-%m-%d %H:%M:%S'
+            ).replace(tzinfo=ZoneInfo("Europe/Berlin"))
        else:
            return jsonify({'success': False, 'error': 'Missing start date'})
        
        if end_date_str:
-            end_date = datetime.datetime.strptime(end_date_str, '%Y-%m-%d %H:%M:%S')
+            end_date = datetime.datetime.strptime(
+                end_date_str, '%Y-%m-%d %H:%M:%S'
+            ).replace(tzinfo=ZoneInfo("Europe/Berlin"))
        else:
            end_date = None
        
@@ -8629,6 +8633,72 @@ def register_csv():
        mimetype='application/pdf'
    )

+@app.route('/export_users_csv', methods=['POST'])
+def export_users_csv():
+    """
+    Exports a filtered list of users to a CSV file.
+    Receives a JSON array of usernames from the frontend.
+    """
+    if 'username' not in session:
+        flash('Ihnen ist es nicht gestattet, diese Aktion auszuführen.', 'error')
+        return redirect(url_for('login'))
+
+    usernames_json = request.form.get('usernames')
+    if not usernames_json:
+        flash('Keine Benutzer zum Exportieren ausgewählt.', 'error')
+        return redirect(url_for('user_del'))
+
+    try:
+        target_usernames = json.loads(usernames_json)
+    except json.JSONDecodeError:
+        flash('Ungültige Daten beim Export übermittelt.', 'error')
+        return redirect(url_for('user_del'))
+
+    # Fetch all users
+    all_users = us.get_all_users()
+
+    # Create CSV in memory
+    si = io.StringIO()
+    # Delimiter set to semicolon (standard for Excel in German locales)
+    cw = csv.writer(si, delimiter=';')
+
+    # Write headers
+    cw.writerow(['Benutzername', 'Vorname', 'Nachname', 'Administrator', 'Rechte-Preset'])
+
+    for user in all_users:
+        encrypted_username = user.get('Username')
+        if not encrypted_username:
+            continue
+
+        uname = decrypt_text(encrypted_username)
+
+        # Only process users that were present in the frontend's filtered view
+        if uname in target_usernames:
+            try:
+                permissions_payload = us.get_effective_permissions(uname)
+                preset = permissions_payload.get('preset', 'standard_user')
+            except Exception:
+                preset = 'standard_user'
+
+            try:
+                name = us.get_name(uname) or ""
+                last_name = us.get_last_name(uname) or ""
+            except Exception:
+                name = ""
+                last_name = ""
+
+            admin_status = "Ja" if user.get('Admin', False) else "Nein"
+
+            cw.writerow([uname, name, last_name, admin_status, preset])
+
+    # Prefix with BOM (Byte Order Mark) to ensure Excel reads UTF-8 (Umlauts) correctly
+    output = '\ufeff' + si.getvalue()
+
+    return Response(
+        output,
+        mimetype="text/csv",
+        headers={"Content-disposition": "attachment; filename=benutzer_export.csv"}
+    )

@app.route('/user_del', methods=['GET'])
 def user_del():
@@ -11213,12 +11283,14 @@ def get_period_times(booking_date, period_num):
        # Create datetime objects for start and end times
        start_datetime = datetime.datetime.combine(
            booking_date.date(),
-            datetime.time(start_hour, start_min)
+            datetime.time(start_hour, start_min),
+            tzinfo=ZoneInfo("Europe/Berlin")
        )
        
        end_datetime = datetime.datetime.combine(
            booking_date.date(),
-            datetime.time(end_hour, end_min)
+            datetime.time(end_hour, end_min),
+            tzinfo=ZoneInfo("Europe/Berlin")
        )
        
        return {
@@ -13152,7 +13224,7 @@ def get_optimal_image_quality(img, target_size_kb=80):

@app.route('/health')
 def health_check():
-    return 'OK', 200
+    return jsonify({"status": "healthy"}), 200


@app.route('/api/push/subscribe', methods=['POST'])
@@ -42,12 +42,12 @@ def _get_client():
    return MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
 # Add this helper function after imports
 def ensure_timezone_aware(dt):
-    """Ensures a datetime is timezone-aware, using UTC if naive"""
+    """Return a timezone-aware datetime, treating naive DB values as UTC."""
    if dt is None:
        return None
    if dt.tzinfo is None:
-        # Treat naive datetimes as UTC
-        return dt.replace(tzinfo=None)
+        # PyMongo returns BSON datetimes as naive UTC unless tz_aware is enabled.
+        return dt.replace(tzinfo=datetime.timezone.utc)
    return dt

 def get_current_status(ausleihung, log_changes=False, user=None):
@@ -82,8 +82,8 @@ def get_current_status(ausleihung, log_changes=False, user=None):
        return 'completed'
    
    current_time = datetime.datetime.now(ZoneInfo("Europe/Berlin"))
-    start_time = ausleihung.get('Start')
-    end_time = ausleihung.get('End')
+    start_time = ensure_timezone_aware(ausleihung.get('Start'))
+    end_time = ensure_timezone_aware(ausleihung.get('End'))
    
    # Wenn kein Startdatum vorhanden ist, Status auf 'planned' setzen
    if not start_time:
@@ -911,9 +911,9 @@ def get_filter_names():
    if names_doc and 'names' in names_doc:
        return names_doc['names']
    return {
-        '1': 'Fach/Kategorie',
-        '2': 'System/Bereich',
-        '3': 'Typ/Art'
+        '1': 'Jahrgangsstufe',
+        '2': 'Fachgebiet',
+        '3': 'Schlagwort'
    }

 def set_filter_name(filter_num, name):
@@ -685,7 +685,7 @@ def student_card_exists(student_card_id):
    client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
    db = _get_tenant_db(client)
    users = db['student_cards']
-    exists = users.find_one({'SchülerName': normalized}) is not None
+    exists = users.find_one({'AusweisId': normalized}) is not None
    client.close()
    return exists

@@ -31,6 +31,9 @@
    --ui-text: #f8fafc;
    --ui-text-muted: #94a3b8;
    --ui-title: #ffffff;
+    --ui-overlay: #020617;
+    --ui-overlay-surface: #1e293b;
+    --ui-overlay-border: #64748b;
    --ui-shadow-sm: 0 4px 12px rgba(0, 0, 0, 0.4), inset 0 0 0 1px rgba(255, 255, 255, 0.05);
    --ui-shadow-md: 0 10px 30px rgba(0, 0, 0, 0.6), inset 0 0 0 1px rgba(255, 255, 255, 0.05);
    
@@ -39,6 +42,10 @@
    --ui-btn-radius: 99px; /* Pillenform für Buttons */
 }

+:root[data-theme="dark"] {
+    color-scheme: dark;
+}
+
 /* Safe Area Support for iPad notches, Dynamic Island, and rounded corners */
 html {
    /* Ensure viewport-fit is respected */
@@ -1002,3 +1009,104 @@ html, body {
 :root[data-theme="dark"] .favorite-item {
    outline: 2px solid #f59e0b !important;
 }
+
+/* Keep overlays and dialogs sufficiently opaque for readable content. */
+:root[data-theme="dark"] .modal,
+:root[data-theme="dark"] .modal-backdrop,
+:root[data-theme="dark"] .ui-modal-overlay,
+:root[data-theme="dark"] .item-modal,
+:root[data-theme="dark"] .reset-modal-overlay,
+:root[data-theme="dark"] #onboarding-overlay,
+:root[data-theme="dark"] [id$="-modal"][style*="inset"],
+:root[data-theme="dark"] [id$="Modal"][style*="inset"] {
+    background-color: var(--ui-overlay) !important;
+}
+
+:root[data-theme="dark"] .modal-content,
+:root[data-theme="dark"] .ui-modal-surface,
+:root[data-theme="dark"] .reset-modal-container,
+:root[data-theme="dark"] #onboarding-modal,
+:root[data-theme="dark"] [id$="-modal"] > div,
+:root[data-theme="dark"] [id$="Modal"] > div {
+    background-color: var(--ui-overlay-surface) !important;
+    color: var(--ui-text) !important;
+    border-color: var(--ui-overlay-border) !important;
+}
+
+/* Inline light surfaces must not become translucent or low-contrast in dark mode. */
+:root[data-theme="dark"] [style*="background: white"],
+:root[data-theme="dark"] [style*="background:#fff"],
+:root[data-theme="dark"] [style*="background: #fff"],
+:root[data-theme="dark"] [style*="background-color: white"],
+:root[data-theme="dark"] [style*="background-color:#fff"],
+:root[data-theme="dark"] [style*="background-color: #fff"] {
+    background-color: var(--ui-surface) !important;
+    color: var(--ui-text) !important;
+}
+
+/* Shared dark-mode surfaces for every template that extends base.html. */
+:root[data-theme="dark"] .container,
+:root[data-theme="dark"] .card,
+:root[data-theme="dark"] .card-body,
+:root[data-theme="dark"] .card-header,
+:root[data-theme="dark"] .card-footer,
+:root[data-theme="dark"] .content,
+:root[data-theme="dark"] .form-card,
+:root[data-theme="dark"] .form-container,
+:root[data-theme="dark"] .upload-container,
+:root[data-theme="dark"] .edit-container,
+:root[data-theme="dark"] .admin-content-container,
+:root[data-theme="dark"] .calendar-container,
+:root[data-theme="dark"] .table-container,
+:root[data-theme="dark"] .notice-card,
+:root[data-theme="dark"] .settings-card,
+:root[data-theme="dark"] .summary-card,
+:root[data-theme="dark"] .invoice-card,
+:root[data-theme="dark"] .student-card-form,
+:root[data-theme="dark"] .user-management-container,
+:root[data-theme="dark"] .error-container,
+:root[data-theme="dark"] .library-filter-panel,
+:root[data-theme="dark"] .library-items-table,
+:root[data-theme="dark"] .info-box {
+    background-color: var(--ui-surface) !important;
+    color: var(--ui-text) !important;
+    border-color: var(--ui-border) !important;
+}
+
+:root[data-theme="dark"] .table,
+:root[data-theme="dark"] .table-responsive,
+:root[data-theme="dark"] .table > :not(caption) > *,
+:root[data-theme="dark"] .table > :not(caption) > * > *,
+:root[data-theme="dark"] .library-items-table td,
+:root[data-theme="dark"] .library-items-table th {
+    background-color: var(--ui-surface) !important;
+    color: var(--ui-text) !important;
+    border-color: var(--ui-border) !important;
+}
+
+:root[data-theme="dark"] .table-striped > tbody > tr:nth-of-type(odd) > *,
+:root[data-theme="dark"] .table-light,
+:root[data-theme="dark"] .table-light > *,
+:root[data-theme="dark"] .bg-white,
+:root[data-theme="dark"] .bg-light,
+:root[data-theme="dark"] .bg-body,
+:root[data-theme="dark"] .bg-body-secondary {
+    background-color: var(--ui-surface-soft) !important;
+    color: var(--ui-text) !important;
+}
+
+:root[data-theme="dark"] .form-text,
+:root[data-theme="dark"] .text-muted,
+:root[data-theme="dark"] small,
+:root[data-theme="dark"] .library-load-hint {
+    color: var(--ui-text-muted) !important;
+}
+
+/* White translucent template decorations become stable, readable surfaces. */
+:root[data-theme="dark"] [style*="background: rgba(255,255,255"],
+:root[data-theme="dark"] [style*="background: rgba(255, 255, 255"],
+:root[data-theme="dark"] [style*="background-color: rgba(255,255,255"],
+:root[data-theme="dark"] [style*="background-color: rgba(255, 255, 255"] {
+    background-color: var(--ui-surface-soft) !important;
+    color: var(--ui-text) !important;
+}
@@ -1,12 +1,103 @@
 {% extends 'base.html' %}
 {% block title %}Audit Dashboard - {{ APP_VERSION }}{% endblock %}
 {% block content %}
+<style>
+  .audit-panel,
+  .audit-stat-card,
+  .audit-table-panel {
+    border: 1px solid var(--ui-border);
+    border-radius: 10px;
+    background: var(--ui-surface);
+    color: var(--ui-text);
+  }
+
+  .audit-panel p,
+  .audit-stat-label,
+  .audit-table-panel th {
+    color: var(--ui-text-muted);
+  }
+
+  .audit-table-panel {
+    padding: 12px;
+  }
+
+  .audit-table-scroll {
+    max-height: 560px;
+    overflow: auto;
+  }
+
+  .audit-table-panel table {
+    width: 100%;
+    border-collapse: collapse;
+  }
+
+  .audit-table-panel th,
+  .audit-table-panel td {
+    border-bottom: 1px solid var(--ui-border) !important;
+  }
+
+  .audit-table-panel tbody tr:hover td {
+    background: var(--ui-bg-accent) !important;
+  }
+
+  .audit-mismatch-panel {
+    border-color: #f87171;
+    background: #fff7f7;
+  }
+
+  :root[data-theme="dark"] .audit-info-panel {
+    background: #082f49 !important;
+    border-left-color: #38bdf8 !important;
+  }
+
+  :root[data-theme="dark"] .audit-info-panel p {
+    color: #bae6fd !important;
+  }
+
+  :root[data-theme="dark"] .audit-panel,
+  :root[data-theme="dark"] .audit-stat-card,
+  :root[data-theme="dark"] .audit-table-panel {
+    background: var(--ui-surface) !important;
+    color: var(--ui-text) !important;
+    border-color: var(--ui-border) !important;
+  }
+
+  :root[data-theme="dark"] .audit-mismatch-panel {
+    background: #451a1a !important;
+    border-color: #f87171 !important;
+  }
+
+  :root[data-theme="dark"] .audit-mismatch-panel h3 {
+    color: #fecaca !important;
+  }
+
+  :root[data-theme="dark"] .audit-table-panel th,
+  :root[data-theme="dark"] .audit-table-panel td,
+  :root[data-theme="dark"] .audit-table-panel pre {
+    color: var(--ui-text) !important;
+    border-color: var(--ui-border) !important;
+  }
+
+  @media (max-width: 700px) {
+    .audit-table-panel {
+      padding: 8px;
+    }
+
+    .audit-table-scroll {
+      overflow-x: auto;
+    }
+
+    .audit-table-panel table {
+      min-width: 720px;
+    }
+  }
+</style>
 <div class="container" style="max-width:1400px; margin:0 auto; padding:18px;">
  <h1>Audit Dashboard</h1>
  <p>Integritätsstatus der Audit-Chain und letzte Audit-Ereignisse (max. 200 Einträge).</p>

  <!-- Information Box for DIN 5008 Compliance -->
-  <div style="background:#e8f4f8; border-left:4px solid #0284c7; padding:12px; margin:0 0 16px 0; border-radius:4px;">
+  <div class="audit-panel audit-info-panel" style="background:#e8f4f8; border-left:4px solid #0284c7; padding:12px; margin:0 0 16px 0; border-radius:4px;">
    <p style="margin:0; font-size:0.95rem; color:#1e40af;">
      <strong>✓ Professionelle PDF-Exporte:</strong> Die neuen DIN 5008 konformen Berichte sind speziell für Schulträger, 
      Rechnungsprüfungsämter und Behörden optimiert. Sie enthalten Revisionssicherheit, Barrierefreiheit (BFSG) und 
@@ -16,7 +107,7 @@

  <div style="display:grid; grid-template-columns:1fr 1fr; gap:12px; margin:10px 0 18px;">
    <!-- PDF Export Section -->
-    <div style="padding:14px; border:1px solid #e2e8f0; border-radius:10px; background: var(--ui-surface);">
+    <div class="audit-panel" style="padding:14px; border:1px solid #e2e8f0; border-radius:10px; background: var(--ui-surface);">
      <h4 style="margin:0 0 10px 0; color:#1a1a1a;">📄 PDF-Export (DIN 5008 konform)</h4>
      <p style="margin:0 0 10px 0; font-size:0.9rem; color:#666;">Professionelle Berichte für Schulträger und Behörden</p>
      <div style="display:flex; gap:8px; flex-wrap:wrap;">
@@ -29,7 +120,7 @@
  </div>

  <div style="display:grid; grid-template-columns:repeat(auto-fit,minmax(220px,1fr)); gap:12px; margin:16px 0 20px;">
-    <div style="padding:14px; border:1px solid #e2e8f0; border-radius:10px; background: var(--ui-surface);">
+    <div class="audit-stat-card" style="padding:14px; border:1px solid #e2e8f0; border-radius:10px; background: var(--ui-surface);">
      <div style="font-size:0.85rem; color:#64748b;">Chain Status</div>
      {% if verify_result.ok %}
      <div style="font-size:1.35rem; font-weight:700; color:#166534;">OK</div>
@@ -37,11 +128,11 @@
      <div style="font-size:1.35rem; font-weight:700; color:#991b1b;">FEHLER</div>
      {% endif %}
    </div>
-    <div style="padding:14px; border:1px solid #e2e8f0; border-radius:10px; background: var(--ui-surface);">
+    <div class="audit-stat-card" style="padding:14px; border:1px solid #e2e8f0; border-radius:10px; background: var(--ui-surface);">
      <div style="font-size:0.85rem; color:#64748b;">Einträge</div>
      <div style="font-size:1.35rem; font-weight:700;">{{ verify_result.count }}</div>
    </div>
-    <div style="padding:14px; border:1px solid #e2e8f0; border-radius:10px; background: var(--ui-surface);">
+    <div class="audit-stat-card" style="padding:14px; border:1px solid #e2e8f0; border-radius:10px; background: var(--ui-surface);">
      <div style="font-size:0.85rem; color:#64748b;">Letzter Index</div>
      <div style="font-size:1.35rem; font-weight:700;">{{ verify_result.last_chain_index }}</div>
    </div>
@@ -52,7 +143,7 @@
  </div>

  {% if verify_result.mismatches %}
-  <div style="margin-bottom:20px; border:1px solid #fecaca; background:#fff7f7; border-radius:10px; padding:12px;">
+  <div class="audit-table-panel audit-mismatch-panel" style="margin-bottom:20px; border:1px solid #fecaca; background:#fff7f7; border-radius:10px; padding:12px;">
    <h3 style="margin-top:0; color:#991b1b;">Integritätsabweichungen</h3>
    <div style="max-height:280px; overflow:auto;">
      <table class="table" style="width:100%; border-collapse:collapse;">
@@ -79,9 +170,9 @@
  </div>
  {% endif %}

-  <div style="border:1px solid #e2e8f0; border-radius:10px; background: var(--ui-surface); padding:12px;">
+  <div class="audit-table-panel" style="border:1px solid #e2e8f0; border-radius:10px; background: var(--ui-surface); padding:12px;">
    <h3 style="margin-top:0;">Letzte Audit-Ereignisse</h3>
-    <div style="max-height:560px; overflow:auto;">
+    <div class="audit-table-scroll" style="max-height:560px; overflow:auto;">
      <table class="table" style="width:100%; border-collapse:collapse;">
        <thead>
          <tr>
@@ -78,15 +78,15 @@
                    <div class="form-row">
                        <div class="form-group">
                            <label for="filter_name_1">Name Filter 1</label>
-                            <input type="text" id="filter_name_1" name="filter_name_1" value="{{ filter_names.get('1', 'Fach/Kategorie') }}" placeholder="z. B. Fach/Kategorie">
+                            <input type="text" id="filter_name_1" name="filter_name_1" value="{{ filter_names.get('1', 'Klassenstufe') }}" placeholder="z. B. Klassenstufe">
                        </div>
                        <div class="form-group">
                            <label for="filter_name_2">Name Filter 2</label>
-                            <input type="text" id="filter_name_2" name="filter_name_2" value="{{ filter_names.get('2', 'System/Bereich') }}" placeholder="z. B. System/Bereich">
+                            <input type="text" id="filter_name_2" name="filter_name_2" value="{{ filter_names.get('2', 'Fach') }}" placeholder="z. B. Fach">
                        </div>
                        <div class="form-group">
                            <label for="filter_name_3">Name Filter 3</label>
-                            <input type="text" id="filter_name_3" name="filter_name_3" value="{{ filter_names.get('3', 'Typ/Art') }}" placeholder="z. B. Typ/Art">
+                            <input type="text" id="filter_name_3" name="filter_name_3" value="{{ filter_names.get('3', 'Schlagwort') }}" placeholder="z. B. Schlagwort">
                        </div>
                    </div>

@@ -120,9 +120,64 @@
                <p>Diese Angaben erscheinen künftig im amtlichen Audit-PDF und in anderen Behördenberichten.</p>
            </div>
        </div>
+
+        <!-- Danger Zone: Schuljahreswechsel -->
+        <div class="card danger-zone" style="grid-column: 1 / -1; border-color: #fca5a5;">
+            <div class="card-header" style="background: #fef2f2; border-bottom: 1px solid #fca5a5;">
+                <h2 style="color: #991b1b;">Erweiterte Aktionen</h2>
+            </div>
+            <div class="card-body" style="display: flex; justify-content: space-between; align-items: center; flex-wrap: wrap; gap: 15px;">
+                <div>
+                    <strong style="color: #7f1d1d; display: block; font-size: 1.05rem; margin-bottom: 4px;">Schuljahreswechsel durchführen</strong>
+                    <span style="color: #991b1b; font-size: 0.9rem;">Diese Aktion bereitet das System auf das neue Schuljahr vor (z. B. Hochstufen von Klassen).</span>
+                </div>
+                <button type="button"
+                        id="btn-rollover"
+                        class="btn btn-danger"
+                        onclick="triggerSchoolYearRollover()">
+                    Schuljahreswechsel auslösen
+                </button>
+            </div>
+        </div>
    </div>
 </div>

+<script>
+async function triggerSchoolYearRollover() {
+    if (!confirm('Möchtest du den Schuljahreswechsel wirklich durchführen? Dies kann nicht rückgängig gemacht werden!')) {
+        return;
+    }
+
+    const btn = document.getElementById('btn-rollover');
+    btn.disabled = true;
+    btn.textContent = 'Wird ausgeführt...';
+
+    try {
+        const response = await fetch('/admin/trigger_school_year_rollover', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            }
+        });
+
+        const data = await response.json();
+
+        if (response.ok && data.ok) {
+            alert('Schuljahreswechsel erfolgreich durchgeführt!\n\nZusammenfassung:\n' + JSON.stringify(data.summary, null, 2));
+            location.reload();
+        } else {
+            alert('Fehler: ' + (data.message || 'Schuljahreswechsel konnte nicht durchgeführt werden.'));
+        }
+    } catch (error) {
+        console.error('Rollover error:', error);
+        alert('Netzwerk- oder Serverfehler beim Ausführen des Schuljahreswechsels.');
+    } finally {
+        btn.disabled = false;
+        btn.textContent = 'Schuljahreswechsel auslösen';
+    }
+}
+</script>
+
 <style>
    .container {
        max-width: 1100px;
@@ -245,12 +300,17 @@
        cursor: pointer;
    }

+    .btn:disabled {
+        opacity: 0.6;
+        cursor: not-allowed;
+    }
+
    .btn-primary {
        background: #2563eb;
        color: #fff;
    }

-    .btn-primary:hover {
+    .btn-primary:hover:not(:disabled) {
        background: #1d4ed8;
        color: #fff;
    }
@@ -261,11 +321,21 @@
        border-color: #d1d5db;
    }

-    .btn-secondary:hover {
+    .btn-secondary:hover:not(:disabled) {
        background: #e5e7eb;
        color: #111827;
    }

+    .btn-danger {
+        background: #ef4444;
+        color: #fff;
+    }
+
+    .btn-danger:hover:not(:disabled) {
+        background: #dc2626;
+        color: #fff;
+    }
+
    .preview-card p {
        margin: 0 0 10px;
        line-height: 1.45;
@@ -283,5 +353,15 @@
            grid-template-columns: 1fr;
        }
    }
+
+    @media (max-width: 600px) {
+        .danger-zone .card-body {
+            flex-direction: column;
+            align-items: flex-start;
+        }
+        .danger-zone .btn {
+            width: 100%;
+        }
+    }
 </style>
-{% endblock %}
+{% endblock %}
@@ -1136,7 +1136,7 @@
                        </li>
                        {% endif %}
                        <li class="nav-item" data-nav-fixed="true">
-                            <button id="themeToggleBtn" class="btn btn-link nav-link px-3" aria-label="Dark Mode umschalten" title="Theme umschalten">
+                            <button type="button" class="btn btn-link nav-link px-3" data-theme-toggle aria-label="Dark Mode umschalten" aria-pressed="false" title="Theme umschalten">
                                <span class="theme-icon-light" style="display: none;">☀️</span>
                                <span class="theme-icon-dark" style="display: none;">🌙</span>
                            </button>
@@ -1229,7 +1229,7 @@
                        {% endif %}
                        {% endif %}
                        <li class="nav-item" data-nav-fixed="true">
-                            <button id="themeToggleBtn" class="btn btn-link nav-link px-3" aria-label="Dark Mode umschalten" title="Theme umschalten">
+                            <button type="button" class="btn btn-link nav-link px-3" data-theme-toggle aria-label="Dark Mode umschalten" aria-pressed="false" title="Theme umschalten">
                                <span class="theme-icon-light" style="display: none;">☀️</span>
                                <span class="theme-icon-dark" style="display: none;">🌙</span>
                            </button>
@@ -1358,7 +1358,7 @@
                        </li>
                        {% endif %}
                        <li class="nav-item" data-nav-fixed="true">
-                            <button id="themeToggleBtn" class="btn btn-link nav-link px-3" aria-label="Dark Mode umschalten" title="Theme umschalten">
+                            <button type="button" class="btn btn-link nav-link px-3" data-theme-toggle aria-label="Dark Mode umschalten" aria-pressed="false" title="Theme umschalten">
                                <span class="theme-icon-light" style="display: none;">☀️</span>
                                <span class="theme-icon-dark" style="display: none;">🌙</span>
                            </button>
@@ -1376,7 +1376,7 @@
                                <li><a class="dropdown-item" href="{{ url_for('mahnungen_admin') }}">Mahnungen</a></li>
                                {% endif %}
                                {% if student_cards_module_enabled %}
-                                {% if current_permissions.actions.get('can_manage_users', False) %}
+                                {% if current_permissions.actions.get('can_manage_settings', False) %}
                                <li><a class="dropdown-item" href="{{ url_for('student_cards_admin') }}">Bibliotheksausweis</a></li>
                                {% endif %}
                                {% endif %}
@@ -2345,33 +2345,56 @@

    <!-- Theme Toggle Script -->
    <script>
-        document.addEventListener('DOMContentLoaded', () => {
-            const toggleBtns = document.querySelectorAll('#themeToggleBtn');
-            if (toggleBtns.length === 0) return;
-            
-            function updateIcons(theme) {
-                const isDark = theme === 'dark';
-                document.querySelectorAll('.theme-icon-light').forEach(icon => icon.style.display = isDark ? 'inline' : 'none');
-                document.querySelectorAll('.theme-icon-dark').forEach(icon => icon.style.display = isDark ? 'none' : 'inline');
+        (function () {
+            const root = document.documentElement;
+            const metaThemeColor = document.getElementById('meta-theme-color');
+            const themeToggleSelector = '[data-theme-toggle]';
+
+            function getTheme() {
+                return root.getAttribute('data-theme') === 'dark' ? 'dark' : 'light';
            }

-            // Get current setup from initial script in head
-            let currentTheme = document.documentElement.getAttribute('data-theme') || 'light';
-            updateIcons(currentTheme);
+            function updateThemeUi(theme) {
+                const isDark = theme === 'dark';
+                document.querySelectorAll('.theme-icon-light').forEach(icon => {
+                    icon.style.display = isDark ? 'inline' : 'none';
+                });
+                document.querySelectorAll('.theme-icon-dark').forEach(icon => {
+                    icon.style.display = isDark ? 'none' : 'inline';
+                });
+                document.querySelectorAll(themeToggleSelector).forEach(button => {
+                    button.setAttribute('aria-pressed', String(isDark));
+                    button.setAttribute('aria-label', isDark ? 'Light Mode einschalten' : 'Dark Mode einschalten');
+                    button.setAttribute('title', isDark ? 'Light Mode einschalten' : 'Dark Mode einschalten');
+                });
+                if (metaThemeColor) {
+                    metaThemeColor.setAttribute('content', isDark ? '#1a252f' : '#2c3e50');
+                }
+            }

-            toggleBtns.forEach(btn => {
-                btn.addEventListener('click', (e) => {
-                    e.preventDefault();
-                    currentTheme = currentTheme === 'light' ? 'dark' : 'light';
-                    
-                    document.documentElement.setAttribute('data-theme', currentTheme);
-                    localStorage.setItem('inventarsystem-theme', currentTheme);
-                    document.getElementById('meta-theme-color').setAttribute('content', currentTheme === 'dark' ? '#1a252f' : '#2c3e50');
-                    
-                    updateIcons(currentTheme);
+            function applyTheme(theme, persist) {
+                const normalizedTheme = theme === 'dark' ? 'dark' : 'light';
+                root.setAttribute('data-theme', normalizedTheme);
+                if (persist) {
+                    try {
+                        localStorage.setItem('inventarsystem-theme', normalizedTheme);
+                    } catch (error) {
+                        console.warn('Theme konnte nicht gespeichert werden:', error);
+                    }
+                }
+                updateThemeUi(normalizedTheme);
+            }
+
+            document.addEventListener('DOMContentLoaded', function () {
+                updateThemeUi(getTheme());
+                document.addEventListener('click', function (event) {
+                    const button = event.target.closest(themeToggleSelector);
+                    if (!button) return;
+                    event.preventDefault();
+                    applyTheme(getTheme() === 'dark' ? 'light' : 'dark', true);
                });
            });
-        });
+        })();
    </script>
    <script>
        (function () {
@@ -2396,5 +2419,151 @@
        })();
    </script>

+    <style id="dark-mode-component-overrides">
+        :root[data-theme="dark"] .mahnungen-head,
+        :root[data-theme="dark"] .mahnungen-card,
+        :root[data-theme="dark"] .tutorial-side,
+        :root[data-theme="dark"] .workflow-step,
+        :root[data-theme="dark"] .tutorial-note,
+        :root[data-theme="dark"] .tutorial-tooltip-toggle,
+        :root[data-theme="dark"] .bulk-delete-drawer,
+        :root[data-theme="dark"] .filter-group,
+        :root[data-theme="dark"] .filter-dropdown,
+        :root[data-theme="dark"] .calendar-wrapper,
+        :root[data-theme="dark"] .calendar-day-details,
+        :root[data-theme="dark"] .cal-booking-item,
+        :root[data-theme="dark"] .edit-form,
+        :root[data-theme="dark"] .password-change-form,
+        :root[data-theme="dark"] .upload-form,
+        :root[data-theme="dark"] .book-info-container,
+        :root[data-theme="dark"] .student-card-form,
+        :root[data-theme="dark"] .user-management-container {
+            background: var(--ui-surface) !important;
+            background-color: var(--ui-surface) !important;
+            color: var(--ui-text) !important;
+            border-color: var(--ui-border) !important;
+        }
+
+        :root[data-theme="dark"] .mahnungen-table th,
+        :root[data-theme="dark"] .calendar-header,
+        :root[data-theme="dark"] .filter-inputs,
+        :root[data-theme="dark"] .items-loading-indicator,
+        :root[data-theme="dark"] .detail-group.full-width .detail-value,
+        :root[data-theme="dark"] .library-filter-panel,
+        :root[data-theme="dark"] .card-header,
+        :root[data-theme="dark"] .modal-header,
+        :root[data-theme="dark"] .modal-footer {
+            background: var(--ui-surface-soft) !important;
+            background-color: var(--ui-surface-soft) !important;
+            color: var(--ui-text) !important;
+            border-color: var(--ui-border) !important;
+        }
+
+        :root[data-theme="dark"] .mahnungen-table tr:hover td,
+        :root[data-theme="dark"] .filter-option:hover,
+        :root[data-theme="dark"] .calendar-header button:hover,
+        :root[data-theme="dark"] .workflow-nav button:hover {
+            background: var(--ui-bg-accent) !important;
+            background-color: var(--ui-bg-accent) !important;
+        }
+
+        :root[data-theme="dark"] .mahnungen-head h1,
+        :root[data-theme="dark"] .tutorial-side h2,
+        :root[data-theme="dark"] .workflow-step h3,
+        :root[data-theme="dark"] .calendar-header span,
+        :root[data-theme="dark"] .calendar-day-details h5,
+        :root[data-theme="dark"] .detail-value,
+        :root[data-theme="dark"] .cal-booking-time,
+        :root[data-theme="dark"] .cal-booking-user,
+        :root[data-theme="dark"] .cal-booking-note,
+        :root[data-theme="dark"] .form-group label,
+        :root[data-theme="dark"] .page-header h1,
+        :root[data-theme="dark"] .card-header h2 {
+            color: var(--ui-title) !important;
+        }
+
+        :root[data-theme="dark"] .mahnungen-head p,
+        :root[data-theme="dark"] .tutorial-side p,
+        :root[data-theme="dark"] .workflow-step p,
+        :root[data-theme="dark"] .workflow-step li,
+        :root[data-theme="dark"] .tutorial-tooltip-toggle label,
+        :root[data-theme="dark"] .tooltip-description,
+        :root[data-theme="dark"] .page-header p,
+        :root[data-theme="dark"] .form-group small,
+        :root[data-theme="dark"] .cal-booking-label,
+        :root[data-theme="dark"] .cal-empty-state {
+            color: var(--ui-text-muted) !important;
+        }
+
+        :root[data-theme="dark"] .workflow-nav button,
+        :root[data-theme="dark"] .bulk-delete-actions button,
+        :root[data-theme="dark"] .filter-toggle,
+        :root[data-theme="dark"] .clear-filter {
+            background: var(--ui-surface-soft) !important;
+            background-color: var(--ui-surface-soft) !important;
+            color: var(--ui-text) !important;
+            border-color: var(--ui-border) !important;
+        }
+
+        :root[data-theme="dark"] .workflow-nav button.active,
+        :root[data-theme="dark"] .filter-toggle.is-open {
+            background: #1d4ed8 !important;
+            color: #ffffff !important;
+            border-color: #60a5fa !important;
+        }
+
+        :root[data-theme="dark"] .badge-light,
+        :root[data-theme="dark"] .badge.bg-light,
+        :root[data-theme="dark"] .badge.bg-secondary,
+        :root[data-theme="dark"] .filter-tag,
+        :root[data-theme="dark"] .tutorial-pill {
+            background: var(--ui-surface-soft) !important;
+            color: var(--ui-text) !important;
+            border-color: var(--ui-border) !important;
+        }
+
+        :root[data-theme="dark"] .form-control,
+        :root[data-theme="dark"] .form-select,
+        :root[data-theme="dark"] input,
+        :root[data-theme="dark"] select,
+        :root[data-theme="dark"] textarea {
+            background-color: var(--ui-bg) !important;
+            color: var(--ui-text) !important;
+            border-color: var(--ui-border) !important;
+        }
+
+        :root[data-theme="dark"] ::placeholder {
+            color: #b7c4d6 !important;
+            opacity: 1 !important;
+        }
+
+        :root[data-theme="dark"] .modal-content,
+        :root[data-theme="dark"] .modal-dialog-white,
+        :root[data-theme="dark"] .modal-body,
+        :root[data-theme="dark"] .modal-content-margin {
+            background: var(--ui-overlay-surface) !important;
+            background-color: var(--ui-overlay-surface) !important;
+            color: var(--ui-text) !important;
+            border-color: var(--ui-overlay-border) !important;
+        }
+
+        :root[data-theme="dark"] .modal-content h1,
+        :root[data-theme="dark"] .modal-content h2,
+        :root[data-theme="dark"] .modal-content h3,
+        :root[data-theme="dark"] .modal-content h4,
+        :root[data-theme="dark"] .modal-content h5,
+        :root[data-theme="dark"] .modal-content h6,
+        :root[data-theme="dark"] .modal-content label,
+        :root[data-theme="dark"] .modal-content p,
+        :root[data-theme="dark"] .modal-content span {
+            color: var(--ui-text) !important;
+        }
+
+        :root[data-theme="dark"] .guest-impressum-footer a {
+            color: #dbeafe !important;
+            border-bottom-color: #93c5fd !important;
+        }
+    </style>
+
 </body>
 </html>
@@ -274,7 +274,7 @@
            {% if not show_library_features %}
            <!-- ================= SYSTEM FILTERS 1-3 (INVENTORY / OTHER ITEMS ONLY) ================= -->
            <div class="filter-inputs">
-                <h3>Unterrichtsfach (Filter 1):</h3>
+                <h3>{{ filter_names.get('1', 'Jahrgangsstufe') }}</h3>
                <div class="multi-filter">
                    {% for idx in range(4) %}
                    <div class="form-group">
@@ -286,7 +286,7 @@
                    {% endfor %}
                </div>

-                <h3>Jahrgangsstufe (Filter 2):</h3>
+                <h3>{{ filter_names.get('2', 'Fachgebiet') }}</h3>
                <div class="multi-filter">
                    {% for idx in range(4) %}
                    <div class="form-group">
@@ -298,7 +298,7 @@
                    {% endfor %}
                </div>

-                <h3>Schlagwort (Filter 3):</h3>
+                <h3>{{ filter_names.get('3', 'Schlagwort') }}</h3>
                <div class="multi-filter">
                    {% for idx in range(4) %}
                    <div class="form-group">
@@ -122,7 +122,7 @@
    letter-spacing: 0.04em;
    color: #64748b;
    background: var(--ui-surface-soft);
-    user-select: none; /* Verhindert Textmarkierung beim Klicken */
+    user-select: none;
  }

  .library-table tr:hover td {
@@ -151,7 +151,7 @@
  .badge-open { background: #fee2e2; color: #991b1b; }
  .badge-paid { background: #dcfce7; color: #166534; }
  .badge-damaged { background: #fee2e2; color: #991b1b; }
-  .badge-class { background: #f1f5f9; color: #475569; border: 1px solid #cbd5e1; } /* Neues Badge für Klasse */
+  .badge-class { background: #f1f5f9; color: #475569; border: 1px solid #cbd5e1; }

  .row-actions {
    display: flex;
@@ -168,6 +168,32 @@
    white-space: nowrap;
  }

+  .row-actions .btn-outline-danger {
+    color: #dc2626;
+    background-color: #fef2f2; /* Light red tint so it doesn't blend into the white table */
+    border: 2px solid #dc2626; /* Thicker, clear border */
+    padding: 6px 14px;
+    border-radius: 6px;
+    font-weight: bold;
+    font-size: 0.85rem;
+    cursor: pointer;
+    box-shadow: 0 2px 4px rgba(220, 38, 38, 0.1); /* Subtle shadow for depth */
+    transition: all 0.2s ease;
+  }
+
+  .row-actions .btn-outline-danger:hover {
+    background-color: #dc2626;
+    color: #ffffff;
+    box-shadow: 0 4px 8px rgba(220, 38, 38, 0.25);
+    transform: translateY(-1px); /* Slight lift effect on hover */
+  }
+
+  .row-actions .btn-outline-danger:active {
+    transform: translateY(0);
+    box-shadow: 0 1px 2px rgba(220, 38, 38, 0.15); /* Pressed state */
+  }
+  /* ------------------------------------------------------ */
+
  .muted {
    color: #6b7280;
    font-size: 0.92rem;
@@ -179,6 +205,122 @@
    color: #6b7280;
  }

+  :root[data-theme="dark"] .library-admin-hero {
+    background: linear-gradient(135deg, #172554 0%, #1e293b 100%);
+    border-color: var(--ui-border);
+    box-shadow: var(--ui-shadow-md);
+  }
+
+  :root[data-theme="dark"] .library-admin-hero p,
+  :root[data-theme="dark"] .summary-card .label,
+  :root[data-theme="dark"] .muted,
+  :root[data-theme="dark"] .empty-state {
+    color: var(--ui-text-muted) !important;
+  }
+
+  :root[data-theme="dark"] .summary-card,
+  :root[data-theme="dark"] .panel {
+    background: var(--ui-surface) !important;
+    color: var(--ui-text) !important;
+    border-color: var(--ui-border) !important;
+    box-shadow: var(--ui-shadow-sm);
+  }
+
+  :root[data-theme="dark"] .summary-card .value,
+  :root[data-theme="dark"] .panel h2 {
+    color: var(--ui-title) !important;
+  }
+
+  :root[data-theme="dark"] .filter-bar input,
+  :root[data-theme="dark"] .filter-bar select {
+    background: var(--ui-bg) !important;
+    color: var(--ui-text) !important;
+    border-color: var(--ui-border) !important;
+  }
+
+  :root[data-theme="dark"] .filter-bar input:focus,
+  :root[data-theme="dark"] .filter-bar select:focus {
+    outline: none;
+    border-color: #60a5fa !important;
+    box-shadow: 0 0 0 3px rgba(96, 165, 250, 0.22);
+  }
+
+  :root[data-theme="dark"] .library-table,
+  :root[data-theme="dark"] .library-table td {
+    background: var(--ui-surface) !important;
+    color: var(--ui-text) !important;
+    border-color: var(--ui-border) !important;
+  }
+
+  :root[data-theme="dark"] .library-table th {
+    background: var(--ui-surface-soft) !important;
+    color: var(--ui-text-muted) !important;
+    border-color: var(--ui-border) !important;
+  }
+
+  :root[data-theme="dark"] .library-table tr:hover td {
+    background: var(--ui-bg-accent) !important;
+  }
+
+  :root[data-theme="dark"] .badge-active {
+    background: #172554;
+    color: #bfdbfe;
+  }
+
+  :root[data-theme="dark"] .badge-planned {
+    background: #422006;
+    color: #fde68a;
+  }
+
+  :root[data-theme="dark"] .badge-completed,
+  :root[data-theme="dark"] .badge-paid {
+    background: #123524;
+    color: #b7f7ce;
+  }
+
+  :root[data-theme="dark"] .badge-open,
+  :root[data-theme="dark"] .badge-damaged {
+    background: #451a1a;
+    color: #fecaca;
+  }
+
+  :root[data-theme="dark"] .badge-class {
+    background: var(--ui-surface-soft);
+    color: var(--ui-text);
+    border-color: var(--ui-border);
+  }
+
+  :root[data-theme="dark"] .row-actions .btn-outline-danger {
+    background: #451a1a;
+    color: #fca5a5;
+    border-color: #f87171;
+  }
+
+  :root[data-theme="dark"] .row-actions .btn-outline-danger:hover {
+    background: #dc2626;
+    color: #ffffff;
+  }
+
+  :root[data-theme="dark"] #damage-invoice-modal > div,
+  :root[data-theme="dark"] #repair-action-modal > div {
+    background: var(--ui-overlay-surface) !important;
+    color: var(--ui-text) !important;
+    border: 1px solid var(--ui-overlay-border);
+  }
+
+  :root[data-theme="dark"] #damage-invoice-modal input,
+  :root[data-theme="dark"] #damage-invoice-modal textarea,
+  :root[data-theme="dark"] #repair-action-modal input {
+    background: var(--ui-bg) !important;
+    color: var(--ui-text) !important;
+    border-color: var(--ui-border) !important;
+  }
+
+  :root[data-theme="dark"] #damage-invoice-modal p,
+  :root[data-theme="dark"] #repair-action-modal p {
+    color: var(--ui-text-muted) !important;
+  }
+
  @media (max-width: 900px) {
    .library-admin-hero {
      flex-direction: column;
@@ -193,6 +335,11 @@
      overflow-x: auto;
      white-space: nowrap;
    }
+
+    .library-admin-shell {
+      padding-left: 10px;
+      padding-right: 10px;
+    }
  }
 </style>

@@ -112,7 +112,73 @@
    padding: 36px 20px;
  }

+  :root[data-theme="dark"] .invoice-history-head {
+    background: linear-gradient(135deg, #172554 0%, #1e293b 100%);
+    border-color: var(--ui-border);
+    box-shadow: var(--ui-shadow-md);
+  }
+
+  :root[data-theme="dark"] .head-meta,
+  :root[data-theme="dark"] .muted,
+  :root[data-theme="dark"] .empty-state {
+    color: var(--ui-text-muted) !important;
+  }
+
+  :root[data-theme="dark"] .section-header {
+    color: var(--ui-title) !important;
+  }
+
+  :root[data-theme="dark"] .invoice-card {
+    background: var(--ui-surface) !important;
+    color: var(--ui-text) !important;
+    border-color: var(--ui-border) !important;
+    box-shadow: var(--ui-shadow-sm);
+  }
+
+  :root[data-theme="dark"] .invoice-table,
+  :root[data-theme="dark"] .invoice-table td {
+    background: var(--ui-surface) !important;
+    color: var(--ui-text) !important;
+    border-color: var(--ui-border) !important;
+  }
+
+  :root[data-theme="dark"] .invoice-table th {
+    background: var(--ui-surface-soft) !important;
+    color: var(--ui-text-muted) !important;
+    border-color: var(--ui-border) !important;
+  }
+
+  :root[data-theme="dark"] .invoice-table tr:hover td {
+    background: var(--ui-bg-accent) !important;
+  }
+
+  :root[data-theme="dark"] .badge-open {
+    background: #451a1a;
+    color: #fecaca;
+  }
+
+  :root[data-theme="dark"] .badge-paid,
+  :root[data-theme="dark"] .badge-completed {
+    background: #123524;
+    color: #b7f7ce;
+  }
+
+  :root[data-theme="dark"] .badge-active {
+    background: #172554;
+    color: #bfdbfe;
+  }
+
+  :root[data-theme="dark"] .badge-planned {
+    background: #422006;
+    color: #fde68a;
+  }
+
  @media (max-width: 900px) {
+    .invoice-history-shell {
+      padding-left: 10px;
+      padding-right: 10px;
+    }
+
    .invoice-table {
      display: block;
      overflow-x: auto;
@@ -95,10 +95,18 @@
        flex: 1;
        min-width: 250px;
        padding: 12px 16px;
-        border: 1px solid #ddd;
-        border-radius: 6px;
+        border: 1px solid var(--ui-border);
+        border-radius: 10px;
        font-size: 16px;
-        background: #fff;
+        background: var(--ui-surface);
+        color: var(--ui-text);
+        transition: border-color 0.2s ease, box-shadow 0.2s ease;
+    }
+
+    .library-search-input:focus {
+        outline: none;
+        border-color: #60a5fa;
+        box-shadow: 0 0 0 3px rgba(96, 165, 250, 0.2);
    }

    .library-scan-panel {
@@ -138,34 +146,35 @@
    /* Filters */
    .library-filter-toggle-btn {
        padding: 10px 16px;
-        background: #f0f2f5;
-        border: 1px solid #ddd;
-        border-radius: 6px;
-        font-weight: 500;
+        background: var(--ui-surface-soft);
+        border: 1px solid var(--ui-border);
+        border-radius: 10px;
+        font-weight: 700;
        color: var(--ui-text);
        cursor: pointer;
-        transition: all 0.2s ease;
+        transition: background-color 0.2s ease, border-color 0.2s ease, box-shadow 0.2s ease;
    }

    .library-filter-toggle-btn:hover {
-        background: #e4e6eb;
-        border-color: #999;
+        background: var(--ui-bg-accent);
+        border-color: #60a5fa;
    }

    .library-filter-toggle-btn.active {
-        background: #e0e7ff;
-        border-color: #4f46e5;
-        color: #4f46e5;
+        background: var(--module-primary-color);
+        border-color: var(--module-primary-color);
+        color: #ffffff;
+        box-shadow: 0 0 0 3px var(--module-accent-light);
    }

    .library-filter-panel {
        display: none;
-        background: #fff;
-        border: 1px solid #ddd;
-        border-radius: 8px;
-        padding: 20px;
+        background: var(--ui-surface);
+        border: 1px solid var(--ui-border);
+        border-radius: 12px;
+        padding: 18px;
        margin-bottom: 20px;
-        box-shadow: 0 2px 8px rgba(0,0,0,0.08);
+        box-shadow: var(--ui-shadow-sm);
    }

    .library-filter-panel.open {
@@ -198,34 +207,53 @@
    .filter-item input,
    .filter-item select {
        padding: 8px 12px;
-        border: 1px solid #ddd;
-        border-radius: 4px;
+        border: 1px solid var(--ui-border);
+        border-radius: 8px;
        font-size: 14px;
-        background: #fff;
+        background: var(--ui-bg);
+        color: var(--ui-text);
        transition: border-color 0.2s ease, box-shadow 0.2s ease;
    }

    .filter-item input:focus,
    .filter-item select:focus {
        outline: none;
-        border-color: #4f46e5;
-        box-shadow: 0 0 0 2px rgba(79, 70, 229, 0.1);
+        border-color: #60a5fa;
+        box-shadow: 0 0 0 3px rgba(96, 165, 250, 0.2);
    }

    .filter-buttons {
        display: flex;
+        flex-wrap: wrap;
        gap: 10px;
        margin-top: 15px;
        padding-top: 15px;
-        border-top: 1px solid #eee;
+        border-top: 1px solid var(--ui-border);
    }

    .filter-buttons .button {
-        flex: 1;
+        flex: 0 1 auto;
        padding: 8px 16px;
        font-size: 14px;
    }

+    #clearFilterBtn {
+        background: var(--ui-surface-soft) !important;
+        color: var(--ui-text) !important;
+        border-color: var(--ui-border) !important;
+    }
+
+    .filter-buttons > div[style*="flex-grow"] {
+        flex: 1 1 100%;
+        min-width: 12px;
+    }
+
+    @media (min-width: 900px) {
+        .filter-buttons > div[style*="flex-grow"] {
+            flex: 1 1 auto;
+        }
+    }
+
    /* =========================================
       4. Tables & Data Display
       ========================================= */
@@ -451,6 +479,27 @@
        height: 100%;
    }

+    .physical-scanner-modal {
+        z-index: 1100;
+    }
+
+    .physical-scanner-modal .modal-content {
+        max-width: 520px;
+        text-align: center;
+    }
+
+    .physical-scanner-code {
+        min-height: 28px;
+        margin: 18px 0 8px;
+        padding: 12px;
+        border: 1px dashed #cbd5e1;
+        border-radius: 6px;
+        color: var(--ui-text);
+        font-family: monospace;
+        font-size: 1.2em;
+        letter-spacing: 2px;
+    }
+

    .detail-gallery-container {
        display: flex;
@@ -518,10 +567,9 @@
        <input type="text" id="manualItemCode" placeholder="Manueller Mediencode (optional)" style="min-width:180px;">
        <button id="resetCardBtn" class="button" type="button">Feld zurücksetzen</button>
        <button id="toggleScannerBtn" class="button" type="button">Scanner starten</button>
-        <label style="display:flex; align-items:center; gap:8px; margin-left:6px;">
-            <input type="checkbox" id="keyboardScannerToggle">
-            <span style="font-size:0.9em;">Physischer Scanner</span>
-        </label>
+        <button id="physicalScannerBtn" class="button" type="button" style="margin-left:6px;">
+            Physischer Scanner starten
+        </button>
        <button id="manualActionBtn" class="button" type="button" style="margin-left:6px; background:#4f46e5; color:white;">Code verarbeiten</button>
    </div>
    <div class="library-scan-reader-wrap" id="scanReaderWrap" style="display: none; margin-top: 15px;">
@@ -612,8 +660,213 @@
        <div id="detailContent"></div>
    </div>
 </div>
+<div id="physicalScannerModal" class="modal physical-scanner-modal" style="display: none;" role="dialog" aria-modal="true" aria-labelledby="physicalScannerTitle">
+    <div class="modal-content">
+        <span class="close" id="closePhysicalScannerBtn" role="button" tabindex="0" aria-label="Physischen Scanner schließen">&times;</span>
+        <h2 id="physicalScannerTitle">Physischer Scanner</h2>
+        <p id="physicalScannerInstruction">Scanner ist bereit. Bitte den angezeigten Code scannen.</p>
+        <div id="physicalScannerCode" class="physical-scanner-code" tabindex="0" aria-label="Eingehender Scan" aria-live="polite"></div>
+        <p id="physicalScannerStatus" class="library-scan-status" aria-live="polite">Warte auf Scan...</p>
+        <button id="stopPhysicalScannerBtn" class="button" type="button">Scanner schließen</button>
+    </div>
+</div>
 <script src="https://cdn.jsdelivr.net/npm/@ericblade/quagga2/dist/quagga.js"></script>
 <script>
+
+    // =========================================================================
+    // CUSTOM MODAL HELPERS (Replaces native browser alert, confirm & prompt)
+    // =========================================================================
+    function createModalOverlay() {
+        const overlay = document.createElement('div');
+        overlay.className = 'ui-modal-overlay';
+        overlay.style.position = 'fixed';
+        overlay.style.top = '0';
+        overlay.style.left = '0';
+        overlay.style.width = '100vw';
+        overlay.style.height = '100vh';
+        overlay.style.backgroundColor = 'rgba(0, 0, 0, 0.6)';
+        overlay.style.display = 'flex';
+        overlay.style.alignItems = 'center';
+        overlay.style.justifyContent = 'center';
+        overlay.style.zIndex = '999999';
+        return overlay;
+    }
+
+    function createModalBox() {
+        const box = document.createElement('div');
+        box.className = 'ui-modal-surface';
+        box.style.backgroundColor = '#fff';
+        box.style.padding = '24px';
+        box.style.borderRadius = '8px';
+        box.style.boxShadow = '0 10px 25px rgba(0,0,0,0.2)';
+        box.style.fontFamily = 'sans-serif';
+        box.style.minWidth = '320px';
+        box.style.maxWidth = '90%';
+        box.style.textAlign = 'left';
+        box.style.color = '#333';
+        return box;
+    }
+
+    function customAlert(message) {
+        return new Promise((resolve) => {
+            const overlay = createModalOverlay();
+            const box = createModalBox();
+
+            const text = document.createElement('p');
+            text.textContent = message;
+            text.style.marginBottom = '20px';
+            text.style.lineHeight = '1.5';
+            text.style.whiteSpace = 'pre-wrap';
+
+            const btnContainer = document.createElement('div');
+            btnContainer.style.display = 'flex';
+            btnContainer.style.justifyContent = 'flex-end';
+
+            const btn = document.createElement('button');
+            btn.textContent = 'OK';
+            btn.style.padding = '8px 16px';
+            btn.style.cursor = 'pointer';
+            btn.style.border = 'none';
+            btn.style.backgroundColor = '#007bff';
+            btn.style.color = '#fff';
+            btn.style.borderRadius = '4px';
+
+            btn.onclick = () => {
+                document.body.removeChild(overlay);
+                resolve();
+            };
+
+            btnContainer.appendChild(btn);
+            box.appendChild(text);
+            box.appendChild(btnContainer);
+            overlay.appendChild(box);
+            document.body.appendChild(overlay);
+            btn.focus();
+        });
+    }
+
+    function customConfirm(message) {
+        return new Promise((resolve) => {
+            const overlay = createModalOverlay();
+            const box = createModalBox();
+
+            const text = document.createElement('p');
+            text.textContent = message;
+            text.style.marginBottom = '20px';
+            text.style.lineHeight = '1.5';
+            text.style.whiteSpace = 'pre-wrap';
+
+            const btnContainer = document.createElement('div');
+            btnContainer.style.display = 'flex';
+            btnContainer.style.justifyContent = 'flex-end';
+            btnContainer.style.gap = '10px';
+
+            const cancelBtn = document.createElement('button');
+            cancelBtn.textContent = 'Abbrechen';
+            cancelBtn.style.padding = '8px 16px';
+            cancelBtn.style.cursor = 'pointer';
+            cancelBtn.style.border = '1px solid #ccc';
+            cancelBtn.style.backgroundColor = '#f8f9fa';
+            cancelBtn.style.color = '#333';
+            cancelBtn.style.borderRadius = '4px';
+
+            const okBtn = document.createElement('button');
+            okBtn.textContent = 'OK';
+            okBtn.style.padding = '8px 16px';
+            okBtn.style.cursor = 'pointer';
+            okBtn.style.border = 'none';
+            okBtn.style.backgroundColor = '#007bff';
+            okBtn.style.color = '#fff';
+            okBtn.style.borderRadius = '4px';
+
+            const closeAndResolve = (val) => {
+                document.body.removeChild(overlay);
+                resolve(val);
+            };
+
+            cancelBtn.onclick = () => closeAndResolve(false);
+            okBtn.onclick = () => closeAndResolve(true);
+
+            btnContainer.appendChild(cancelBtn);
+            btnContainer.appendChild(okBtn);
+            box.appendChild(text);
+            box.appendChild(btnContainer);
+            overlay.appendChild(box);
+            document.body.appendChild(overlay);
+            okBtn.focus();
+        });
+    }
+
+    function customPrompt(message, defaultValue = '') {
+        return new Promise((resolve) => {
+            const overlay = createModalOverlay();
+            const box = createModalBox();
+
+            const text = document.createElement('p');
+            text.textContent = message;
+            text.style.marginBottom = '15px';
+            text.style.lineHeight = '1.5';
+            text.style.whiteSpace = 'pre-wrap';
+
+            const input = document.createElement('input');
+            input.type = 'text';
+            input.value = defaultValue;
+            input.style.width = '100%';
+            input.style.marginBottom = '20px';
+            input.style.padding = '10px';
+            input.style.boxSizing = 'border-box';
+            input.style.border = '1px solid #ccc';
+            input.style.borderRadius = '4px';
+
+            const btnContainer = document.createElement('div');
+            btnContainer.style.display = 'flex';
+            btnContainer.style.justifyContent = 'flex-end';
+            btnContainer.style.gap = '10px';
+
+            const cancelBtn = document.createElement('button');
+            cancelBtn.textContent = 'Abbrechen';
+            cancelBtn.style.padding = '8px 16px';
+            cancelBtn.style.cursor = 'pointer';
+            cancelBtn.style.border = '1px solid #ccc';
+            cancelBtn.style.backgroundColor = '#f8f9fa';
+            cancelBtn.style.color = '#333';
+            cancelBtn.style.borderRadius = '4px';
+
+            const okBtn = document.createElement('button');
+            okBtn.textContent = 'OK';
+            okBtn.style.padding = '8px 16px';
+            okBtn.style.cursor = 'pointer';
+            okBtn.style.border = 'none';
+            okBtn.style.backgroundColor = '#007bff';
+            okBtn.style.color = '#fff';
+            okBtn.style.borderRadius = '4px';
+
+            const closeAndResolve = (val) => {
+                document.body.removeChild(overlay);
+                resolve(val);
+            };
+
+            cancelBtn.onclick = () => closeAndResolve(null);
+            okBtn.onclick = () => closeAndResolve(input.value);
+
+            input.onkeydown = (e) => {
+                if (e.key === 'Enter') closeAndResolve(input.value);
+                if (e.key === 'Escape') closeAndResolve(null);
+            };
+
+            btnContainer.appendChild(cancelBtn);
+            btnContainer.appendChild(okBtn);
+
+            box.appendChild(text);
+            box.appendChild(input);
+            box.appendChild(btnContainer);
+            overlay.appendChild(box);
+            document.body.appendChild(overlay);
+
+            input.focus();
+            input.select();
+        });
+    }
    // =========================================================================
    // 1. GLOBAL STATE DEFINITIONS
    // =========================================================================
@@ -649,7 +902,10 @@
    let keyboardScannerEnabled = false;
    let keyboardScanBuffer = '';
    let keyboardLastKeyAt = 0;
-    const KEYBOARD_SCAN_INTERCHAR_MS = 100; // max time between keystrokes to consider them one scan
+    let physicalScannerModalOpen = false;
+    const KEYBOARD_SCAN_INTERCHAR_MS = 500; // max time between slower scanner keystrokes
+    const physicalScanQueue = [];
+    let keyboardScanProcessing = false;
    let editLibraryState = {
        itemId: '',
        seriesGroupId: '',
@@ -884,7 +1140,7 @@
                    name: "Live",
                    type: "LiveStream",
                    // This MUST match the inner div where the video should appear
-                    target: document.querySelector('.library-scan-reader'), 
+                    target: document.querySelector('.library-scan-reader'),
                    constraints: {
                        width: 640,
                        height: 480,
@@ -897,7 +1153,7 @@
                },
                decoder: {
                    // Keep only the barcode types you actually use to improve performance
-                    readers: ["code_128_reader", "ean_reader", "code_39_reader"] 
+                    readers: ["code_128_reader", "ean_reader", "code_39_reader"]
                },
                locate: true
            }, function(err) {
@@ -991,29 +1247,86 @@
    // =========================================================================
    // Keyboard scanner handling (physical scanners that send chars then Enter)
    // =========================================================================
+    function getPhysicalScannerInstruction() {
+        const mode = document.getElementById('scanModeSelect')?.value || 'card_only';
+        if (mode === 'return_only') return 'Hinweis: Benötigt wird ein Mediencode zur Rückgabe.';
+        if (mode === 'card_only') return 'Hinweis: Benötigt wird ein Bibliotheksausweis.';
+        if (mode === 'quick_toggle' && !activeStudentCardId) {
+            return 'Hinweis: Zuerst wird ein Bibliotheksausweis benötigt.';
+        }
+        if (mode === 'quick_toggle') return 'Hinweis: Jetzt wird ein Mediencode benötigt.';
+        if (mode === 'continuous' && !activeStudentCardId) {
+            return 'Hinweis: Zuerst wird ein Bibliotheksausweis benötigt.';
+        }
+        return 'Hinweis: Jetzt wird der nächste Mediencode benötigt.';
+    }
+
+    function updatePhysicalScannerModal(message, kind = '') {
+        const instruction = document.getElementById('physicalScannerInstruction');
+        const status = document.getElementById('physicalScannerStatus');
+        if (instruction) instruction.textContent = getPhysicalScannerInstruction();
+        if (status) {
+            status.textContent = message;
+            status.classList.remove('ok', 'warn', 'error');
+            if (kind) status.classList.add(kind);
+        }
+    }
+
+    function openPhysicalScannerModal() {
+        const modal = document.getElementById('physicalScannerModal');
+        if (!modal) return;
+
+        physicalScannerModalOpen = true;
+        keyboardScannerEnabled = true;
+        keyboardScanBuffer = '';
+        keyboardLastKeyAt = 0;
+        modal.style.display = 'flex';
+        updatePhysicalScannerModal('Warte auf Scan...', 'warn');
+        document.addEventListener('keydown', keyboardScanKeydownHandler);
+        document.getElementById('physicalScannerCode')?.focus();
+    }
+
+    function closePhysicalScannerModal() {
+        physicalScannerModalOpen = false;
+        keyboardScannerEnabled = false;
+        keyboardScanBuffer = '';
+        keyboardLastKeyAt = 0;
+        document.removeEventListener('keydown', keyboardScanKeydownHandler);
+        const modal = document.getElementById('physicalScannerModal');
+        if (modal) modal.style.display = 'none';
+        const code = document.getElementById('physicalScannerCode');
+        if (code) code.textContent = '';
+    }
+
    function keyboardScanKeydownHandler(e) {
        // Only active when explicitly enabled
-        if (!keyboardScannerEnabled) return;
+        if (!keyboardScannerEnabled || !physicalScannerModalOpen) return;

-        // Ignore if focus is in an input/textarea/contenteditable to avoid interfering with typing
-        const active = document.activeElement;
-        if (active && (active.tagName === 'INPUT' || active.tagName === 'TEXTAREA' || active.isContentEditable)) return;
+        if (e.key === 'Escape') {
+            e.preventDefault();
+            closePhysicalScannerModal();
+            return;
+        }

        const now = Date.now();

        // If Enter/Return pressed -> finalize buffer
        if (e.key === 'Enter') {
+            e.preventDefault();
            const code = keyboardScanBuffer.trim();
            keyboardScanBuffer = '';
            keyboardLastKeyAt = 0;
            if (!code) return;

-            // Process exactly like a camera scan - centralized logic handles the rest!
-            handleScanSuccess(code);
+            // Scanner keystrokes must not be submitted into the focused form field.
+            const displayCode = document.getElementById('physicalScannerCode');
+            if (displayCode) displayCode.textContent = code;
+            updatePhysicalScannerModal('Enter erkannt. Code wird verarbeitet...', 'warn');
+            processPhysicalScan(code);
            return;
        }

-        // Only accept common printable characters; ignore modifier keys
+        // Accept all printable scanner characters, including letters and punctuation.
        if (e.key.length === 1) {
            // If time gap too big, start new buffer
            if (keyboardLastKeyAt && (now - keyboardLastKeyAt) > KEYBOARD_SCAN_INTERCHAR_MS) {
@@ -1021,12 +1334,32 @@
            }
            keyboardScanBuffer += e.key;
            keyboardLastKeyAt = now;
-            // Prevent default so scanner input doesn't accidentally move focus or trigger shortcuts
+            const displayCode = document.getElementById('physicalScannerCode');
+            if (displayCode) displayCode.textContent = keyboardScanBuffer;
+            // Prevent default so scanner input is captured even while an input has focus.
            e.preventDefault();
        }
    }

-    function handleScanSuccess(decodedText) {
+    async function processPhysicalScan(code) {
+        physicalScanQueue.push(code);
+        if (keyboardScanProcessing) return;
+
+        keyboardScanProcessing = true;
+        try {
+            while (physicalScanQueue.length > 0) {
+                await handleScanSuccess(physicalScanQueue.shift());
+                if (physicalScannerModalOpen) {
+                    const displayCode = document.getElementById('physicalScannerCode');
+                    if (displayCode) displayCode.textContent = '';
+                }
+            }
+        } finally {
+            keyboardScanProcessing = false;
+        }
+    }
+
+    async function handleScanSuccess(decodedText) {
        const scannedCode = typeof normalizeScannedCode === "function" ? normalizeScannedCode(decodedText) : decodedText;
        if (!scannedCode) return;

@@ -1042,26 +1375,28 @@

        // 1. Modus: Nur Rückgabe
        if (mode === 'return_only') {
-            returnByCode(scannedCode);
+            await returnByCode(scannedCode);
            return;
        }

        // 2. Modus: Nur Ausweis
        if (mode === 'card_only') {
            setActiveStudentCard(scannedCode);
-            setScanStatus(`Ausweis gesetzt: ${activeStudentCardId}`, 'ok');
+            setScanStatus(`Ausweis gesetzt: ${activeStudentCardId}. Bitte den nächsten Ausweis scannen.`, 'ok');
+            showSmallConfirm(`Ausweis erkannt: ${activeStudentCardId}. Sie können den nächsten scannen.`, 'ok');
+            updatePhysicalScannerModal(`Ausweis erkannt. Bereit für den nächsten Scan.`, 'ok');
            return;
        }

        // 3. Modus: Schnellmodus (1x Ausweis, 1x Buch)
        if (mode === 'quick_toggle') {
-            processQuickToggleScan(scannedCode);
+            await processQuickToggleScan(scannedCode);
            return;
        }

        // 4. Modus: Dauermodus (1x Ausweis, Nx Bücher)
        if (mode === 'continuous') {
-            processContinuousScan(scannedCode);
+            await processContinuousScan(scannedCode);
            return;
        }
    }
@@ -1075,9 +1410,10 @@
            setActiveStudentCard(scannedCode);
            setScanStatus(`Neuer Ausweis gesetzt: ${activeStudentCardId}. Bitte Medien scannen.`, 'ok');
            showSmallConfirm(`Benutzer gewechselt zu: ${activeStudentCardId}`, 'ok');
+            updatePhysicalScannerModal('Ausweis erkannt. Jetzt Mediencodes scannen.', 'ok');

            setTimeout(() => {
-                if (document.getElementById('scanModeSelect').value === 'continuous') {
+                if (!physicalScannerModalOpen && document.getElementById('scanModeSelect').value === 'continuous') {
                    startScanner();
                }
            }, 1000);
@@ -1087,15 +1423,84 @@
        if (!activeStudentCardId) {
            setScanStatus('Kein Ausweis aktiv! Bitte zuerst einen Schülerausweis scannen.', 'error');
            showSmallConfirm('Bitte zuerst Ausweis scannen', 'error');
+            updatePhysicalScannerModal('Kein Ausweis aktiv. Bitte zuerst den Ausweis scannen.', 'error');

            setTimeout(() => {
-                if (document.getElementById('scanModeSelect').value === 'continuous') {
+                if (!physicalScannerModalOpen && document.getElementById('scanModeSelect').value === 'continuous') {
                    startScanner();
                }
            }, 2000);
            return;
        }

+        try {
+            setScanStatus('Verarbeite Mediencode...', 'warn');
+            const response = await fetch('/api/library_scan_action', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'X-CSRFToken': '{{ csrf_token }}',
+                    'X-CSRF-Token': '{{ csrf_token }}'
+                },
+                body: JSON.stringify({
+                    student_card_id: activeStudentCardId,
+                    item_code: scannedCode,
+                    action: 'borrow'
+                })
+            });
+
+            const result = await response.json();
+            if (!response.ok || !result.ok) {
+                setScanStatus(result.message || 'Scan-Aktion fehlgeschlagen.', 'error');
+                showSmallConfirm(result.message || 'Aktion fehlgeschlagen.', 'error');
+                updatePhysicalScannerModal(result.message || 'Scan-Aktion fehlgeschlagen.', 'error');
+            } else if (result.action === 'borrowed') {
+                setScanStatus(`Ausgeliehen: ${result.item_name}`, 'ok');
+                showSmallConfirm(`Ausgeliehen: ${result.item_name}`, 'ok', {
+                    actionLabel: 'Mit nächstem Ausweis starten',
+                    onAction: startNextStudentCardScan
+                });
+                updatePhysicalScannerModal('Ausleihe erfolgreich. Bereit für den nächsten Mediencode.', 'ok');
+            } else if (result.action === 'returned') {
+                setScanStatus(`Zurückgegeben: ${result.item_name}`, 'ok');
+                showSmallConfirm(`Zurückgegeben: ${result.item_name}`, 'ok');
+                updatePhysicalScannerModal('Rückgabe erfolgreich. Bereit für den nächsten Mediencode.', 'ok');
+            } else {
+                setScanStatus(result.message || 'Aktion durchgeführt.', 'ok');
+                showSmallConfirm(result.message || 'Erfolgreich', 'ok');
+                updatePhysicalScannerModal('Aktion erfolgreich. Bereit für den nächsten Mediencode.', 'ok');
+            }
+
+            // Tabellen-Ansicht aktualisieren
+            if (typeof loadLibraryItems === "function") {
+                await loadLibraryItems();
+            }
+        } catch (err) {
+            console.error('Continuous scan action failed:', err);
+            setScanStatus('Fehler beim Verarbeiten des Scans.', 'error');
+            showSmallConfirm('Fehler im Netzwerk/System', 'error');
+            updatePhysicalScannerModal('Fehler beim Verarbeiten. Bitte erneut scannen.', 'error');
+        }
+
+        setTimeout(() => {
+            if (!physicalScannerModalOpen && document.getElementById('scanModeSelect').value === 'continuous') {
+                startScanner();
+            }
+        }, 1500);
+    }
+
+    async function processQuickToggleScan(scannedCode) {
+
+        // 2. Wenn kein Ausweis gesetzt ist, wird der Code als Ausweis interpretiert
+        if (!activeStudentCardId) {
+            setActiveStudentCard(scannedCode);
+            setScanStatus(`Ausweis gesetzt: ${activeStudentCardId}. Bitte den nächsten Mediencode scannen.`, 'ok');
+            showSmallConfirm(`Ausweis erkannt: ${activeStudentCardId}. Bitte jetzt den nächsten Mediencode scannen.`, 'ok');
+            updatePhysicalScannerModal('Ausweis erkannt. Jetzt den Mediencode scannen.', 'ok');
+            return;
+        }
+
+        // 3. Ausleihe/Rückgabe verarbeiten (wenn Ausweis vorhanden)
        try {
            setScanStatus('Verarbeite Mediencode...', 'warn');
            const response = await fetch('/api/library_scan_action', {
@@ -1114,77 +1519,32 @@
            const result = await response.json();
            if (!response.ok || !result.ok) {
                setScanStatus(result.message || 'Scan-Aktion fehlgeschlagen.', 'error');
-                showSmallConfirm(result.message || 'Aktion fehlgeschlagen.', 'error');
-            } else if (result.action === 'borrowed') {
-                setScanStatus(`Ausgeliehen: ${result.item_name}`, 'ok');
-                showSmallConfirm(`Ausgeliehen: ${result.item_name}`, 'ok');
-            } else if (result.action === 'returned') {
-                setScanStatus(`Zurückgegeben: ${result.item_name}`, 'ok');
-                showSmallConfirm(`Zurückgegeben: ${result.item_name}`, 'ok');
-            } else {
-                setScanStatus(result.message || 'Aktion durchgeführt.', 'ok');
-                showSmallConfirm(result.message || 'Erfolgreich', 'ok');
-            }
-
-            // Tabellen-Ansicht aktualisieren
-            if (typeof loadLibraryItems === "function") {
-                await loadLibraryItems();
-            }
-        } catch (err) {
-            console.error('Continuous scan action failed:', err);
-            setScanStatus('Fehler beim Verarbeiten des Scans.', 'error');
-            showSmallConfirm('Fehler im Netzwerk/System', 'error');
-        }
-
-        setTimeout(() => {
-            if (document.getElementById('scanModeSelect').value === 'continuous') {
-                startScanner();
-            }
-        }, 1500);
-    }
-
-    async function processQuickToggleScan(scannedCode) {
-
-        // 2. Wenn kein Ausweis gesetzt ist, wird der Code als Ausweis interpretiert
-        if (!activeStudentCardId) {
-            setActiveStudentCard(scannedCode);
-            setScanStatus(`Ausweis gesetzt: ${activeStudentCardId}`, 'ok');
-            return;
-        }
-
-        // 3. Ausleihe/Rückgabe verarbeiten (wenn Ausweis vorhanden)
-        try {
-            setScanStatus('Verarbeite Mediencode...', 'warn');
-            const response = await fetch('/api/library_scan_action', {
-                method: 'POST',
-                headers: {'Content-Type': 'application/json'},
-                body: JSON.stringify({
-                    student_card_id: activeStudentCardId,
-                    item_code: scannedCode
-                })
-            });
-
-            const result = await response.json();
-            if (!response.ok || !result.ok) {
-                setScanStatus(result.message || 'Scan-Aktion fehlgeschlagen.', 'error');
+                updatePhysicalScannerModal(result.message || 'Scan-Aktion fehlgeschlagen.', 'error');
                return;
            }

            if (result.action === 'borrowed') {
                setScanStatus(`Ausgeliehen: ${result.item_name}`, 'ok');
-                showSmallConfirm(`Ausgeliehen: ${result.item_name}`, 'ok');
+                showSmallConfirm(`Ausgeliehen: ${result.item_name}`, 'ok', {
+                    actionLabel: 'Mit nächstem Ausweis starten',
+                    onAction: startNextStudentCardScan
+                });
+                updatePhysicalScannerModal('Ausleihe erfolgreich. Bereit für den nächsten Mediencode.', 'ok');
            } else if (result.action === 'returned') {
                setScanStatus(`Zurückgegeben: ${result.item_name}`, 'ok');
                showSmallConfirm(`Zurückgegeben: ${result.item_name}`, 'ok');
+                updatePhysicalScannerModal('Rückgabe erfolgreich. Bereit für den nächsten Mediencode.', 'ok');
            } else {
                setScanStatus(result.message || 'Aktion durchgeführt.', 'ok');
                showSmallConfirm(result.message || 'Aktion durchgeführt.', 'ok');
+                updatePhysicalScannerModal('Aktion erfolgreich. Bereit für den nächsten Mediencode.', 'ok');
            }

            await loadLibraryItems();
        } catch (err) {
            console.error('Quick scan action failed:', err);
            setScanStatus('Fehler beim Verarbeiten des Scans.', 'error');
+            updatePhysicalScannerModal('Fehler beim Verarbeiten. Bitte erneut scannen.', 'error');
        }
    }

@@ -1194,23 +1554,30 @@
        try {
            const resp = await fetch('/api/library_return_by_code', {
                method: 'POST',
-                headers: {'Content-Type': 'application/json'},
+                headers: {
+                    'Content-Type': 'application/json',
+                    'X-CSRFToken': '{{ csrf_token }}',
+                    'X-CSRF-Token': '{{ csrf_token }}'
+                },
                body: JSON.stringify({ item_code: code })
            });
            const result = await resp.json();
            if (!resp.ok || !result.ok) {
                setScanStatus(result.message || 'Rückgabe fehlgeschlagen.', 'error');
                showSmallConfirm(result.message || 'Rückgabe fehlgeschlagen.', 'error');
+                updatePhysicalScannerModal(result.message || 'Rückgabe fehlgeschlagen.', 'error');
                return false;
            }
            setScanStatus(result.message || `Zurückgegeben: ${result.item_name || ''}`, 'ok');
            showSmallConfirm(result.message || `Zurückgegeben: ${result.item_name || ''}`, 'ok');
+            updatePhysicalScannerModal('Rückgabe erfolgreich. Bereit für den nächsten Mediencode.', 'ok');
            await loadLibraryItems();
            return true;
        } catch (err) {
            console.error('Return by code failed:', err);
            setScanStatus('Fehler bei Rückgabe.', 'error');
            showSmallConfirm('Fehler bei Rückgabe.', 'error');
+            updatePhysicalScannerModal('Fehler bei Rückgabe. Bitte erneut scannen.', 'error');
            return false;
        }
    }
@@ -1243,31 +1610,39 @@
    // =========================================================================
    // 4. UI INTERACTIONS & UTILITIES
    // =========================================================================
-    function borrowItem(itemId) {
+    async function borrowItem(itemId) {
        const selectedItem = (libraryItems || []).find(item => item._id === itemId);
        if (selectedItem && selectedItem.LibraryDisplayStatus === 'damaged') {
-            alert('Dieses Medium ist als defekt/zerstört markiert und kann nicht ausgeliehen werden.');
+            await customAlert('Dieses Medium ist als defekt/zerstört markiert und kann nicht ausgeliehen werden.');
            return;
        }

        const defaultCardId = activeStudentCardId || '';
-        const cardId = (window.prompt('Bitte Bibliotheksausweis-ID eingeben:', defaultCardId) || '').trim().toUpperCase();
+        const promptCardResult = await customPrompt('Bitte Bibliotheksausweis-ID eingeben:', defaultCardId);
+        if (promptCardResult === null) return;
+
+        const cardId = promptCardResult.trim().toUpperCase();
        if (!cardId) {
-            alert('Ausleihe abgebrochen: Für Bibliotheksmedien ist eine gültige Bibliotheksausweis-ID erforderlich.');
+            await customAlert('Ausleihe abgebrochen: Für Bibliotheksmedien ist eine gültige Bibliotheksausweis-ID erforderlich.');
            return;
        }

        setActiveStudentCard(cardId);

-        const durationInput = (window.prompt('Ausleihdauer in Tagen (optional):') || '').trim();
+        const promptDurationResult = await customPrompt('Ausleihdauer in Tagen (optional):');
+        if (promptDurationResult === null) return;
+        const durationInput = promptDurationResult.trim();
+
        const maxAvailable = Math.max(1, parseInt(selectedItem?.AvailableGroupedCount || selectedItem?.Quantity || 1, 10) || 1);
-        const countPrompt = (window.prompt(`Anzahl ausleihen? (Standard: 1, verfügbar: ${maxAvailable})`, '1') || '').trim();
-        let borrowCount = parseInt(countPrompt || '1', 10);
+        const countPromptResult = await customPrompt(`Anzahl ausleihen? (Standard: 1, verfügbar: ${maxAvailable})`, '1');
+        if (countPromptResult === null) return;
+
+        let borrowCount = parseInt(countPromptResult.trim() || '1', 10);
        if (!Number.isFinite(borrowCount) || borrowCount < 1) {
            borrowCount = 1;
        }
        if (borrowCount > maxAvailable) {
-            alert(`Es sind nur ${maxAvailable} Exemplar(e) verfügbar.`);
+            await customAlert(`Es sind nur ${maxAvailable} Exemplar(e) verfügbar.`);
            return;
        }

@@ -1319,21 +1694,51 @@
        if (kind) el.classList.add(kind);
    }

-    function showSmallConfirm(message, kind='ok') {
+    function showSmallConfirm(message, kind='ok', action = null) {
        // Append the small helper text in German
        const helper = 'Sie können fortfahren. Dies ist nur eine kleine Benachrichtigung.';
        const el = document.createElement('div');
        el.className = `small-popup ${kind === 'error' ? 'error' : 'ok'}`;
-        el.innerHTML = `<div>${escapeHtml(String(message || ''))}</div><div style="opacity:0.9; margin-left:8px; font-size:0.85em;">${helper}</div><div class="close-x">&times;</div>`;
+        el.innerHTML = `<div>${escapeHtml(String(message || ''))}</div><div style="opacity:0.9; margin-left:8px; font-size:0.85em;">${helper}</div>`;
+
+        if (action && typeof action.onAction === 'function') {
+            const actionButton = document.createElement('button');
+            actionButton.type = 'button';
+            actionButton.textContent = action.actionLabel || 'Weiter';
+            actionButton.style.marginLeft = '8px';
+            actionButton.style.padding = '6px 10px';
+            actionButton.style.cursor = 'pointer';
+            actionButton.addEventListener('click', () => {
+                if (el.parentNode) el.parentNode.removeChild(el);
+                action.onAction();
+            });
+            el.appendChild(actionButton);
+        }
+
+        const closeButton = document.createElement('div');
+        closeButton.className = 'close-x';
+        closeButton.innerHTML = '&times;';
+        el.appendChild(closeButton);
        document.body.appendChild(el);
        // close handler
-        el.querySelector('.close-x').addEventListener('click', () => {
+        closeButton.addEventListener('click', () => {
            if (el && el.parentNode) el.parentNode.removeChild(el);
        });
        // auto remove after 3 seconds
        setTimeout(() => { try { if (el && el.parentNode) el.parentNode.removeChild(el); } catch(e){} }, 3000);
    }

+    async function startNextStudentCardScan() {
+        setActiveStudentCard('');
+        setScanStatus('Bereit für den nächsten Ausweis.', 'warn');
+        updatePhysicalScannerModal('Bereit für den nächsten Ausweis.', 'warn');
+
+        const mode = document.getElementById('scanModeSelect')?.value;
+        if (!physicalScannerModalOpen && (mode === 'quick_toggle' || mode === 'continuous') && !scannerRunning) {
+            await startScanner();
+        }
+    }
+
    function setActiveStudentCard(cardId) {
        activeStudentCardId = (cardId || '').trim().toUpperCase();
        const input = document.getElementById('activeStudentCard');
@@ -1448,7 +1853,7 @@
        const toggleBtn = document.getElementById('toggleScannerBtn');
        const resetBtn = document.getElementById('resetCardBtn');
        const modeSelect = document.getElementById('scanModeSelect');
-        const keyboardToggle = document.getElementById('keyboardScannerToggle');
+        const physicalScannerBtn = document.getElementById('physicalScannerBtn');

        if (toggleBtn) {
            toggleBtn.addEventListener('click', async () => {
@@ -1469,6 +1874,9 @@

        if (modeSelect) {
            modeSelect.addEventListener('change', () => {
+                if (physicalScannerModalOpen) {
+                    updatePhysicalScannerModal('Warte auf Scan...', 'warn');
+                }
                if (modeSelect.value === 'quick_toggle' && !activeStudentCardId) {
                    setScanStatus('Schnellmodus: zuerst Bibliotheksausweis scannen.', 'warn');
                } else if (modeSelect.value === 'card_only') {
@@ -1477,18 +1885,24 @@
            });
        }

-        if (keyboardToggle) {
-            keyboardToggle.addEventListener('change', () => {
-                keyboardScannerEnabled = !!keyboardToggle.checked;
-                if (keyboardScannerEnabled) {
-                    document.addEventListener('keydown', keyboardScanKeydownHandler);
-                    setScanStatus('Physischer Scanner aktiv (Schnellmodus empfohlen).', 'ok');
-                } else {
-                    document.removeEventListener('keydown', keyboardScanKeydownHandler);
-                    setScanStatus('Physischer Scanner deaktiviert.', 'warn');
+        if (physicalScannerBtn) {
+            physicalScannerBtn.addEventListener('click', openPhysicalScannerModal);
+        }
+
+        const closePhysicalScannerBtn = document.getElementById('closePhysicalScannerBtn');
+        const stopPhysicalScannerBtn = document.getElementById('stopPhysicalScannerBtn');
+        if (closePhysicalScannerBtn) {
+            closePhysicalScannerBtn.addEventListener('click', closePhysicalScannerModal);
+            closePhysicalScannerBtn.addEventListener('keydown', (event) => {
+                if (event.key === 'Enter' || event.key === ' ') {
+                    event.preventDefault();
+                    closePhysicalScannerModal();
                }
            });
        }
+        if (stopPhysicalScannerBtn) {
+            stopPhysicalScannerBtn.addEventListener('click', closePhysicalScannerModal);
+        }
    }

    // Run when DOM structure is entirely ready
@@ -174,29 +174,33 @@

 <style>
    #legalTabs .nav-link {
-        color: #495057;
+        color: var(--ui-text-muted);
+        border-color: transparent;
    }
    #legalTabs .nav-link.active {
        font-weight: 600;
-        color: #0d6efd;
+        color: #60a5fa;
+        background: var(--ui-surface-soft);
+        border-color: var(--ui-border) var(--ui-border) var(--ui-surface-soft);
    }
    .license-content {
        background-color: var(--ui-surface-soft);
        padding: 20px 30px;
        border-radius: 0 0 5px 5px;
-        border: 1px solid #dee2e6;
+        border: 1px solid var(--ui-border);
        border-top: none;
+        color: var(--ui-text);
    }
    .license-content h2 {
        margin-top: 10px;
    }
    .license-content h3 {
        margin-top: 1.4em;
-        color: #343a40;
+        color: var(--ui-title);
    }
    .license-content h4 {
        margin-top: 1.1em;
-        color: #495057;
+        color: var(--ui-text);
    }
    .license-content ol,
    .license-content ul {
@@ -208,7 +212,7 @@
    }
    .license-content hr {
        margin: 25px 0;
-        border-color: #dee2e6;
+        border-color: var(--ui-border);
    }
    .license-exception-notice {
        margin: 20px 0;
@@ -229,5 +233,61 @@
        font-weight: bold;
        color: #0d6efd;
    }
+
+    :root[data-theme="dark"] #legalTabs {
+        border-bottom-color: var(--ui-border);
+    }
+
+    :root[data-theme="dark"] #legalTabs .nav-link:hover {
+        color: #bfdbfe;
+        background: var(--ui-bg-accent);
+        border-color: var(--ui-border);
+    }
+
+    :root[data-theme="dark"] #legalTabs .nav-link.active {
+        color: #bfdbfe;
+        background: var(--ui-surface-soft);
+        border-color: var(--ui-border) var(--ui-border) var(--ui-surface-soft);
+    }
+
+    :root[data-theme="dark"] .license-content {
+        background: var(--ui-surface) !important;
+        color: var(--ui-text) !important;
+        border-color: var(--ui-border) !important;
+    }
+
+    :root[data-theme="dark"] .license-content p,
+    :root[data-theme="dark"] .license-content li {
+        color: var(--ui-text-muted);
+    }
+
+    :root[data-theme="dark"] .license-content strong,
+    :root[data-theme="dark"] .license-content h2,
+    :root[data-theme="dark"] .license-content h3,
+    :root[data-theme="dark"] .license-content h4 {
+        color: var(--ui-title) !important;
+    }
+
+    :root[data-theme="dark"] .license-content hr {
+        border-color: var(--ui-border);
+    }
+
+    :root[data-theme="dark"] .license-exception-notice {
+        background: #422006 !important;
+        border-color: #f59e0b !important;
+        border-left-color: #fb923c !important;
+        color: #fde68a !important;
+    }
+
+    :root[data-theme="dark"] .license-exception-notice h3,
+    :root[data-theme="dark"] .license-exception-notice p,
+    :root[data-theme="dark"] .license-exception-notice a {
+        color: #fde68a !important;
+    }
+
+    :root[data-theme="dark"] .license-content code {
+        background: #082f49;
+        color: #bae6fd;
+    }
 </style>
 {% endblock %}
@@ -229,9 +229,11 @@
    
    #searchInput {
        padding: 8px;
-        border: 1px solid #ddd;
+        border: 1px solid var(--ui-border);
        border-radius: 4px;
        width: 200px;
+        background: var(--ui-bg);
+        color: var(--ui-text);
    }
    
    .date-range {
@@ -242,8 +244,17 @@
    
    .date-range input {
        padding: 8px;
-        border: 1px solid #ddd;
+        border: 1px solid var(--ui-border);
        border-radius: 4px;
+        background: var(--ui-bg);
+        color: var(--ui-text);
+    }
+
+    #searchInput:focus,
+    .date-range input:focus {
+        outline: none;
+        border-color: #60a5fa;
+        box-shadow: 0 0 0 3px rgba(96, 165, 250, 0.22);
    }
    .status-badge {
        display: inline-block;
@@ -308,13 +319,15 @@
    table {
        width: 100%;
        border-collapse: collapse;
-        box-shadow: 0 0 20px rgba(0, 0, 0, 0.1);
+        background: var(--ui-surface);
+        color: var(--ui-text);
+        box-shadow: var(--ui-shadow-sm);
    }
    
    th, td {
        padding: 12px 15px;
        text-align: left;
-        border-bottom: 1px solid #ddd;
+        border-bottom: 1px solid var(--ui-border);
    }
    
    th {
@@ -328,7 +341,7 @@
    }
    
    tbody tr:hover {
-        background-color: #f5f5f5;
+        background-color: var(--ui-bg-accent);
    }
    
    .navigation-buttons {
@@ -358,6 +371,52 @@
    .export-button:hover {
        background-color: #218838;
    }
+
+    :root[data-theme="dark"] .conflict-summary-banner {
+        background: #422006 !important;
+        border-color: #f59e0b !important;
+        border-left-color: #fb923c !important;
+        color: #fde68a !important;
+    }
+
+    :root[data-theme="dark"] .banner-close {
+        color: #fde68a;
+    }
+
+    :root[data-theme="dark"] .banner-close:hover {
+        color: #fff7ed;
+    }
+
+    :root[data-theme="dark"] .conflict-badge {
+        background: #422006 !important;
+        border-color: #f59e0b !important;
+        color: #fde68a !important;
+    }
+
+    :root[data-theme="dark"] #logsTable {
+        background: var(--ui-surface) !important;
+        color: var(--ui-text) !important;
+    }
+
+    :root[data-theme="dark"] #logsTable th {
+        background: #1d4ed8 !important;
+        color: #ffffff !important;
+        border-color: #60a5fa !important;
+    }
+
+    :root[data-theme="dark"] #logsTable th:hover {
+        background: #2563eb !important;
+    }
+
+    :root[data-theme="dark"] #logsTable td {
+        background: var(--ui-surface) !important;
+        color: var(--ui-text) !important;
+        border-color: var(--ui-border) !important;
+    }
+
+    :root[data-theme="dark"] #logsTable tbody tr:hover td {
+        background: var(--ui-bg-accent) !important;
+    }
    
    @media (max-width: 768px) {
        .filter-controls {
@@ -373,6 +432,17 @@
            width: 100%;
            justify-content: space-between;
        }
+
+        .navigation-buttons {
+            gap: 10px;
+            flex-wrap: wrap;
+        }
+
+        .navigation-buttons .button,
+        .navigation-buttons .export-button {
+            flex: 1 1 180px;
+            text-align: center;
+        }
    }
 </style>
 {% endblock %}
@@ -179,10 +179,12 @@
                                    </td>
                                    <td class="text-end">
                                        <div class="btn-group" role="group">
+                                            {% if mail_service_enabled %}
                                            <button type="button" class="btn btn-sm btn-outline-primary"
                                                    onclick="openEmailModal('{{ item.id }}', '{{ item.schueler_name }}', '{{ item.email }}')">
                                                <i class="bi bi-envelope"></i> E-Mail
                                            </button>
+                                            {% endif %}
                                            <button type="button" class="btn btn-sm btn-outline-warning text-dark"
                                                    onclick="resetMahnung('{{ item.id }}', '{{ item.schueler_name }}')">
                                                <i class="bi bi-arrow-counterclockwise"></i> Zurücksetzen
@@ -254,6 +256,7 @@ function submitEmailMahnung() {
    const loanId = document.getElementById('modalLoanId').value;
    const email = document.getElementById('modalEmail').value;
    const message = document.getElementById('modalMessage').value;
+    const csrfToken = document.querySelector('meta[name="csrf-token"]')?.content || '';

    if (!email) {
        alert('Bitte geben Sie eine gültige E-Mail-Adresse ein.');
@@ -262,7 +265,7 @@ function submitEmailMahnung() {

    fetch('/mahnungen_send_email', {
        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
+        headers: { 'Content-Type': 'application/json', 'X-CSRFToken': csrfToken },
        body: JSON.stringify({ loan_id: loanId, email: email, message: message })
    })
    .then(response => response.json())
@@ -287,9 +290,11 @@ function resetMahnung(loanId, studentName) {
        return;
    }

+    const csrfToken = document.querySelector('meta[name="csrf-token"]')?.content || '';
+
    fetch('/mahnungen_reset', {
        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
+        headers: { 'Content-Type': 'application/json', 'X-CSRFToken': csrfToken },
        body: JSON.stringify({ loan_id: loanId })
    })
    .then(response => response.json())
@@ -2343,7 +2343,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
        <div class="filter-container">
            <div class="filter-group">
                <div class="filter-header">
-                    <label>Unterrichtsfach:</label>
+                    <label>{{ filter_names.get('2', 'Fach') }}</label>
                    <button type="button" class="filter-toggle" onclick="toggleFilterDropdown('filter1-dropdown')">▼</button>
                    <button type="button" class="clear-filter" onclick="clearFilter(1)">Clear</button>
                </div>
@@ -2357,7 +2357,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
            
            <div class="filter-group">
                <div class="filter-header">
-                    <label>Jahrgangsstufe:</label>
+                    <label>{{ filter_names.get('1', 'Klassenstufe') }}</label>
                    <button type="button" class="filter-toggle" onclick="toggleFilterDropdown('filter2-dropdown')">▼</button>
                    <button type="button" class="clear-filter" onclick="clearFilter(2)">Clear</button>
                </div>
@@ -2371,7 +2371,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
            
            <div class="filter-group">
                <div class="filter-header">
-                    <label>Schlagwort:</label>
+                    <label>{{ filter_names.get('3', 'Schlagwort') }}</label>
                    <button type="button" class="filter-toggle" onclick="toggleFilterDropdown('filter3-dropdown')">▼</button>
                    <button type="button" class="clear-filter" onclick="clearFilter(3)">Clear</button>
                </div>
@@ -2420,9 +2420,9 @@ document.addEventListener('DOMContentLoaded', ()=>{
        <div id="table-view-header" class="table-view-header" aria-hidden="true">
            <span>Name</span>
            <span>Ort</span>
-            <span>Unterrichtsfach</span>
-            <span>Jahrgangsstufe</span>
-            <span>Schlagwort</span>
+            <span>{{ filter_names.get('2', 'Fach') }}</span>
+            <span>{{ filter_names.get('1', 'Jahrgangsstufe') }}</span>
+            <span>{{ filter_names.get('3', 'Schlagwort') }}</span>
            <span>Barcode</span>
            <span>Anzahl</span>
        </div>
@@ -3418,14 +3418,24 @@ document.addEventListener('DOMContentLoaded', ()=>{
                                    `<form method="POST" action="{{ url_for('ausleihen', id='') }}${item._id}">
                                        ${isGroupedItem ? `
                                        <div class="grouped-borrow-controls" style="display:flex; gap:8px; flex-wrap:wrap; margin-bottom:8px; align-items:center;">
-                                            <label style="font-size:0.85rem; margin:0;">Anzahl:</label>
-                                            <input type="number" name="exemplare_count" min="1" max="${availableGroupedCount}" value="1" style="width:74px; padding:4px;">
-                                            <label style="font-size:0.85rem; margin:0;">oder Code:</label>
-                                            <select id="specific-item-card-${item._id}" name="specific_item_id" style="max-width:190px; padding:4px;">
-                                                <option value="">Automatisch wählen</option>
-                                                ${groupedAvailableUnits.map(unit => `<option value="${unit.id}">${unit.code}</option>`).join('')}
-                                            </select>
-                                        </div>` : ''}
+    <label style="font-size:0.85rem; margin:0;">Anzahl:</label>
+    <input type="number"
+           name="exemplare_count"
+           min="1"
+           max="${availableGroupedCount}"
+           value="1"
+           style="width:74px; padding:4px;"
+           oninput="if(this.value){ this.form.querySelector('[name=specific_item_id]').value = ''; }">
+
+    <label style="font-size:0.85rem; margin:0;">oder Code:</label>
+    <select id="specific-item-card-${item._id}"
+            name="specific_item_id"
+            style="max-width:190px; padding:4px;"
+            onchange="if(this.value !== ''){ this.form.querySelector('[name=exemplare_count]').value = '1'; }">
+        <option value="">Automatisch wählen</option>
+        ${groupedAvailableUnits.map(unit => `<option value="${unit.id}">${unit.code}</option>`).join('')}
+    </select>
+</div>` : ''}
                                        <button class="ausleihen" type="submit">Ausleihen</button>
                                    </form>` 
                                : isBorrowedByMe ?
@@ -1,135 +1,173 @@
-<!--
-   Copyright 2025-2026 AIIrondev
-
-   Licensed under the Inventarsystem EULA (Endbenutzer-Lizenzvertrag).
-   See Legal/LICENSE for the full license text.
-   Unauthorized commercial use, SaaS hosting, or removal of branding is prohibited.
-   For commercial licensing inquiries: https://github.com/AIIrondev
-->
 {% extends "base.html" %}

 {% block title %}Filter verwalten{% endblock %}

 {% block content %}
-<div class="container">
-    <h1 class="mb-4">Filterwerte verwalten</h1>
-    
-    <div class="row">
-        <!-- Filter 1 -->
-        <div class="col-md-4">
-            <div class="card mb-4">
-                <div class="card-header">
-                    <h2 class="card-title h5 mb-0">{{ filter_names.get('1', 'Jahrgang') }} (Filter 1)</h2>
+<div class="container py-4">
+    <div class="d-flex flex-column flex-md-row justify-content-between align-items-md-center pb-3 mb-4 border-bottom gap-3">
+        <div>
+            <h1 class="h2 fw-bold mb-1">Filterwerte verwalten</h1>
+            <p class="text-muted mb-0">Verwalten und Bearbeiten Sie die Zuordnungswerte für das Inventar.</p>
+        </div>
+        <div>
+            <a href="{{ url_for('home_admin') }}" class="btn btn-outline-secondary d-inline-flex align-items-center">
+                <i class="bi bi-arrow-left me-2"></i> Zurück zur Admin-Übersicht
+            </a>
+        </div>
+    </div>
+
+    <div class="row g-4">
+        <div class="col-lg-6">
+            <div class="card shadow-sm border-0 h-100 rounded-3">
+                <div class="card-header bg-white border-bottom py-3 d-flex justify-content-between align-items-center">
+                    <h2 class="card-title h5 mb-0 fw-semibold text-primary">
+                        <i class="bi bi-funnel me-2"></i>{{ filter_names.get('1', 'Jahrgangsstufe') }}
+                    </h2>
+                    <span class="badge bg-primary-subtle text-primary rounded-pill">Filter 1</span>
                </div>
-                <div class="card-body">
+                <div class="card-body p-4">
                    <form method="POST" action="{{ url_for('add_filter_value', filter_num=1) }}" class="mb-4">
+                        <label class="form-label fw-medium text-secondary">Neuen Wert hinzufügen</label>
                        <div class="input-group">
-                            <input type="text" name="value" class="form-control" placeholder="Neuer Wert..." required>
-                            <button type="submit" class="btn btn-primary">Hinzufügen</button>
+                            <input type="text" name="value" class="form-control" placeholder="Wert eingeben..." required>
+                            <button type="submit" class="btn btn-primary d-inline-flex align-items-center">
+                                <i class="bi bi-plus-lg me-1"></i> Hinzufügen
+                            </button>
                        </div>
                    </form>
-                    
-                    <h5 class="mb-3">Vorhandene Werte</h5>
+
+                    <div class="d-flex justify-content-between align-items-center mb-3">
+                        <h3 class="h6 text-uppercase text-muted fw-bold mb-0">Vorhandene Werte</h3>
+                        <span class="badge bg-secondary rounded-pill">{{ filter1_values|length if filter1_values else 0 }}</span>
+                    </div>
+
                    {% if filter1_values %}
-                    <div class="list-group">
+                    <div class="list-group list-group-flush border rounded-3 overflow-hidden">
                        {% for value in filter1_values %}
-                        <div class="list-group-item">
-                            <div class="d-flex justify-content-between align-items-center mb-2">
-                                <span>{{ value }}</span>
-                                <div>
-                                    <button type="button" class="btn btn-sm btn-secondary me-1" onclick="toggleEdit('edit-1-{{ loop.index }}')">Bearbeiten</button>
+                        <div class="list-group-item p-3">
+                            <div class="d-flex justify-content-between align-items-center">
+                                <span class="fw-medium">{{ value }}</span>
+                                <div class="btn-group btn-group-sm">
+                                    <button type="button" class="btn btn-outline-secondary" onclick="toggleEdit('edit-1-{{ loop.index }}')">
+                                        <i class="bi bi-pencil me-1"></i> Bearbeiten
+                                    </button>
                                    <form method="POST" action="{{ url_for('remove_filter_value', filter_num=1, value=value) }}" class="d-inline">
-                                        <button type="submit" class="btn btn-sm btn-danger" 
+                                        <button type="submit" class="btn btn-outline-danger" 
                                                onclick="return confirm('Sind Sie sicher, dass Sie den Wert \"' + '{{ value }}'.replace(/'/g, '\\\'') + '\" löschen möchten?');">
-                                            Entfernen
+                                            <i class="bi bi-trash me-1"></i> Entfernen
                                        </button>
                                    </form>
                                </div>
                            </div>
-                            <form id="edit-1-{{ loop.index }}" method="POST" action="{{ url_for('edit_filter_value', filter_num=1, old_value=value) }}" style="display: none;" class="mt-2">
+                            
+                            <form id="edit-1-{{ loop.index }}" method="POST" action="{{ url_for('edit_filter_value', filter_num=1, old_value=value) }}" style="display: none;" class="mt-3 pt-3 border-top">
                                <div class="input-group input-group-sm">
                                    <input type="text" name="new_value" class="form-control" value="{{ value }}" required>
-                                    <button type="submit" class="btn btn-primary" onclick="return confirm('Tipp: Das Ändern des Namens aktualisiert auch alle Einträge in der Datenbank, die diesen Filter verwenden. Fortfahren?');">Speichern</button>
-                                    <button type="button" class="btn btn-secondary" onclick="toggleEdit('edit-1-{{ loop.index }}')">Abbrechen</button>
+                                    <button type="submit" class="btn btn-success" onclick="return confirm('Tipp: Das Ändern des Namens aktualisiert auch alle Einträge in der Datenbank, die diesen Filter verwenden. Fortfahren?');">
+                                        <i class="bi bi-check-lg me-1"></i> Speichern
+                                    </button>
+                                    <button type="button" class="btn btn-outline-secondary" onclick="toggleEdit('edit-1-{{ loop.index }}')">
+                                        Abbrechen
+                                    </button>
                                </div>
                            </form>
                        </div>
                        {% endfor %}
                    </div>
                    {% else %}
-                    <div class="alert alert-info">Keine Werte definiert.</div>
+                    <div class="alert alert-light border text-center text-muted mb-0">
+                        <i class="bi bi-info-circle me-1"></i> Keine Werte definiert.
+                    </div>
                    {% endif %}
                </div>
            </div>
        </div>
-        
-        <!-- Filter 2 -->
-        <div class="col-md-4">
-            <div class="card mb-4">
-                <div class="card-header">
-                    <h2 class="card-title h5 mb-0">{{ filter_names.get('2', 'Fach') }} (Filter 2)</h2>
+
+        <div class="col-lg-6">
+            <div class="card shadow-sm border-0 h-100 rounded-3">
+                <div class="card-header bg-white border-bottom py-3 d-flex justify-content-between align-items-center">
+                    <h2 class="card-title h5 mb-0 fw-semibold text-primary">
+                        <i class="bi bi-funnel me-2"></i>{{ filter_names.get('2', 'Fachgebiet') }}
+                    </h2>
+                    <span class="badge bg-primary-subtle text-primary rounded-pill">Filter 2</span>
                </div>
-                <div class="card-body">
+                <div class="card-body p-4">
                    <form method="POST" action="{{ url_for('add_filter_value', filter_num=2) }}" class="mb-4">
+                        <label class="form-label fw-medium text-secondary">Neuen Wert hinzufügen</label>
                        <div class="input-group">
-                            <input type="text" name="value" class="form-control" placeholder="Neuer Wert..." required>
-                            <button type="submit" class="btn btn-primary">Hinzufügen</button>
+                            <input type="text" name="value" class="form-control" placeholder="Wert eingeben..." required>
+                            <button type="submit" class="btn btn-primary d-inline-flex align-items-center">
+                                <i class="bi bi-plus-lg me-1"></i> Hinzufügen
+                            </button>
                        </div>
                    </form>
-                    
-                    <h5 class="mb-3">Vorhandene Werte</h5>
+
+                    <div class="d-flex justify-content-between align-items-center mb-3">
+                        <h3 class="h6 text-uppercase text-muted fw-bold mb-0">Vorhandene Werte</h3>
+                        <span class="badge bg-secondary rounded-pill">{{ filter2_values|length if filter2_values else 0 }}</span>
+                    </div>
+
                    {% if filter2_values %}
-                    <div class="list-group">
+                    <div class="list-group list-group-flush border rounded-3 overflow-hidden">
                        {% for value in filter2_values %}
-                        <div class="list-group-item">
-                            <div class="d-flex justify-content-between align-items-center mb-2">
-                                <span>{{ value }}</span>
-                                <div>
-                                    <button type="button" class="btn btn-sm btn-secondary me-1" onclick="toggleEdit('edit-2-{{ loop.index }}')">Bearbeiten</button>
+                        <div class="list-group-item p-3">
+                            <div class="d-flex justify-content-between align-items-center">
+                                <span class="fw-medium">{{ value }}</span>
+                                <div class="btn-group btn-group-sm">
+                                    <button type="button" class="btn btn-outline-secondary" onclick="toggleEdit('edit-2-{{ loop.index }}')">
+                                        <i class="bi bi-pencil me-1"></i> Bearbeiten
+                                    </button>
                                    <form method="POST" action="{{ url_for('remove_filter_value', filter_num=2, value=value) }}" class="d-inline">
-                                        <button type="submit" class="btn btn-sm btn-danger"
+                                        <button type="submit" class="btn btn-outline-danger"
                                                onclick="return confirm('Sind Sie sicher, dass Sie den Wert \"' + '{{ value }}'.replace(/'/g, '\\\'') + '\" löschen möchten?');">
-                                            Entfernen
+                                            <i class="bi bi-trash me-1"></i> Entfernen
                                        </button>
                                    </form>
                                </div>
                            </div>
-                            <form id="edit-2-{{ loop.index }}" method="POST" action="{{ url_for('edit_filter_value', filter_num=2, old_value=value) }}" style="display: none;" class="mt-2">
+
+                            <form id="edit-2-{{ loop.index }}" method="POST" action="{{ url_for('edit_filter_value', filter_num=2, old_value=value) }}" style="display: none;" class="mt-3 pt-3 border-top">
                                <div class="input-group input-group-sm">
                                    <input type="text" name="new_value" class="form-control" value="{{ value }}" required>
-                                    <button type="submit" class="btn btn-primary" onclick="return confirm('Tipp: Das Ändern des Namens aktualisiert auch alle Einträge in der Datenbank, die diesen Filter verwenden. Fortfahren?');">Speichern</button>
-                                    <button type="button" class="btn btn-secondary" onclick="toggleEdit('edit-2-{{ loop.index }}')">Abbrechen</button>
+                                    <button type="submit" class="btn btn-success" onclick="return confirm('Tipp: Das Ändern des Namens aktualisiert auch alle Einträge in der Datenbank, die diesen Filter verwenden. Fortfahren?');">
+                                        <i class="bi bi-check-lg me-1"></i> Speichern
+                                    </button>
+                                    <button type="button" class="btn btn-outline-secondary" onclick="toggleEdit('edit-2-{{ loop.index }}')">
+                                        Abbrechen
+                                    </button>
                                </div>
                            </form>
                        </div>
                        {% endfor %}
                    </div>
                    {% else %}
-                    <div class="alert alert-info">Keine Werte definiert.</div>
+                    <div class="alert alert-light border text-center text-muted mb-0">
+                        <i class="bi bi-info-circle me-1"></i> Keine Werte definiert.
+                    </div>
                    {% endif %}
                </div>
            </div>
        </div>
    </div>
-    
-    <div class="alert alert-warning">
-        <strong>Hinweis:</strong> Beim Entfernen eines Filterwertes wird dieser nicht aus bestehenden Objekten entfernt.
-        Bereits verwendete Werte bleiben in den Objekten erhalten.
-    </div>
-    
-    <div class="mt-4">
-        <a href="{{ url_for('home_admin') }}" class="btn btn-secondary">Zurück zur Admin-Übersicht</a>
+
+    <div class="alert alert-warning border-0 shadow-sm d-flex align-items-center mt-4 rounded-3" role="alert">
+        <i class="bi bi-exclamation-triangle-fill fs-4 me-3 text-warning"></i>
+        <div>
+            <strong>Hinweis:</strong> Beim Entfernen eines Filterwertes wird dieser nicht automatisch aus bestehenden Objekten gelöscht. Bereits zugewiesene Werte bleiben in bestehenden Datensätzen erhalten.
+        </div>
    </div>
 </div>

 <script>
 function toggleEdit(id) {
    const el = document.getElementById(id);
-    if (el.style.display === 'none') {
+    if (el.style.display === 'none' || el.style.display === '') {
        el.style.display = 'block';
+        const input = el.querySelector('input[type="text"]');
+        if (input) input.focus();
    } else {
        el.style.display = 'none';
    }
 }
 </script>
-{% endblock %}
+{% endblock %}
@@ -71,27 +71,27 @@
    h1 {
        text-align: center;
        margin-bottom: 30px;
-        color: #343a40;
+        color: var(--ui-title);
    }
    
    .card {
        border-radius: 5px;
-        box-shadow: 0 2px 5px rgba(0,0,0,0.1);
+        box-shadow: var(--ui-shadow-sm);
        margin-bottom: 20px;
        background-color: var(--ui-surface);
-        border: 1px solid #e9ecef;
+        border: 1px solid var(--ui-border);
    }
    
    .card-header {
        background-color: var(--ui-surface-soft);
        padding: 15px 20px;
-        border-bottom: 1px solid #e9ecef;
+        border-bottom: 1px solid var(--ui-border);
    }
    
    .card-header h2 {
        margin: 0;
        font-size: 1.25rem;
-        color: #495057;
+        color: var(--ui-title);
    }
    
    .card-body {
@@ -111,8 +111,16 @@
    .form-group input {
        width: 100%;
        padding: 8px 12px;
-        border: 1px solid #ced4da;
+        border: 1px solid var(--ui-border);
        border-radius: 4px;
+        background: var(--ui-bg);
+        color: var(--ui-text);
+    }
+
+    .form-group input:focus {
+        outline: none;
+        border-color: #60a5fa;
+        box-shadow: 0 0 0 3px rgba(96, 165, 250, 0.22);
    }
    
    .btn {
@@ -171,17 +179,25 @@
        align-items: center;
        padding: 10px;
        background-color: var(--ui-surface-soft);
+        border: 1px solid var(--ui-border);
        border-radius: 4px;
        border-left: 3px solid #6c757d;
+        transition: background-color 0.15s ease, border-color 0.15s ease, transform 0.15s ease;
+    }
+
+    .location-value-item:hover {
+        background-color: var(--ui-bg-accent);
+        border-color: #60a5fa;
+        transform: translateY(-1px);
    }
    
    .location-value {
        font-weight: 500;
-        color: #495057;
+        color: var(--ui-text);
    }
    
    .no-values-message {
-        color: #6c757d;
+        color: var(--ui-text-muted);
        font-style: italic;
        text-align: center;
        padding: 20px;
@@ -196,5 +212,23 @@
        display: flex;
        justify-content: flex-end;
    }
+
+    @media (max-width: 576px) {
+        .location-values-list {
+            grid-template-columns: 1fr;
+        }
+
+        .location-value-item {
+            gap: 10px;
+        }
+
+        .actions-container {
+            justify-content: stretch;
+        }
+
+        .actions-container .btn {
+            width: 100%;
+        }
+    }
 </style>
 {% endblock %}
@@ -334,7 +334,7 @@ document.addEventListener('DOMContentLoaded', function () {

 body {
    font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-    background-color: var(--light-bg);
+    background-color: var(--ui-bg);
    margin: 0;
    padding: 0;
    color: var(--text-color);
@@ -719,5 +719,108 @@ code {
        font-size: 1.8rem;
    }
 }
+
+/* Registration-specific dark mode styling. */
+:root[data-theme="dark"] {
+    --light-bg: var(--ui-bg);
+    --text-color: var(--ui-text);
+    --shadow: var(--ui-shadow-md);
+}
+
+:root[data-theme="dark"] .header-section {
+    border-bottom-color: var(--ui-border);
+}
+
+:root[data-theme="dark"] .subtitle,
+:root[data-theme="dark"] .anonymize-hint,
+:root[data-theme="dark"] .form-group label,
+:root[data-theme="dark"] .permission-check,
+:root[data-theme="dark"] .input-icon {
+    color: var(--ui-text-muted) !important;
+}
+
+:root[data-theme="dark"] .content,
+:root[data-theme="dark"] .form-card,
+:root[data-theme="dark"] .permission-panel,
+:root[data-theme="dark"] .password-rules {
+    background: var(--ui-surface) !important;
+    background-color: var(--ui-surface) !important;
+    border-color: var(--ui-border) !important;
+    color: var(--ui-text) !important;
+    box-shadow: var(--ui-shadow-sm);
+}
+
+:root[data-theme="dark"] .form-card h2,
+:root[data-theme="dark"] .permission-panel h4,
+:root[data-theme="dark"] .password-rules-title {
+    color: var(--ui-title) !important;
+}
+
+:root[data-theme="dark"] input[type="text"],
+:root[data-theme="dark"] input[type="password"],
+:root[data-theme="dark"] input[type="file"],
+:root[data-theme="dark"] .form-select {
+    background: var(--ui-bg) !important;
+    background-color: var(--ui-bg) !important;
+    color: var(--ui-text) !important;
+    border-color: var(--ui-border) !important;
+}
+
+:root[data-theme="dark"] input[type="text"]:focus,
+:root[data-theme="dark"] input[type="password"]:focus,
+:root[data-theme="dark"] input[type="file"]:focus,
+:root[data-theme="dark"] .form-select:focus {
+    border-color: #60a5fa !important;
+    box-shadow: 0 0 0 3px rgba(96, 165, 250, 0.25) !important;
+}
+
+:root[data-theme="dark"] input[type="file"]::file-selector-button {
+    background: var(--ui-surface-soft);
+    color: var(--ui-text);
+    border-color: var(--ui-border);
+}
+
+:root[data-theme="dark"] input[type="file"]::file-selector-button:hover,
+:root[data-theme="dark"] .btn-secondary:hover {
+    background: var(--ui-bg-accent);
+}
+
+:root[data-theme="dark"] .password-rules {
+    background: var(--ui-surface-soft) !important;
+}
+
+:root[data-theme="dark"] .pw-rule {
+    color: #fca5a5;
+}
+
+:root[data-theme="dark"] .pw-rule.ok {
+    color: #86efac;
+}
+
+:root[data-theme="dark"] .anonymize-hint {
+    background: #082f49 !important;
+    border-color: #38bdf8 !important;
+    color: #bae6fd !important;
+}
+
+:root[data-theme="dark"] .permission-panel {
+    background: var(--ui-surface-soft) !important;
+}
+
+:root[data-theme="dark"] .btn-secondary {
+    background: var(--ui-surface-soft);
+    color: var(--ui-text);
+    border-color: var(--ui-border);
+}
+
+:root[data-theme="dark"] .flash.success {
+    background: #123524;
+    color: #b7f7ce;
+}
+
+:root[data-theme="dark"] .flash.error {
+    background: #451a1a;
+    color: #fecaca;
+}
 </style>
 {% endblock %}
@@ -254,6 +254,88 @@
        margin: 10px 0;
    }

+    :root[data-theme="dark"] .student-card-form,
+    :root[data-theme="dark"] .import-card {
+        background: var(--ui-surface) !important;
+        color: var(--ui-text) !important;
+        border-color: var(--ui-border) !important;
+        box-shadow: var(--ui-shadow-sm);
+    }
+
+    :root[data-theme="dark"] .import-card {
+        background: var(--ui-surface-soft) !important;
+    }
+
+    :root[data-theme="dark"] .import-card p,
+    :root[data-theme="dark"] .rollover-hint,
+    :root[data-theme="dark"] .empty-state,
+    :root[data-theme="dark"] .empty-state p {
+        color: var(--ui-text-muted) !important;
+    }
+
+    :root[data-theme="dark"] .rollover-box {
+        background: #422006 !important;
+        border-color: #f59e0b !important;
+    }
+
+    :root[data-theme="dark"] .rollover-label,
+    :root[data-theme="dark"] .rollover-hint {
+        color: #fde68a !important;
+    }
+
+    :root[data-theme="dark"] .form-group input,
+    :root[data-theme="dark"] .form-group select,
+    :root[data-theme="dark"] .form-group textarea,
+    :root[data-theme="dark"] .export-buttons form,
+    :root[data-theme="dark"] .export-buttons select {
+        background: var(--ui-bg) !important;
+        background-color: var(--ui-bg) !important;
+        color: var(--ui-text) !important;
+        border-color: var(--ui-border) !important;
+    }
+
+    :root[data-theme="dark"] .form-group input:focus,
+    :root[data-theme="dark"] .form-group select:focus,
+    :root[data-theme="dark"] .form-group textarea:focus,
+    :root[data-theme="dark"] .export-buttons select:focus {
+        border-color: #60a5fa !important;
+        box-shadow: 0 0 0 3px rgba(96, 165, 250, 0.22) !important;
+    }
+
+    :root[data-theme="dark"] .cards-table {
+        background: var(--ui-surface) !important;
+        color: var(--ui-text) !important;
+        border-color: var(--ui-border) !important;
+        box-shadow: var(--ui-shadow-sm);
+    }
+
+    :root[data-theme="dark"] .cards-table thead {
+        background: #1d4ed8 !important;
+        color: #ffffff !important;
+    }
+
+    :root[data-theme="dark"] .cards-table th,
+    :root[data-theme="dark"] .cards-table td {
+        background: var(--ui-surface) !important;
+        color: var(--ui-text) !important;
+        border-color: var(--ui-border) !important;
+    }
+
+    :root[data-theme="dark"] .cards-table tbody tr:hover td {
+        background: var(--ui-bg-accent) !important;
+    }
+
+    @media (max-width: 768px) {
+        .export-buttons {
+            width: 100%;
+        }
+
+        .export-buttons form,
+        .export-buttons > a {
+            flex: 1 1 100%;
+        }
+    }
+
    @media (max-width: 992px) {
        .dashboard-grid {
            grid-template-columns: 1fr;
@@ -6,7 +6,7 @@
 <div class="container py-4">
    <div class="row justify-content-center">
        <div class="col-12 col-lg-10 col-xl-8">
-            <div class="card border-0 shadow-lg rounded-4 overflow-hidden">
+            <div class="card termin-configure-card border-0 shadow-lg rounded-4 overflow-hidden">
                <div class="card-header text-white" style="background: linear-gradient(135deg, #0f4c5c, #16697a);">
                    <h1 class="h3 mb-1 fw-bold">Terminplan konfigurieren</h1>
                    <p class="mb-0 opacity-75">Erstellen Sie einen neuen Plan und verschicken Sie anschließend den Buchungslink.</p>
@@ -139,6 +139,79 @@
        </div>
    </div>
 </div>
+<style>
+    .termin-configure-card .card-body {
+        color: var(--ui-text);
+    }
+
+    .termin-configure-card .form-text {
+        color: var(--ui-text-muted) !important;
+    }
+
+    .termin-configure-card .form-control,
+    .termin-configure-card .form-select {
+        color: var(--ui-text);
+        background-color: var(--ui-surface);
+        border-color: var(--ui-border);
+    }
+
+    .termin-configure-card .form-control:focus,
+    .termin-configure-card .form-select:focus {
+        border-color: #60a5fa;
+        box-shadow: 0 0 0 0.25rem rgba(96, 165, 250, 0.25);
+    }
+
+    .termin-configure-card #slots_amounts_display {
+        background-color: #dbeafe !important;
+        color: #1d4ed8 !important;
+        border-color: #93c5fd !important;
+    }
+
+    :root[data-theme="dark"] .termin-configure-card .card-header {
+        background: linear-gradient(135deg, #0b3440, #155e75) !important;
+    }
+
+    :root[data-theme="dark"] .termin-configure-card .card-body {
+        background: var(--ui-surface) !important;
+        color: var(--ui-text) !important;
+    }
+
+    :root[data-theme="dark"] .termin-configure-card .bg-light-subtle,
+    :root[data-theme="dark"] .termin-configure-card .bg-white,
+    :root[data-theme="dark"] .termin-configure-card [data-day-row] {
+        background: var(--ui-surface-soft) !important;
+        color: var(--ui-text) !important;
+        border-color: var(--ui-border) !important;
+    }
+
+    :root[data-theme="dark"] .termin-configure-card #slots_amounts_display {
+        background: #172554 !important;
+        color: #bfdbfe !important;
+        border-color: #3b82f6 !important;
+    }
+
+    :root[data-theme="dark"] .termin-configure-card .text-primary {
+        color: #93c5fd !important;
+    }
+
+    :root[data-theme="dark"] .termin-configure-card .text-danger {
+        color: #fca5a5 !important;
+    }
+
+    :root[data-theme="dark"] .termin-configure-card .border-danger-subtle {
+        border-color: #f87171 !important;
+    }
+
+    :root[data-theme="dark"] .termin-configure-card .alert-success {
+        background: #123524 !important;
+        border-color: #2f9e62 !important;
+        color: #b7f7ce !important;
+    }
+
+    :root[data-theme="dark"] .termin-configure-card .alert-success a {
+        color: #bfdbfe !important;
+    }
+</style>
 <script>
 (function () {
    const startDateInput = document.getElementById('start_date');
@@ -647,12 +647,96 @@
        cursor: pointer;
        margin-left: 10px;
    }
+
+    /* Upload-specific dark mode surfaces and readable helper text. */
+    :root[data-theme="dark"] .upload-container {
+        background: var(--ui-surface) !important;
+        border: 1px solid var(--ui-border);
+        box-shadow: var(--ui-shadow-md);
+    }
+
+    :root[data-theme="dark"] .upload-import-panel,
+    :root[data-theme="dark"] #range_generator_group,
+    :root[data-theme="dark"] .filter-inputs,
+    :root[data-theme="dark"] .book-info-container,
+    :root[data-theme="dark"] .book-cover-preview,
+    :root[data-theme="dark"] .video-preview {
+        background: var(--ui-surface-soft) !important;
+        background-color: var(--ui-surface-soft) !important;
+        border-color: var(--ui-border) !important;
+        color: var(--ui-text) !important;
+    }
+
+    :root[data-theme="dark"] .upload-import-panel p,
+    :root[data-theme="dark"] .upload-import-panel small,
+    :root[data-theme="dark"] #isbn-scan-status,
+    :root[data-theme="dark"] #code4-scan-status,
+    :root[data-theme="dark"] .image-loading,
+    :root[data-theme="dark"] .book-info p,
+    :root[data-theme="dark"] .book-cover-caption {
+        color: var(--ui-text-muted) !important;
+    }
+
+    :root[data-theme="dark"] .upload-import-panel h3,
+    :root[data-theme="dark"] .book-info h4,
+    :root[data-theme="dark"] .book-description h5,
+    :root[data-theme="dark"] #range_generator_group label {
+        color: var(--ui-title) !important;
+    }
+
+    :root[data-theme="dark"] .upload-form input,
+    :root[data-theme="dark"] .upload-form select,
+    :root[data-theme="dark"] .upload-form textarea,
+    :root[data-theme="dark"] .filter-dropdown-select,
+    :root[data-theme="dark"] .upload-import-panel input[type="file"] {
+        background: var(--ui-bg) !important;
+        background-color: var(--ui-bg) !important;
+        color: var(--ui-text) !important;
+        border-color: var(--ui-border) !important;
+    }
+
+    :root[data-theme="dark"] .upload-form input:focus,
+    :root[data-theme="dark"] .upload-form select:focus,
+    :root[data-theme="dark"] .upload-form textarea:focus,
+    :root[data-theme="dark"] .filter-dropdown-select:focus {
+        border-color: #60a5fa !important;
+        box-shadow: 0 0 0 3px rgba(96, 165, 250, 0.25) !important;
+    }
+
+    :root[data-theme="dark"] .book-info,
+    :root[data-theme="dark"] .book-description p,
+    :root[data-theme="dark"] .video-placeholder {
+        background: var(--ui-bg) !important;
+        background-color: var(--ui-bg) !important;
+        border-color: var(--ui-border) !important;
+    }
+
+    :root[data-theme="dark"] .success-message {
+        background: #123524 !important;
+        border-color: #2f9e62 !important;
+        color: #b7f7ce !important;
+    }
+
+    :root[data-theme="dark"] .error-message,
+    :root[data-theme="dark"] .error,
+    :root[data-theme="dark"] .error-message-container {
+        background: #451a1a !important;
+        border-color: #f87171 !important;
+        color: #fecaca !important;
+    }
+
+    :root[data-theme="dark"] .warning-message,
+    :root[data-theme="dark"] .warning {
+        background: #422006 !important;
+        border-color: #f59e0b !important;
+        color: #fde68a !important;
+    }
 </style>

 <div class="upload-container">

    {% if show_library_features %}
-    <div style="border:1px solid #dbe4ee; border-radius:8px; padding:14px; margin-bottom:16px; background:#f8fbff;">
+    <div class="upload-import-panel" style="border:1px solid #dbe4ee; border-radius:8px; padding:14px; margin-bottom:16px; background:#f8fbff;">
        <h3 style="margin:0 0 8px 0;">Excel-Import Bibliothek (Mehrere Bücher)</h3>
        <p style="margin:0 0 10px 0; color:#555;">Laden Sie eine <strong>.xlsx</strong>- oder <strong>.csv</strong>-Datei hoch. Spalten werden automatisch erkannt (z.B. Name, Ort, Beschreibung, ISBN, Code, Anzahl). Für den Bibliotheksimport ist eine gültige ISBN je Zeile erforderlich.</p>
        <form method="POST" action="{{ url_for('upload_library_excel') }}" enctype="multipart/form-data" style="display:flex; gap:10px; flex-wrap:wrap; align-items:center;">
@@ -664,13 +748,12 @@
        </form>
    </div>
    {% else %}
-    <div style="border:1px solid #dbe4ee; border-radius:8px; padding:14px; margin-bottom:16px; background:#f8fbff;">
+    <div class="upload-import-panel" style="border:1px solid #dbe4ee; border-radius:8px; padding:14px; margin-bottom:16px; background:#f8fbff;">
        <h3 style="margin:0 0 8px 0;">Excel-Import Inventar (Mehrere Artikel)</h3>
        <p style="margin:0 0 10px 0; color:#555;">Laden Sie eine <strong>.xlsx</strong>- oder <strong>.csv</strong>-Datei hoch. Spalten werden automatisch erkannt (z.B. Name, Ort, Beschreibung, Filter1/2/3, Kosten, Jahr, Code, Anzahl).</p>
        <form method="POST" action="{{ url_for('upload_inventory_excel') }}" enctype="multipart/form-data" style="display:flex; gap:10px; flex-wrap:wrap; align-items:center;">
            <input type="file" name="inventory_excel" accept=".xlsx,.csv" required>
            <button type="button" class="btn btn-link" onclick="downloadSampleCsv('inventory')">Beispiel-CSV herunterladen</button>
-            <button type="button" class="btn btn-outline-secondary" title="Format-Hilfe" onclick="showCsvHelp('inventory')">?</button>
            <button type="submit" class="btn btn-secondary" name="excel_action" value="validate">Nur validieren</button>
            <button type="submit" class="btn btn-primary" name="excel_action" value="import">Inventar importieren</button>
        </form>
@@ -781,7 +864,7 @@
            {% else %}
            <!-- Normal Item Mode: Standard Filters -->
            <div class="filter-inputs">
-                <h3>Unterrichtsfach:</h3>
+                <h3>{{ filter_names.get('1', 'Jahrgangsstufe') }}</h3>
                <div class="multi-filter">
                    <div class="form-group">
                        <label for="filter1-1">Wert 1:</label>
@@ -813,7 +896,7 @@
                    </div>
                </div>
                
-                <h3>Jahrgangsstufe:</h3>
+                <h3>{{ filter_names.get('2', 'Fachgebiet') }}</h3>
                <div class="multi-filter">
                    <div class="form-group">
                        <label for="filter2-1">Wert 1:</label>
@@ -845,7 +928,7 @@
                    </div>
                </div>
                
-                <h3>Schlagwort:</h3>
+                <h3>{{ filter_names.get('3', 'Schlagwort') }}</h3>
                <div class="multi-filter">
                    <div class="form-group">
                        <label for="filter3-1">Wert 1:</label>
@@ -53,8 +53,11 @@
                        <option value="desc">Absteigend</option>
                    </select>
                </div>
-                <div class="col-md-2">
-                    <button class="btn btn-secondary w-100" onclick="resetFilters()">Filter zurücksetzen</button>
+                <div class="col-md-3">
+                    <div class="d-flex gap-2">
+                        <button class="btn btn-secondary flex-grow-1" onclick="resetFilters()">Zurücksetzen</button>
+                        <button class="btn btn-success flex-grow-1" onclick="exportFilteredUsers()">Exportieren</button>
+                    </div>
                </div>
            </div>
            <div class="mt-2 text-muted small" id="filter-count"></div>
@@ -82,19 +85,20 @@
                        <td>{{ permission_presets.get(user.permission_preset, {}).get('label', user.permission_preset) }}</td>
                        <td class="actions">
                            <form method="POST" action="{{ url_for('delete_user') }}" class="d-inline">
+                                <input type="hidden" name="csrf_token" value="{{ csrf_token }}">
                                <input type="hidden" name="username" value="{{ user.username }}">
                                <button type="submit" class="btn btn-danger btn-sm" onclick="return confirm('Sind Sie sicher, dass Sie den Benutzer {{ user.username }} löschen möchten?')">
                                    Löschen
                                </button>
                            </form>
-                            <button type="button" class="btn btn-primary btn-sm" 
+                            <button type="button" class="btn btn-primary btn-sm"
                                    data-username="{{ user.username }}"
                                    data-firstname="{{ user.name if user.name else '' }}"
                                    data-lastname="{{ user.last_name if user.last_name else '' }}"
                                    onclick="openEditUserModal(this)">
                                Bearbeiten
                            </button>
-                            <button type="button" class="btn btn-warning btn-sm" 
+                            <button type="button" class="btn btn-warning btn-sm"
                                    onclick="openResetPasswordModal('{{ user.username }}')">
                                Passwort zurücksetzen
                            </button>
@@ -124,6 +128,7 @@
                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
            </div>
            <form method="POST" action="{{ url_for('admin_update_user_permissions') }}">
+                <input type="hidden" name="csrf_token" value="{{ csrf_token }}">
                <div class="modal-body permissions-modal-body">
                    <input type="hidden" id="perm-username" name="username">
                    <div class="mb-3">
@@ -180,6 +185,7 @@
                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
            </div>
            <form method="POST" action="{{ url_for('admin_update_user_name') }}">
+                <input type="hidden" name="csrf_token" value="{{ csrf_token }}">
                <div class="modal-body">
                    <input type="hidden" id="edit-username" name="username">
                    <div class="mb-3">
@@ -213,6 +219,7 @@
                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
            </div>
            <form method="POST" action="{{ url_for('admin_reset_user_password') }}">
+                <input type="hidden" name="csrf_token" value="{{ csrf_token }}">
                <div class="modal-body">
                    <input type="hidden" id="reset-username" name="username">
                    <div class="mb-3">
@@ -313,6 +320,54 @@
        applyFilters();
    }

+    function exportFilteredUsers() {
+        var table = document.getElementById('user-table');
+        var tbody = table.querySelector('tbody');
+        var rows = Array.from(tbody.querySelectorAll('tr'));
+
+        var visibleUsernames = [];
+
+        // Sammle alle Benutzernamen, die durch den Filter aktuell NICHT versteckt sind
+        rows.forEach(function(row) {
+            if (row.style.display !== 'none') {
+                var cells = row.querySelectorAll('td');
+                if (cells.length > 0) {
+                    visibleUsernames.push(cells[0].textContent.trim());
+                }
+            }
+        });
+
+        if (visibleUsernames.length === 0) {
+            alert('Keine Benutzer zum Exportieren vorhanden.');
+            return;
+        }
+
+        // Dynamisches Formular erstellen
+        var form = document.createElement('form');
+        form.method = 'POST';
+        form.action = "{{ url_for('export_users_csv') }}";
+
+        // 1. CSRF-Token als Wert (ohne Klammern) übergeben
+        var csrfInput = document.createElement('input');
+        csrfInput.type = 'hidden';
+        csrfInput.name = 'csrf_token';
+        csrfInput.value = "{{ csrf_token }}";
+        form.appendChild(csrfInput);
+
+        // 2. Gefilterte Benutzernamen hinzufügen
+        var input = document.createElement('input');
+        input.type = 'hidden';
+        input.name = 'usernames';
+        input.value = JSON.stringify(visibleUsernames);
+        form.appendChild(input);
+
+        document.body.appendChild(form);
+        form.submit();
+
+        // Aufräumen
+        document.body.removeChild(form);
+    }
+
    document.addEventListener('DOMContentLoaded', function() {
        applyFilters();
        document.getElementById('filter-search').addEventListener('input', applyFilters);
@@ -332,12 +387,12 @@
        var username = button.getAttribute('data-username');
        var name = button.getAttribute('data-firstname');
        var lastName = button.getAttribute('data-lastname');
-        
+
        document.getElementById('edit-username').value = username;
        document.getElementById('edit-username-display').value = username;
        document.getElementById('edit-name').value = name;
        document.getElementById('edit-last-name').value = lastName;
-        
+
        var modal = new bootstrap.Modal(document.getElementById('editUserModal'));
        modal.show();
    }
@@ -345,8 +400,7 @@
    function openResetPasswordModal(username) {
        document.getElementById('reset-username').value = username;
        document.getElementById('username-display').value = username;
-        
-        // Open modal using Bootstrap
+
        var modal = new bootstrap.Modal(document.getElementById('resetPasswordModal'));
        modal.show();
    }
@@ -430,6 +430,7 @@ PY
 initialize_tenant_database() {
    local tenant_id="$1"
    local mode="$2"
+    local admin_password="${3:-admin123}"

    APP_CONTAINER=$(docker ps -qf "name=app" | head -n 1)
    if [ -z "$APP_CONTAINER" ]; then
@@ -438,7 +439,8 @@ initialize_tenant_database() {
        return 0
    fi

-    docker exec -i "$APP_CONTAINER" python3 - "$tenant_id" "$mode" <<'PY'
+    # Fix: We inject the password securely via a temporary environment variable (-e ADMIN_PASS)
+    docker exec -i -e ADMIN_PASS="$admin_password" "$APP_CONTAINER" python3 - "$tenant_id" "$mode" <<'PY'
 import sys, os, re, datetime, hashlib
 sys.path.insert(0, "/app")
 sys.path.insert(0, "/app/Web")
@@ -449,6 +451,13 @@ import Web.modules.database.user as us

 tenant_id = sys.argv[1].lower()
 mode = sys.argv[2]
+
+# Fix: Read the password directly from the environment variable instead of sys.argv
+admin_password = os.environ.get("ADMIN_PASS", "admin123")
+# Failsafe in case of empty string
+if not admin_password.strip():
+    admin_password = "admin123"
+
 sanitized = "".join(c for c in tenant_id if c.isalnum() or c == "_")
 db_name = f"inventar_{sanitized}" if sanitized else settings.MONGODB_DB

@@ -458,7 +467,7 @@ users = db["users"]
 permission_defaults = us.build_default_permission_payload("full_access")
 admin_doc = {
    "Username": "admin",
-    "Password": us.hashing("admin123"),
+    "Password": us.hashing(admin_password),
    "Admin": True,
    "active_ausleihung": None,
    "name": dp.encrypt_text("admin"),
@@ -488,7 +497,7 @@ if mode == "trial":

 client.close()

-print(f"Tenant {sys.argv[1]} database initialized. Default admin: admin / admin123")
+print(f"Tenant {sys.argv[1]} database initialized. Default admin: admin / {admin_password}")
 PY
 }

@@ -812,12 +821,26 @@ case "$COMMAND" in
            exit 1
        fi

-        PORT_ARG="${3:-}"
-        if [ -n "$PORT_ARG" ]; then
-            if ! printf '%s\n' "$PORT_ARG" | grep -qE '^[0-9]+$'; then
-                echo "Error: Port must be a numeric value."
-                exit 1
+        ARG3="${3:-}"
+        ARG4="${4:-}"
+
+        PORT_ARG=""
+        PASSWORD_ARG="admin123"
+
+        # Check if the 3rd argument is numeric (Port) or text (Password)
+        if [ -n "$ARG3" ]; then
+            if printf '%s\n' "$ARG3" | grep -qE '^[0-9]+$'; then
+                PORT_ARG="$ARG3"
+                if [ -n "$ARG4" ]; then
+                    PASSWORD_ARG="$ARG4"
+                fi
+            else
+                # If ARG3 is not numeric, treat it as the password without setting a port
+                PASSWORD_ARG="$ARG3"
            fi
+        fi
+
+        if [ -n "$PORT_ARG" ]; then
            register_tenant_port "$TENANT_ID" "$PORT_ARG"
            update_runtime_ports "$PORT_ARG"
            sync_tenant_port_map
@@ -829,11 +852,9 @@ case "$COMMAND" in
            fi
        fi

-        
-
        echo "Adding new tenant '$TENANT_ID'..."
        echo "Initializing database for $TENANT_ID..."
-        initialize_tenant_database "$TENANT_ID" "standard"
+        initialize_tenant_database "$TENANT_ID" "standard" "$PASSWORD_ARG"
        echo "Tenant '$TENANT_ID' successfully added. Ready to use."
        ;;

@@ -872,81 +893,94 @@ case "$COMMAND" in
        ;;

    remove)
-        FORCE_REMOVE=false
-        TENANT_ARG="${2:-}"
+    FORCE_REMOVE=false

-        if [ "$TENANT_ARG" = "--yes" ] || [ "$TENANT_ARG" = "-y" ]; then
-            FORCE_REMOVE=true
-            TENANT_ID="${3:-}"
-        else
-            TENANT_ID="$TENANT_ARG"
+    # Fix: Prüfe sowohl Position 2 als auch 3 auf das -y Flag
+    if [ "${2:-}" = "--yes" ] || [ "${2:-}" = "-y" ]; then
+        FORCE_REMOVE=true
+        TENANT_ID="${3:-}"
+    elif [ "${3:-}" = "--yes" ] || [ "${3:-}" = "-y" ]; then
+        FORCE_REMOVE=true
+        TENANT_ID="${2:-}"
+    else
+        TENANT_ID="${2:-}"
+    fi
+
+    if [ -z "$TENANT_ID" ]; then
+        echo "Error: Please provide a tenant_id to remove."
+        exit 1
+    fi
+
+    if [ "$FORCE_REMOVE" != true ]; then
+        echo -n "WARNING: Are you sure you want to permanently delete all data for tenant '$TENANT_ID'? (y/N) "
+        read confirm
+        if [ "$confirm" != "y" ] && [ "$confirm" != "Y" ]; then
+            echo "Removal canceled."
+            exit 0
        fi
+    fi

-        if [ -z "$TENANT_ID" ]; then
-            echo "Error: Please provide a tenant_id to remove."
-            exit 1
-        fi
+    echo "Removing tenant '$TENANT_ID'..."
+    APP_CONTAINER=$(docker ps -qf "name=app" | head -n 1)
+    port_to_remove=""

-        if [ "$FORCE_REMOVE" != true ]; then
-            echo -n "WARNING: Are you sure you want to permanently delete all data for tenant '$TENANT_ID'? (y/N) "
-            read confirm
-            if [ "$confirm" != "y" ] && [ "$confirm" != "Y" ]; then
-                echo "Removal canceled."
-                exit 0
-            fi
-        fi
+    if [ -n "$APP_CONTAINER" ]; then
+        # MongoDB-Datenbank via PyMongo direkt im Container droppen
+        # Fix 1: Wir hängen '|| true' an, damit das Skript nicht abstürzt, falls der Befehl fehlschlägt.
+        docker exec -i "$APP_CONTAINER" python3 -c '
+import sys, os
+try:
+    import pymongo
+    tenant_id = sys.argv[1]
+    # In Docker Compose heißt der Host oft "mongodb" statt "localhost"
+    mongo_uri = os.environ.get("MONGO_URI", "mongodb://mongodb:27017/")
+    client = pymongo.MongoClient(mongo_uri, serverSelectionTimeoutMS=2000)

-        echo "Removing tenant '$TENANT_ID'..."
-        APP_CONTAINER=$(docker ps -qf "name=app" | head -n 1)
-        port_to_remove=""
+    # Fix 2: Wir versuchen beide Formate zu löschen, da "list" zeigt, dass sie "test" und nicht "inventar_test" heißen.
+    dbs_to_drop = [f"inventar_{tenant_id}", tenant_id]
+    existing_dbs = client.list_database_names()

-        if [ -n "$APP_CONTAINER" ]; then
-            # MongoDB-Datenbank via PyMongo direkt im Container droppen
-            docker exec -i "$APP_CONTAINER" python3 -c '
-    import sys, os
-    try:
-        import pymongo
-        tenant_id = sys.argv[1]
-        mongo_uri = os.environ.get("MONGO_URI", "mongodb://localhost:27017/")
-        client = pymongo.MongoClient(mongo_uri, serverSelectionTimeoutMS=2000)
-        db_name = f"inventar_{tenant_id}"
-        if db_name in client.list_database_names():
+    for db_name in dbs_to_drop:
+        if db_name in existing_dbs:
            client.drop_database(db_name)
            print(f"Dropped database: {db_name}")
-    except Exception as e:
-        print(f"Error dropping database: {e}", file=sys.stderr)
-    ' "$TENANT_ID" > /dev/null 2>&1
+except Exception as e:
+    print(f"Error dropping database: {e}", file=sys.stderr)
+' "$TENANT_ID" > /dev/null 2>&1 || true

-            # Konfiguration und Port via Host-Funktion bereinigen und Port ermitteln
-            if port_to_remove="$(remove_tenant_port "$TENANT_ID" 2>/dev/null)"; then
-                :
-            else
-                port_to_remove=""
-            fi
-
-            echo "Tenant '$TENANT_ID' database and config removed."
+        # Konfiguration und Port via Host-Funktion bereinigen und Port ermitteln
+        if port_to_remove="$(remove_tenant_port "$TENANT_ID" 2>/dev/null)"; then
+            :
        else
-            echo "Warning: Application container not running. Tenant database may still exist in MongoDB."
-            if port_to_remove="$(remove_tenant_port "$TENANT_ID" 2>/dev/null)"; then
-                :
-            else
-                echo "Warning: tenant '$TENANT_ID' was not configured in config.json or could not be removed."
-            fi
+            port_to_remove=""
        fi

-        if [ -n "$port_to_remove" ]; then
-            remove_runtime_port "$port_to_remove"
-        fi
-        remove_tenant_nginx_config "$TENANT_ID"
-        sync_tenant_port_map
-        if [ -n "$(docker ps -qf 'name=app' | head -n 1)" ]; then
-            restart_app_container
-        fi
-        if [ -n "$port_to_remove" ]; then
-            echo "Removed tenant '$TENANT_ID' and cleaned runtime port $port_to_remove."
+        echo "Tenant '$TENANT_ID' database and config removed."
+    else
+        echo "Warning: Application container not running. Tenant database may still exist in MongoDB."
+        if port_to_remove="$(remove_tenant_port "$TENANT_ID" 2>/dev/null)"; then
+            :
        else
-            echo "Removed tenant '$TENANT_ID'. No port mapping was present."
+            echo "Warning: tenant '$TENANT_ID' was not configured in config.json or could not be removed."
        fi
+    fi
+
+    if [ -n "$port_to_remove" ]; then
+        remove_runtime_port "$port_to_remove" 2>/dev/null || true
+    fi
+
+    remove_tenant_nginx_config "$TENANT_ID"
+    sync_tenant_port_map
+
+    if [ -n "$(docker ps -qf 'name=app' | head -n 1)" ]; then
+        restart_app_container || true
+    fi
+
+    if [ -n "$port_to_remove" ]; then
+        echo "Removed tenant '$TENANT_ID' and cleaned runtime port $port_to_remove."
+    else
+        echo "Removed tenant '$TENANT_ID'. No port mapping was present."
+    fi
    ;;

    restart-tenant)
Author	SHA1	Message	Date
Aiirondev_dev	a8f3907f34	Fix of some timezone problems Release Inventarsystem / release-docker (push) Successful in 3m18s Details	2026-09-15 10:51:00 +02:00
Aiirondev_dev	6311e7710a	changes to the deisgn Release Inventarsystem / release-docker (push) Successful in 3m28s Details	2026-09-14 11:02:11 +02:00
Aiirondev_dev	e71567db11	changes toi the darkmode style to have iot be a better edesign Release Inventarsystem / release-docker (push) Successful in 2m26s Details	2026-09-14 10:54:19 +02:00
Aiirondev_dev	2c6043399e	changes to the style Release Inventarsystem / release-docker (push) Successful in 2m27s Details	2026-09-14 10:24:45 +02:00
Aiirondev_dev	acfb633cda	changes to the Scanning processing Release Inventarsystem / release-docker (push) Successful in 2m27s Details	2026-09-14 09:40:59 +02:00
Aiirondev_dev	23dfb7d719	changes to the authentification Release Inventarsystem / release-docker (push) Successful in 2m27s Details	2026-09-14 09:23:09 +02:00
Aiirondev_dev	6b9cf8a024	changes to th the authentification for the page Release Inventarsystem / release-docker (push) Successful in 2m25s Details	2026-09-14 09:13:43 +02:00
Aiirondev_dev	69bb02b7dc	changes to the fuplicate import Release Inventarsystem / release-docker (push) Successful in 13m24s Details	2026-09-14 09:03:02 +02:00
Aiirondev_dev	6a3a5d6373	Changes to the library scanning function Release Inventarsystem / release-docker (push) Successful in 3m11s Details	2026-09-10 19:42:32 +02:00
Aiirondev_dev	09efedad69	changes to the Mahnungssystem Release Inventarsystem / release-docker (push) Successful in 9m58s Details	2026-09-09 20:36:08 +02:00
Aiirondev_dev	b05d238a60	changes to the Schüler id getting Release Inventarsystem / release-docker (push) Successful in 2m18s Details	2026-09-09 20:09:44 +02:00
Aiirondev_dev	63a7b64150	change to the Hinweis that is shown Release Inventarsystem / release-docker (push) Successful in 2m19s Details	2026-09-09 19:02:19 +02:00
Aiirondev_dev	d5f4558b70	fixes to the physical scanner functionality Release Inventarsystem / release-docker (push) Successful in 3m15s Details	2026-09-09 18:50:14 +02:00
Aiirondev_dev	0e85337fc5	changes to the scanning functrionality Release Inventarsystem / release-docker (push) Successful in 2m22s Details	2026-09-08 18:36:34 +02:00
Aiirondev_dev	0114fec928	changes to the physical scanner processing Release Inventarsystem / release-docker (push) Successful in 12m48s Details	2026-09-08 18:19:40 +02:00
Aiirondev_dev	b16ad56b98	New password option fo the tenant adding and heatlth check Release Inventarsystem / release-docker (push) Successful in 3m16s Details	2026-08-27 11:31:07 +02:00
Aiirondev_dev	d2c21bc519	New password option fo the tenant adding and heatlth check Release Inventarsystem / release-docker (push) Successful in 3m9s Details	2026-08-26 22:55:56 +02:00
Aiirondev_dev	4461644cb6	New password option fo the tenant adding Release Inventarsystem / release-docker (push) Successful in 3m22s Details	2026-08-25 19:47:29 +02:00
Aiirondev_dev	73db5c5fe0	changes to the removal process Release Inventarsystem / release-docker (push) Successful in 2m15s Details	2026-08-25 00:07:06 +02:00
Aiirondev_dev	d609775eb6	Implementation of the switch between Anzahl oder Code Release Inventarsystem / release-docker (push) Successful in 3m7s Details	2026-08-24 18:24:32 +02:00
Aiirondev_dev	c1a6a145dc	The School year rollover button is placed in the school settings. Release Inventarsystem / release-docker (push) Successful in 2m16s Details	2026-08-24 18:00:35 +02:00
Aiirondev_dev	1091854797	change of the manage_filters.html design and removal of irelevant csv info modal Release Inventarsystem / release-docker (push) Successful in 2m16s Details	2026-08-24 17:27:49 +02:00
Aiirondev_dev	a5954ce8cb	Correction of the filter naming in the upload_admin.html and edit_library.html Release Inventarsystem / release-docker (push) Successful in 2m15s Details	2026-08-24 17:16:59 +02:00
Aiirondev_dev	06318d0d2d	Correction of the filter naming in the upload_admin.html and edit_library.html Release Inventarsystem / release-docker (push) Successful in 2m16s Details	2026-08-24 17:16:15 +02:00
Aiirondev_dev	5ed3c906dd	Correction of the implementation of the Filter_names in the manage_filters.html. Release Inventarsystem / release-docker (push) Successful in 2m14s Details	2026-08-24 16:53:40 +02:00
Aiirondev_dev	8ce74d3e62	Correction of the implementation of the Filter_names in the manage_filters.html. Release Inventarsystem / release-docker (push) Successful in 2m14s Details	2026-08-24 16:42:15 +02:00
Aiirondev_dev	ee25c46ff3	Correction of the table library view Release Inventarsystem / release-docker (push) Successful in 2m14s Details	2026-08-24 16:15:47 +02:00
Aiirondev_dev	f7fe2fcc11	Correction of an Miss placed Label Release Inventarsystem / release-docker (push) Successful in 2m14s Details	2026-08-24 16:13:04 +02:00
Aiirondev_dev	4449007a15	Default Filternames Changes for the main_admin.html Release Inventarsystem / release-docker (push) Successful in 2m14s Details	2026-08-24 16:08:24 +02:00
Aiirondev_dev	6770d42f99	Default Filternames Changed Release Inventarsystem / release-docker (push) Successful in 2m15s Details	2026-08-24 16:00:58 +02:00
Aiirondev_dev	333f9fc89a	New Modal Overlay Release Inventarsystem / release-docker (push) Successful in 2m18s Details	2026-08-24 15:45:08 +02:00
Aiirondev_dev	a286236834	New Modal Overlay Release Inventarsystem / release-docker (push) Successful in 2m17s Details	2026-08-24 15:41:33 +02:00
Aiirondev_dev	84cc8de833	Reverse of faulty changes Release Inventarsystem / release-docker (push) Successful in 2m16s Details	2026-08-24 14:52:50 +02:00
Aiirondev_dev	4b3c7e646f	Replaced the Browser side pop ups with custom ones from the site itsself Release Inventarsystem / release-docker (push) Successful in 2m17s Details	2026-08-24 14:45:21 +02:00
Aiirondev_dev	f9b013508c	Change of the Schaden melden button to be correctly considert a button Release Inventarsystem / release-docker (push) Successful in 2m16s Details	2026-08-24 14:12:28 +02:00
Aiirondev_dev	2a6c40eb5a	Fix for the CRSF Token implementation callability Release Inventarsystem / release-docker (push) Successful in 2m16s Details	2026-08-24 12:35:16 +02:00
Aiirondev_dev	432d6da798	Fix for the CRSF Token implementation Release Inventarsystem / release-docker (push) Successful in 2m15s Details	2026-08-24 12:12:55 +02:00
Aiirondev_dev	2cdf0d2169	implementation of the export for users Release Inventarsystem / release-docker (push) Successful in 3m8s Details	2026-08-24 11:56:03 +02:00
Aiirondev_dev	9a4d10def7	implementation of the Email add on check Release Inventarsystem / release-docker (push) Successful in 2m19s Details	2026-08-23 22:14:54 +02:00
Aiirondev_dev	10ae98245c	Make the Mahnungen accueally dependent on the student_ausleih_dauer Release Inventarsystem / release-docker (push) Successful in 2m17s Details	2026-08-23 21:59:16 +02:00
Aiirondev_dev	359a8f8ab1	Make the Mahnungen accueally dependent on the student_ausleih_dauer Release Inventarsystem / release-docker (push) Successful in 2m19s Details	2026-08-23 21:45:02 +02:00
Aiirondev_dev	3171455f55	Fix of a logik error Release Inventarsystem / release-docker (push) Successful in 2m17s Details	2026-08-23 21:14:04 +02:00