chore: bump version to v0.8.30

- Added `remove_done` function to clean up finished appointments in the database.
- Introduced `get_upcoming_for_user` function to retrieve upcoming appointments for a specific user.
- Updated `backend_server.py` to include a new endpoint for fetching user-specific upcoming events.
- Modified `blueprint.py` to render upcoming events in the user interface.
- Enhanced `terminplan.html` to display a list of upcoming appointments with relevant details and action links.
- Updated configuration to enable the new appointment planning feature.

.release-version

@@ -1 +1 @@
-v0.8.7
+v0.8.30

Dockerfile

@@ -32,4 +32,4 @@ RUN if [ "$NUITKA_BUILD" = "1" ]; then \
 WORKDIR /app/Web
 EXPOSE 8000
 
-CMD ["gunicorn", "app:app", "--bind", "0.0.0.0:8000", "--workers", "2", "--timeout", "30", "--graceful-timeout", "20", "--max-requests", "200", "--max-requests-jitter", "50", "--log-level", "info", "--access-logfile", "-", "--error-logfile", "-"]
+CMD ["gunicorn", "app:app", "--bind", "0.0.0.0:8000", "--workers", "2", "--timeout", "30", "--graceful-timeout", "20", "--max-requests", "1000", "--max-requests-jitter", "100", "--log-level", "info", "--access-logfile", "-", "--error-logfile", "-"]

Web/app.py

@@ -37,6 +37,7 @@ if _CURRENT_DIR not in sys.path:
 import Web.modules.database.user as us
 import Web.modules.database.items as it
 import Web.modules.database.ausleihung as au
+import Web.modules.database.termine as termin
 import Web.modules.log.audit_log as al
 import push_notifications as pn
 import Web.modules.inventarsystem.pdf_export as pdf_export 
@@ -84,7 +85,7 @@ from Web.modules.terminplaner.blueprint import appoint_bp as terminplaner_bp
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 import Web.modules.database.settings as cfg
 from Web.modules.database.settings import MongoClient
-from tenant import get_tenant_context, get_tenant_trial_status, purge_expired_trial_tenants
+from tenant import get_tenant_context, get_tenant_db, get_tenant_trial_status, purge_expired_trial_tenants
 
 
 app = Flask(__name__, static_folder='static')  # Correctly set static folder
@@ -626,14 +627,18 @@ def handle_unexpected_exception(e):
     if request.is_json or request.path.startswith('/api/'):
         return jsonify({'error': 'Internal server error', 'status': 500}), 500
 
-    if 'username' in session:
+    try:
+        return render_template(
+            'maintenance.html',
+            error_code=500,
+            error_message='Das System führt gerade Wartungsarbeiten durch.',
+        ), 500
+    except Exception:
         try:
-            return render_template('error.html', error_code=500, error_message='Interner Serverfehler.'), 500
+            return render_template('error.html', error_code=500, error_message='Das System führt gerade Wartungsarbeiten durch.'), 500
         except Exception:
             return 'Internal Server Error', 500
 
-    return redirect(url_for('login'))
-
 
 def _csrf_error_response(message='CSRF token fehlt oder ist ungültig.'):
     if request.is_json or request.path.startswith('/api/') or request.path in {'/download_book_cover', '/proxy_image', '/log_mobile_issue'}:
@@ -3479,6 +3484,66 @@ def api_library_scan_action():
             client.close()
 
 
+@app.route('/api/scan_upload', methods=['POST'])
+def api_scan_upload():
+    """
+    Server-side barcode/QR decoding endpoint.
+    Accepts image upload and returns detected barcodes (fallback for client-side scanner).
+    """
+    if 'username' not in session:
+        return jsonify({'ok': False, 'message': 'Nicht angemeldet.'}), 401
+
+    try:
+        from pyzbar.pyzbar import decode
+        from PIL import Image
+        import io
+    except ImportError:
+        return jsonify({'ok': False, 'message': 'pyzbar library not installed on server.'}), 500
+
+    if 'image' not in request.files:
+        return jsonify({'ok': False, 'message': 'Keine Bilddatei bereitgestellt.'}), 400
+
+    file = request.files['image']
+    if file.filename == '':
+        return jsonify({'ok': False, 'message': 'Datei ist leer.'}), 400
+
+    try:
+        # Decode image
+        image = Image.open(io.BytesIO(file.read()))
+        image = image.convert('RGB')
+
+        # Detect barcodes using pyzbar
+        results = decode(image)
+
+        if not results:
+            return jsonify({'ok': False, 'message': 'Kein Barcode im Bild erkannt.'}), 400
+
+        # Return all detected barcodes, sorted by confidence (quality)
+        barcodes = [
+            {
+                'type': result.type,
+                'value': result.data.decode('utf-8'),
+                'rect': {
+                    'x': result.rect.left,
+                    'y': result.rect.top,
+                    'width': result.rect.width,
+                    'height': result.rect.height,
+                }
+            }
+            for result in results
+        ]
+
+        return jsonify({
+            'ok': True,
+            'barcodes': barcodes,
+            'message': f'{len(barcodes)} Barcode(s) erkannt.'
+        }), 200
+
+    except Exception as e:
+        app.logger.error(f"Error decoding barcode image: {e}")
+        return jsonify({'ok': False, 'message': f'Fehler beim Dekodieren: {str(e)}'}), 500
+
+
 @app.route('/api/item_detail/<item_id>')
 def api_item_detail(item_id):
     """
@@ -4799,6 +4864,96 @@ def get_bookings():
             client.close()
 
 
+@app.route('/get_user_appointments')
+def get_user_appointments():
+    """Return the current user's planned and active appointments for the calendar."""
+    if 'username' not in session:
+        return jsonify({'ok': False, 'error': 'unauthorized'}), 401
+
+    client = None
+    try:
+        username = session.get('username')
+
+        client = MongoClient(MONGODB_HOST, MONGODB_PORT)
+        db = client[MONGODB_DB]
+        items_col = db['items']
+
+        # Use the appointment collection for the user's appointments
+        appointments = termin.get_upcoming_for_user(username, limit=250)
+
+        result = []
+        import re as _re
+
+        def _date_iter(start_value: str, end_value: str):
+            try:
+                start_date = datetime.datetime.strptime(start_value, '%Y-%m-%d').date()
+                end_date = datetime.datetime.strptime(end_value, '%Y-%m-%d').date()
+            except Exception:
+                return []
+            if end_date < start_date:
+                end_date = start_date
+            cursor = start_date
+            days = []
+            while cursor <= end_date:
+                days.append(cursor.strftime('%Y-%m-%d'))
+                cursor += datetime.timedelta(days=1)
+            return days
+
+        for appt in appointments:
+            appt_id = str(appt.get('_id') or '')
+            if not appt_id:
+                continue
+
+            date_start = str(appt.get('date_start') or '')
+            date_end = str(appt.get('date_end') or date_start)
+            time_span = appt.get('time_span', []) or []
+            title = appt.get('note') or f"Termin von {appt.get('user') or ''}"
+            days_in_range = _date_iter(date_start, date_end) or ([date_start] if date_start else [])
+
+            span_entries = []
+            for entry in time_span:
+                s = str(entry or '').strip()
+                if not s:
+                    continue
+                m_date = _re.match(r"^(\d{4}-\d{2}-\d{2})\s+(\d{2}:\d{2})-(\d{2}:\d{2})$", s)
+                if m_date:
+                    span_entries.append((m_date.group(1), m_date.group(2), m_date.group(3)))
+                    continue
+                m = _re.match(r"^(\d{2}:\d{2})-(\d{2}:\d{2})$", s)
+                if m:
+                    for day in days_in_range:
+                        span_entries.append((day, m.group(1), m.group(2)))
+
+            # If the stored span is already day-specific, use it as-is.
+            # If it was generic, we duplicated it to each day in the range above.
+            if not span_entries and days_in_range:
+                # Fallback: create a simple all-day marker for each date so the appointment is visible.
+                for day in days_in_range:
+                    span_entries.append((day, '08:00', '16:45'))
+
+            for day, start_time, end_time in span_entries:
+                result.append({
+                    'id': f"{appt_id}-{day}-{start_time}",
+                    'title': title,
+                    'start': f"{day}T{start_time}",
+                    'end': f"{day}T{end_time}",
+                    'status': 'planned',
+                    'itemId': appt_id,
+                    'userName': str(appt.get('user') or ''),
+                    'notes': str(appt.get('note') or ''),
+                    'period': None,
+                    'isCurrentUser': True,
+                    'itemBorrower': '',
+                })
+
+        return jsonify({'ok': True, 'bookings': result})
+    except Exception as e:
+        return jsonify({'ok': False, 'error': str(e), 'bookings': []}), 500
+    finally:
+        if client:
+            client.close()
+
+
 @app.route('/api/booking_conflicts')
 def api_booking_conflicts():
     """

Web/modules/database/termine.py

@@ -22,6 +22,14 @@ from Web.modules.database.settings import MongoClient
 from bson.objectid import ObjectId
 import datetime 
 
+
+def _get_tenant_db(client):
+    try:
+        from tenant import get_tenant_db
+        return get_tenant_db(client)
+    except Exception:
+        return client[cfg.MONGODB_DB]
+
 def _active_record_query(extra_query=None):
     """Build a query that excludes logically deleted records."""
     base_query = {'Deleted': {'$ne': True}}
@@ -30,10 +38,10 @@ def _active_record_query(extra_query=None):
     return base_query
 
 
-def add(date_start: str, date_end: str, time_span: list, slots: int, slot_lenght: int, user: str, mail: list=[], note:str=""):
+def add(date_start: str, date_end: str, time_span: list, slots: int, slot_lenght: int, user: str, mail: list=[], note:str="", calendar_enabled: bool=False):
     try:
         client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
-        db = client[cfg.MONGODB_DB]
+        db = _get_tenant_db(client)
         items = db['appointments']
 
         item = {
@@ -45,6 +53,7 @@ def add(date_start: str, date_end: str, time_span: list, slots: int, slot_lenght
             'user': user,
             'mail': mail,
             'note': note,
+            'calendar_enabled': bool(calendar_enabled),
             'slots_booked': [], # -> [(start_time, name), ...]the list gets there indexes as the slot 1-defined so is can be counted without an extra variable
             'Created': datetime.datetime.now(),
             'LastUpdated': datetime.datetime.now()
@@ -67,7 +76,7 @@ def get_item(id):
     """
     try:
         client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
-        db = client[cfg.MONGODB_DB]
+        db = _get_tenant_db(client)
         items = db['appointments']
         item = items.find_one(_active_record_query({'_id': ObjectId(id)}))
         client.close()
@@ -89,11 +98,11 @@ def update(id,slots_used: list):
     """
     try:
         client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
-        db = client[cfg.MONGODB_DB]
+        db = _get_tenant_db(client)
         items = db['appointments']
 
         update_data = {
-            'slots_booked': [slots_used],
+            'slots_booked': slots_used,
             'LastUpdated': datetime.datetime.now()
         }
 
@@ -123,7 +132,7 @@ def remove_slot(id, date_start_time, name):
     """
     try:
         client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
-        db = client[cfg.MONGODB_DB]
+        db = _get_tenant_db(client)
         items = db['appointments']
 
         # Attempt to pull the exact element (stored as an array/tuple)
@@ -151,15 +160,75 @@ def remove(id):
     """
     try:
         client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
-        db = client[cfg.MONGODB_DB]
+        db = _get_tenant_db(client)
         items = db['appointments']
 
         result = items.delete_one({'_id': ObjectId(id)})
 
         client.close()
-        return result.modified_count > 0
+        return result.deleted_count > 0
     except Exception as e:
         print(f"Error removing appointment: {e}")
         return False
 
+def remove_done():
+    """removose already finisched appointments"""
+    try:
+        client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
+        db = _get_tenant_db(client)
+        items = db['appointments']
+
+        today = datetime.date.today().strftime('%Y-%m-%d')
+        removed_count = 0
+
+        cursor = items.find(
+            _active_record_query(
+                {
+                    'date_end': {'$lt': today},
+                }
+            )
+        ).sort('date_start', 1)
+
+        for item in cursor:
+            item['_id'] = str(item.get('_id'))
+            result = items.delete_one({'_id': ObjectId(item['_id'])})
+            removed_count += result.deleted_count
+        
+        client.close()
+        return removed_count > 0
+    except Exception as e:
+        print(f"Error removing appointment: {e}")
+        return False
+
+def get_upcoming_for_user(user: str, limit: int = 25):
+    """Return upcoming appointment plans for a user ordered by start date."""
+    remove_done()
+    try:
+        client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
+        db = _get_tenant_db(client)
+        items = db['appointments']
+
+        today = datetime.date.today().strftime('%Y-%m-%d')
+        cursor = items.find(
+            _active_record_query(
+                {
+                    'user': str(user or '').strip(),
+                    'date_end': {'$gte': today},
+                }
+            )
+        ).sort('date_start', 1)
+
+        results = []
+        for item in cursor:
+            item['_id'] = str(item.get('_id'))
+            results.append(item)
+            if len(results) >= max(1, int(limit)):
+                break
+
+        client.close()
+        return results
+    except Exception as e:
+        print(f"Error retrieving upcoming appointments: {e}")
+        return []
+
  

Web/modules/terminplaner/backend_server.py

@@ -2,12 +2,40 @@
 Class for all funktions of the executive -> Lehrer
 """
 import datetime
+from datetime import timedelta
+from flask import url_for, has_request_context, request
 import Web.modules.emailservice.email as mail_service
 import Web.modules.database.termine as termin
 import Web.modules.database.settings as cfg
 from Web.tenant import get_tenant_context
 
 
+def _resolve_public_base_url() -> str:
+    if has_request_context():
+        try:
+            return request.url_root.rstrip('/')
+        except Exception:
+            pass
+
+    tenant_context = get_tenant_context()
+    subdomain = ''
+    if tenant_context:
+        subdomain = getattr(tenant_context, 'subdomain', '') or getattr(tenant_context, 'tenant_id', '') or ''
+    return f"https://{subdomain}.invario.eu" if subdomain else "https://invario.eu"
+
+
+def _current_tenant_id() -> str:
+    tenant_context = get_tenant_context()
+    if tenant_context and getattr(tenant_context, 'tenant_id', None):
+        return str(tenant_context.tenant_id)
+    if has_request_context():
+        try:
+            return str(request.args.get('tenant', '') or request.args.get('tenant_id', '') or '').strip()
+        except Exception:
+            return ''
+    return ''
+
+
 def _normalize_time_span(time_span):
     if isinstance(time_span, list):
         return [str(entry).strip() for entry in time_span if str(entry).strip()]
@@ -32,7 +60,139 @@ def _normalize_mail_list(mail):
         return [entry.strip() for entry in mail.replace(';', ',').split(',') if entry.strip()]
     return []
 
-def new(date_start: str, date_end: str, time_span: list, slots: int, slot_lenght: int, user: str, mail: list=[], note:str="") -> str:
+def _escape_ics_text(value):
+    return str(value or '').replace('\\', '\\\\').replace(';', '\\;').replace(',', '\\,').replace('\r\n', '\n').replace('\n', '\\n').replace('\r', '')
+
+
+def _format_ics_date(date_value):
+    if isinstance(date_value, datetime.datetime):
+        return date_value.strftime('%Y%m%dT%H%M%SZ')
+    if isinstance(date_value, datetime.date):
+        return date_value.strftime('%Y%m%d')
+    return ''
+
+
+def build_calendar_ics(appointment_id: str) -> str | None:
+    item = termin.get_item(appointment_id)
+    if not item:
+        return None
+
+    date_start = item.get('date_start')
+    date_end = item.get('date_end')
+    time_span = item.get('time_span', []) or []
+    creator = item.get('user', 'Terminplaner')
+    note = item.get('note', '') or ''
+    tenant_id = _current_tenant_id()
+    try:
+        link = url_for('terminplaner.client', appointment_id=str(appointment_id), tenant=tenant_id or None, _external=True)
+    except Exception:
+        host = _resolve_public_base_url()
+        link = host + "/terminplaner/client/" + str(appointment_id)
+        if tenant_id:
+            link += f"?tenant={tenant_id}"
+
+    try:
+        start_date = datetime.datetime.strptime(str(date_start), '%Y-%m-%d').date()
+        end_date = datetime.datetime.strptime(str(date_end), '%Y-%m-%d').date()
+    except Exception:
+        return None
+
+    uid = f"terminplaner-{appointment_id}@invario.eu"
+    created_at = datetime.datetime.utcnow().strftime('%Y%m%dT%H%M%SZ')
+    summary = f"Terminplan für {creator}"
+    description_lines = [
+        f"Buchungslink: {link}",
+        f"Zeitraum: {date_start} bis {date_end}",
+    ]
+    if time_span:
+        description_lines.append('Zeitfenster: ' + '; '.join(str(entry) for entry in time_span))
+    if note:
+        description_lines.append('Notiz: ' + str(note))
+
+    ics_lines = [
+        'BEGIN:VCALENDAR',
+        'VERSION:2.0',
+        'PRODID:-//Inventarsystem//Terminplaner//DE',
+        'CALSCALE:GREGORIAN',
+        'METHOD:PUBLISH',
+        'BEGIN:VEVENT',
+        f'UID:{uid}',
+        f'DTSTAMP:{created_at}',
+        f'SUMMARY:{_escape_ics_text(summary)}',
+        f'DESCRIPTION:{_escape_ics_text(chr(10).join(description_lines))}',
+        f'URL:{_escape_ics_text(link)}',
+        f'DTSTART;VALUE=DATE:{_format_ics_date(start_date)}',
+        f'DTEND;VALUE=DATE:{_format_ics_date(end_date + timedelta(days=1))}',
+        'END:VEVENT',
+        'END:VCALENDAR',
+        '',
+    ]
+    return '\r\n'.join(ics_lines)
+
+
+def build_client_slot_ics(appointment_id: str, slot_start: str, client_name: str = '') -> str | None:
+    """Build a single-slot ICS export for a client booking candidate."""
+    item = termin.get_item(appointment_id)
+    if not item:
+        return None
+
+    try:
+        start_dt = datetime.datetime.strptime(str(slot_start).strip(), '%Y-%m-%d %H:%M')
+    except Exception:
+        return None
+
+    try:
+        slot_minutes = int(item.get('slot_lenght') or 0)
+    except Exception:
+        slot_minutes = 0
+    if slot_minutes <= 0:
+        slot_minutes = 45
+
+    end_dt = start_dt + datetime.timedelta(minutes=slot_minutes)
+    tenant_id = _current_tenant_id()
+
+    try:
+        link = url_for('terminplaner.client', appointment_id=str(appointment_id), tenant=tenant_id or None, _external=True)
+    except Exception:
+        host = _resolve_public_base_url()
+        link = host + '/terminplaner/client/' + str(appointment_id)
+        if tenant_id:
+            link += f'?tenant={tenant_id}'
+
+    title_name = str(client_name or '').strip() or 'Termin'
+    summary = f"{title_name} - Terminbuchung"
+    description_lines = [
+        f"Buchungslink: {link}",
+        f"Geplanter Termin: {start_dt.strftime('%d.%m.%Y %H:%M')} - {end_dt.strftime('%H:%M')}",
+    ]
+
+    uid = f"terminplaner-slot-{appointment_id}-{start_dt.strftime('%Y%m%d%H%M')}@invario.eu"
+    created_at = datetime.datetime.utcnow().strftime('%Y%m%dT%H%M%SZ')
+    dt_start = start_dt.strftime('%Y%m%dT%H%M%S')
+    dt_end = end_dt.strftime('%Y%m%dT%H%M%S')
+
+    ics_lines = [
+        'BEGIN:VCALENDAR',
+        'VERSION:2.0',
+        'PRODID:-//Inventarsystem//Terminplaner Client Slot//DE',
+        'CALSCALE:GREGORIAN',
+        'METHOD:PUBLISH',
+        'BEGIN:VEVENT',
+        f'UID:{uid}',
+        f'DTSTAMP:{created_at}',
+        f'SUMMARY:{_escape_ics_text(summary)}',
+        f'DESCRIPTION:{_escape_ics_text(chr(10).join(description_lines))}',
+        f'URL:{_escape_ics_text(link)}',
+        f'DTSTART:{dt_start}',
+        f'DTEND:{dt_end}',
+        'END:VEVENT',
+        'END:VCALENDAR',
+        '',
+    ]
+    return '\r\n'.join(ics_lines)
+
+
+def new(date_start: str, date_end: str, time_span: list, slots: int, slot_lenght: int, user: str, mail: list=[], note:str="", calendar_enabled: bool=False) -> dict:
     """
     Generates a link for the executive to send to his clients to book a time Slot
     
@@ -48,21 +208,41 @@ def new(date_start: str, date_end: str, time_span: list, slots: int, slot_lenght
     """
     normalized_time_span = _normalize_time_span(time_span)
     normalized_mail = _normalize_mail_list(mail)
-    id = termin.add(date_start, date_end, normalized_time_span, slots, slot_lenght, user, normalized_mail, note)
+    id = termin.add(date_start, date_end, normalized_time_span, slots, slot_lenght, user, normalized_mail, note, calendar_enabled=calendar_enabled)
     id_str = str(id)
+    tenant_id = _current_tenant_id()
 
-    tenant_context = get_tenant_context()
-    subdomain = ''
-    if tenant_context:
-        subdomain = getattr(tenant_context, 'subdomain', '') or getattr(tenant_context, 'tenant_id', '') or ''
-
-    host = f"https://{subdomain}.invario.eu" if subdomain else "invario.eu"
-    link = host + "/terminplaner/client" + "?" + "client_id=" + id_str
+    try:
+        link = url_for('terminplaner.client', appointment_id=id_str, tenant=tenant_id or None, _external=True)
+    except Exception:
+        host = _resolve_public_base_url()
+        link = host + "/terminplaner/client/" + id_str
+        if tenant_id:
+            link += f"?tenant={tenant_id}"
     subject = f"Terminanfrage von {user}"
     note_link = note + f"Bitte klicken sie auf den folgenden Link um einen Termin zu vereinbaren: {link}"
-    if normalized_mail:
-        mail_service.send(normalized_mail, subject, note_link)
-    return link
+    calendar_link = None
+    if calendar_enabled:
+        try:
+            calendar_link = url_for('terminplaner.calendar_export', appointment_id=id_str, tenant=tenant_id or None, _external=True)
+        except Exception:
+            host = _resolve_public_base_url()
+            calendar_link = host + "/terminplaner/calendar/" + id_str + ".ics"
+            if tenant_id:
+                calendar_link += f"?tenant={tenant_id}"
+
+    email_body = note_link
+    if calendar_link:
+        email_body += f"\n\nKalendereintrag: {calendar_link}"
+
+    if normalized_mail and cfg.EMAIL_ENABLED:
+        mail_service.send(normalized_mail, subject, email_body)
+
+    return {
+        'appointment_id': id_str,
+        'link': link,
+        'calendar_link': calendar_link,
+    }
     
         
 def book_slot(id, date_start_time, name):
@@ -175,6 +355,17 @@ def get_available(id):
         time_span = termin_range.get('time_span', [])
         slot_lenght = termin_range.get('slot_lenght')
         total_slots = termin_range.get('slots', 0)
+        # Ensure numeric fields are cast to int when stored as strings
+        try:
+            total_slots = int(termin_range.get('slots', 0) or 0)
+        except Exception:
+            total_slots = 0
+
+        try:
+            slot_lenght = int(termin_range.get('slot_lenght') or 0)
+        except Exception:
+            slot_lenght = termin_range.get('slot_lenght')
+
         booked = termin_range.get('slots_booked', []) or []
 
         # Normalize booked entries to dicts for easier consumption
@@ -188,7 +379,10 @@ def get_available(id):
                 normalized.append({'value': s})
 
         slots_used = len(normalized)
-        slots_left = max(0, total_slots - slots_used)
+        try:
+            slots_left = max(0, int(total_slots) - slots_used)
+        except Exception:
+            slots_left = max(0, slots_used - slots_used)
 
         return {
             'date_start': date_start,
@@ -215,4 +409,57 @@ def get_available_user(id):
     - dict: all the needet information -> [Start_date, End_date, (first day Time Frame, 
     second day Time frame, third etc.), slot lenght, (bookedslots -> list)]
     """
-    return get_available(id)
+    return get_available(id)
+
+
+def get_user_upcoming_events(user: str, limit: int = 25) -> list[dict]:
+    """Return upcoming appointment plans for overview display."""
+    user_name = str(user or '').strip()
+    if not user_name:
+        return []
+
+    appointments = termin.get_upcoming_for_user(user_name, limit=limit)
+    host = _resolve_public_base_url()
+    tenant_id = _current_tenant_id()
+
+    result = []
+    for item in appointments:
+        appointment_id = str(item.get('_id') or '')
+        if not appointment_id:
+            continue
+
+        try:
+            link = url_for('terminplaner.client', appointment_id=appointment_id, tenant=tenant_id or None, _external=True)
+        except Exception:
+            link = host + '/terminplaner/client/' + appointment_id
+            if tenant_id:
+                link += f'?tenant={tenant_id}'
+
+        try:
+            calendar_link = url_for('terminplaner.calendar_export', appointment_id=appointment_id, tenant=tenant_id or None, _external=True)
+        except Exception:
+            calendar_link = host + '/terminplaner/calendar/' + appointment_id + '.ics'
+            if tenant_id:
+                calendar_link += f'?tenant={tenant_id}'
+
+        slots_total = int(item.get('slots', 0) or 0)
+        slots_booked = item.get('slots_booked', []) or []
+        if not isinstance(slots_booked, list):
+            slots_booked = []
+
+        result.append(
+            {
+                'appointment_id': appointment_id,
+                'date_start': str(item.get('date_start') or ''),
+                'date_end': str(item.get('date_end') or ''),
+                'time_span': item.get('time_span', []) or [],
+                'slots_total': slots_total,
+                'slots_booked': len(slots_booked),
+                'slots_left': max(0, slots_total - len(slots_booked)),
+                'note': str(item.get('note') or ''),
+                'link': link,
+                'calendar_link': calendar_link if item.get('calendar_enabled') else None,
+            }
+        )
+
+    return result

Web/modules/terminplaner/blueprint.py

@@ -1,6 +1,9 @@
 from flask import Blueprint, render_template, request, session, url_for, redirect, flash
+from flask import Response
 import Web.modules.terminplaner.backend_server as appointment_service
 import Web.modules.database.settings as cfg
+import Web.modules.database.termine as termin
+import Web.modules.database.user as us
 
 # Create a blueprint instance
 appoint_bp = Blueprint('terminplaner', __name__)
@@ -12,6 +15,25 @@ def _require_module_enabled():
         return redirect(url_for('home'))
     return None
 
+
+def _appointment_not_found_response():
+    return render_template(
+        'terminplaner_not_found.html',
+        error_code=404,
+        error_message='Der Termin wurde nicht gefunden.',
+    ), 404
+
+
+def _current_tenant_id():
+    try:
+        from Web.tenant import get_tenant_context
+        ctx = get_tenant_context()
+        if ctx and getattr(ctx, 'tenant_id', None):
+            return str(ctx.tenant_id)
+    except Exception:
+        pass
+    return str(session.get('tenant_id', '') or '').strip()
+
 @appoint_bp.route('/client/<appointment_id>', methods=['POST', 'GET'])
 def client(appointment_id):
     """
@@ -23,8 +45,29 @@ def client(appointment_id):
 
     available = appointment_service.get_available(appointment_id)
     if not available:
-        flash('Der Termin wurde nicht gefunden.', 'error')
-        return redirect(url_for('terminplan'))
+        return _appointment_not_found_response()
+
+    current_user = str(session.get('username', '') or '').strip()
+    appointment_item = termin.get_item(appointment_id) or {}
+    appointment_owner = str(appointment_item.get('user', '') or '').strip()
+    can_view_booking_names = False
+    if current_user:
+        try:
+            can_view_booking_names = bool(us.check_admin(current_user) or current_user == appointment_owner)
+        except Exception:
+            can_view_booking_names = bool(current_user == appointment_owner)
+
+    available_for_view = dict(available)
+    if not can_view_booking_names:
+        sanitized_bookings = []
+        for booking in (available.get('slots_booked') or []):
+            if isinstance(booking, dict):
+                sanitized_bookings.append({'start': booking.get('start', '')})
+            elif isinstance(booking, (list, tuple)) and len(booking) >= 1:
+                sanitized_bookings.append({'start': booking[0]})
+            else:
+                sanitized_bookings.append({'start': ''})
+        available_for_view['slots_booked'] = sanitized_bookings
 
     if request.method == 'POST':
         start_daytime = request.form.get('start_day_time')
@@ -34,23 +77,80 @@ def client(appointment_id):
             return render_template(
                 'termin_client.html',
                 appointment_id=appointment_id,
-                available=available,
+                available=available_for_view,
                 current_user=session.get('username', ''),
+                tenant_id=_current_tenant_id(),
+                can_view_booking_names=can_view_booking_names,
             )
 
         if appointment_service.book_slot(appointment_id, start_daytime, username):
-            flash('Der Termin wurde gespeichert.', 'success')
-            return redirect(url_for('terminplaner.client', appointment_id=appointment_id))
+            return redirect(
+                url_for(
+                    'terminplaner.client_success',
+                    appointment_id=appointment_id,
+                    tenant=_current_tenant_id() or None,
+                    start=start_daytime,
+                    name=username,
+                )
+            )
 
         flash('Der Termin konnte nicht gespeichert werden.', 'error')
 
     return render_template(
         'termin_client.html',
         appointment_id=appointment_id,
-        available=available,
+        available=available_for_view,
         current_user=session.get('username', ''),
+        tenant_id=_current_tenant_id(),
+        can_view_booking_names=can_view_booking_names,
     )
 
+
+@appoint_bp.route('/client/success/<appointment_id>', methods=['GET'])
+def client_success(appointment_id):
+    guard = _require_module_enabled()
+    if guard:
+        return guard
+
+    slot_start = str(request.args.get('start', '') or '').strip()
+    client_name = str(request.args.get('name', '') or '').strip()
+
+    return render_template(
+        'termin_client_success.html',
+        appointment_id=appointment_id,
+        slot_start=slot_start,
+        client_name=client_name,
+        tenant_id=_current_tenant_id(),
+    )
+
+
+@appoint_bp.route('/delete/<appointment_id>', methods=['POST'])
+def delete_appointment(appointment_id):
+    guard = _require_module_enabled()
+    if guard:
+        return guard
+
+    if 'username' not in session:
+        flash('Bitte mit einem Konto anmelden.', 'error')
+        return redirect(url_for('login'))
+
+    appointment = termin.get_item(appointment_id)
+    if not appointment:
+        return _appointment_not_found_response()
+
+    current_user = str(session.get('username', '')).strip()
+    appointment_user = str(appointment.get('user', '')).strip()
+    if not us.check_admin(current_user) and appointment_user != current_user:
+        flash('Sie dürfen diesen Termin nicht löschen.', 'error')
+        return redirect(url_for('terminplaner.main', tenant=_current_tenant_id() or None))
+
+    if termin.remove(appointment_id):
+        flash('Der Terminplan wurde gelöscht.', 'success')
+    else:
+        flash('Der Terminplan konnte nicht gelöscht werden.', 'error')
+
+    return redirect(url_for('terminplaner.main', tenant=_current_tenant_id() or None))
+
 @appoint_bp.route('/configure', methods=['GET', 'POST'])
 def configure():
     """
@@ -72,16 +172,68 @@ def configure():
         slot_lenght = request.form.get('slot_lenght')
         mail = request.form.get('mail', '')
         note = request.form.get('note', '')
+        add_to_calendar = request.form.get('add_to_calendar') == 'on'
 
         if not start or not end or not time or not slots_amount or not slot_lenght:
             flash('Bitte alle Pflichtfelder ausfüllen.', 'error')
-            return render_template('termin_configure.html', school_periods=cfg.SCHOOL_PERIODS, generated_link=None)
+            return render_template(
+                'termin_configure.html',
+                school_periods=cfg.SCHOOL_PERIODS,
+                generated_link=None,
+                email_service_enabled=cfg.EMAIL_ENABLED,
+            )
 
-        link = appointment_service.new(start, end, time, slots_amount, slot_lenght, session["username"], mail, note)
+        result = appointment_service.new(start, end, time, slots_amount, slot_lenght, session["username"], mail, note, calendar_enabled=add_to_calendar)
         flash('Der Terminplan wurde angelegt.', 'success')
-        return render_template('termin_configure.html', school_periods=cfg.SCHOOL_PERIODS, generated_link=link)
+        return render_template(
+            'termin_configure.html',
+            school_periods=cfg.SCHOOL_PERIODS,
+            generated_link=result['link'],
+            calendar_link=result.get('calendar_link'),
+            add_to_calendar=add_to_calendar,
+            email_service_enabled=cfg.EMAIL_ENABLED,
+        )
     elif request.method == "GET":
-        return render_template('termin_configure.html', school_periods=cfg.SCHOOL_PERIODS, generated_link=None)
+        return render_template(
+            'termin_configure.html',
+            school_periods=cfg.SCHOOL_PERIODS,
+            generated_link=None,
+            calendar_link=None,
+            add_to_calendar=False,
+            email_service_enabled=cfg.EMAIL_ENABLED,
+        )
+
+
+@appoint_bp.route('/calendar/<appointment_id>.ics', methods=['GET'])
+def calendar_export(appointment_id):
+    guard = _require_module_enabled()
+    if guard:
+        return guard
+
+    ics_content = appointment_service.build_calendar_ics(appointment_id)
+    if not ics_content:
+        return _appointment_not_found_response()
+
+    response = Response(ics_content, mimetype='text/calendar; charset=utf-8')
+    response.headers['Content-Disposition'] = f'attachment; filename=terminplan-{appointment_id}.ics'
+    return response
+
+
+@appoint_bp.route('/client_ics/<appointment_id>.ics', methods=['GET'])
+def client_slot_calendar_export(appointment_id):
+    guard = _require_module_enabled()
+    if guard:
+        return guard
+
+    slot_start = str(request.args.get('start', '') or '').strip()
+    client_name = str(request.args.get('name', '') or '').strip()
+    ics_content = appointment_service.build_client_slot_ics(appointment_id, slot_start, client_name=client_name)
+    if not ics_content:
+        return _appointment_not_found_response()
+
+    response = Response(ics_content, mimetype='text/calendar; charset=utf-8')
+    response.headers['Content-Disposition'] = f'attachment; filename=termin-{appointment_id}-{slot_start.replace(" ", "_").replace(":", "")}.ics'
+    return response
 
 @appoint_bp.route('/')
 def main():
@@ -89,8 +241,14 @@ def main():
     if guard:
         return guard
 
+    current_user = session.get('username', '')
+    upcoming_events = appointment_service.get_user_upcoming_events(current_user) if current_user else []
+    tenant_id = _current_tenant_id()
+
     return render_template(
         'terminplaner.html',
         school_periods=cfg.SCHOOL_PERIODS,
-        current_user=session.get('username', ''),
+        current_user=current_user,
+        upcoming_events=upcoming_events,
+        tenant_id=tenant_id,
     )

Web/requirements.txt

@@ -15,3 +15,4 @@ openpyxl
 cryptography>=42.0.0
 pywebpush
 py-vapid>=1.9.0
+pyzbar

Web/static/js/scanner.js

@@ -0,0 +1,328 @@
+/**
+ * Hybrid Barcode Scanner
+ * Supports: Real-time camera scanning (ZXing.js), image upload fallback (server-side pyzbar),
+ *           and USB/keyboard scanner emulation.
+ */
+
+class HybridScanner {
+  constructor(options = {}) {
+    this.options = {
+      videoId: options.videoId || 'scanner-video',
+      canvasId: options.canvasId || 'scanner-canvas',
+      formats: options.formats || ['QR_CODE', 'CODE_128', 'EAN_13', 'ISBN', 'CODE_39', 'UPC_A'],
+      fps: options.fps || 10,
+      onSuccess: options.onSuccess || (() => {}),
+      onError: options.onError || (() => {}),
+      facingMode: options.facingMode || 'environment', // 'environment' for rear, 'user' for front
+    };
+
+    this.state = {
+      isRunning: false,
+      stream: null,
+      reader: null,
+      canvas: null,
+      videoElement: null,
+      zxingReady: false,
+      lastScanTime: 0,
+      scanDebounceMs: 300, // Prevent rapid duplicate scans
+    };
+
+    this.keyboardInputBuffer = '';
+    this.keyboardInputTimeout = null;
+  }
+
+  /**
+   * Initialize ZXing library from CDN
+   */
+  async initZXing() {
+    if (this.state.zxingReady) {
+      return true;
+    }
+
+    return new Promise((resolve) => {
+      // Load ZXing library from CDN
+      if (typeof ZXing !== 'undefined') {
+        this.state.zxingReady = true;
+        resolve(true);
+        return;
+      }
+
+      // Use fallback URL for better mobile compatibility
+      let scriptUrl = 'https://unpkg.com/@zxing/library@latest/umd/index.min.js';
+      
+      // Check if already loading
+      const existingScript = document.querySelector(`script[src="${scriptUrl}"]`);
+      if (existingScript) {
+        existingScript.addEventListener('load', () => {
+          this.state.zxingReady = typeof ZXing !== 'undefined';
+          resolve(this.state.zxingReady);
+        }, { once: true });
+        existingScript.addEventListener('error', () => {
+          console.error('Failed to load ZXing library');
+          resolve(false);
+        }, { once: true });
+        return;
+      }
+
+      const script = document.createElement('script');
+      script.src = scriptUrl;
+      script.async = true;
+      script.onload = () => {
+        this.state.zxingReady = typeof ZXing !== 'undefined';
+        resolve(this.state.zxingReady);
+      };
+      script.onerror = () => {
+        console.error('Failed to load ZXing library');
+        resolve(false);
+      };
+      document.head.appendChild(script);
+    });
+  }
+
+  /**
+   * Start real-time barcode scanning via camera
+   */
+  async start() {
+    if (this.state.isRunning) {
+      return;
+    }
+
+    try {
+      // Ensure ZXing is loaded
+      const zxingReady = await this.initZXing();
+      if (!zxingReady) {
+        this.options.onError('ZXing library failed to load. Please use image upload fallback.');
+        return;
+      }
+
+      // Get DOM elements
+      this.state.videoElement = document.getElementById(this.options.videoId);
+      this.state.canvas = document.getElementById(this.options.canvasId);
+
+      if (!this.state.videoElement || !this.state.canvas) {
+        this.options.onError('Scanner video or canvas element not found.');
+        return;
+      }
+
+      // Request camera access
+      const stream = await navigator.mediaDevices.getUserMedia({
+        video: {
+          facingMode: this.options.facingMode,
+          width: { ideal: 1280 },
+          height: { ideal: 720 },
+        },
+        audio: false,
+      });
+
+      this.state.stream = stream;
+      this.state.videoElement.srcObject = stream;
+      
+      // Make video element visible (ensure it's not hidden by display: none)
+      this.state.videoElement.style.display = 'block';
+
+      // Initialize ZXing reader
+      const hints = new Map();
+      hints.set(ZXing.DecodeHintType.POSSIBLE_FORMATS, this.options.formats);
+      hints.set(ZXing.DecodeHintType.TRY_HARDER, true);
+      this.state.reader = new ZXing.BrowserMultiFormatReader(hints);
+
+      this.state.isRunning = true;
+
+      // Start scanning loop
+      this.scanLoop();
+
+      // Setup keyboard input fallback for USB scanners
+      this.setupKeyboardInput();
+    } catch (err) {
+      this.options.onError(`Camera error: ${err.message || err}`);
+    }
+  }
+
+  /**
+   * Stop barcode scanning
+   */
+  stop() {
+    if (!this.state.isRunning) {
+      return;
+    }
+
+    this.state.isRunning = false;
+
+    if (this.state.stream) {
+      this.state.stream.getTracks().forEach((track) => track.stop());
+      this.state.stream = null;
+    }
+
+    if (this.state.videoElement) {
+      this.state.videoElement.srcObject = null;
+      this.state.videoElement.style.display = 'none';
+    }
+
+    this.removeKeyboardInput();
+  }
+
+  /**
+   * Main scanning loop for real-time frame processing
+   */
+  scanLoop() {
+    if (!this.state.isRunning) {
+      return;
+    }
+
+    const canvas = this.state.canvas;
+    const video = this.state.videoElement;
+
+    if (!video || !canvas) {
+      setTimeout(() => this.scanLoop(), 100);
+      return;
+    }
+
+    if (video.readyState === video.HAVE_ENOUGH_DATA) {
+      try {
+        canvas.width = video.videoWidth;
+        canvas.height = video.videoHeight;
+        
+        if (canvas.width === 0 || canvas.height === 0) {
+          setTimeout(() => this.scanLoop(), 100);
+          return;
+        }
+
+        const context = canvas.getContext('2d');
+
+        if (context) {
+          context.drawImage(video, 0, 0);
+
+          try {
+            const luminanceSource = new ZXing.HTMLCanvasElementLuminanceSource(canvas);
+            const binaryBitmap = new ZXing.BinaryBitmap(new ZXing.HybridBinarizer(luminanceSource));
+
+            try {
+              const result = this.state.reader.decodeFromBitmap(binaryBitmap);
+              this.handleScanResult(result.text);
+            } catch (e) {
+              // No barcode found in frame; continue scanning
+            }
+          } catch (err) {
+            // Silently ignore canvas errors
+          }
+        }
+      } catch (err) {
+        console.warn('Scan loop error:', err);
+      }
+    }
+
+    // Throttle scan loop based on FPS setting
+    setTimeout(() => this.scanLoop(), 1000 / this.options.fps);
+  }
+
+  /**
+   * Handle successful barcode scan with debouncing
+   */
+  handleScanResult(scannedText) {
+    const now = Date.now();
+    if (now - this.state.lastScanTime < this.state.scanDebounceMs) {
+      return; // Ignore rapid duplicates
+    }
+
+    this.state.lastScanTime = now;
+    this.options.onSuccess(scannedText.trim());
+  }
+
+  /**
+   * Setup keyboard input listener for USB scanner emulation
+   * Most USB scanners emulate keyboard input (barcode followed by Enter)
+   */
+  setupKeyboardInput() {
+    this.keyboardListener = (event) => {
+      // Allow only alphanumeric, dash, colon (common in barcodes)
+      if (/^[a-zA-Z0-9:_\-]$/.test(event.key)) {
+        event.preventDefault();
+        this.keyboardInputBuffer += event.key;
+
+        // Reset timeout for multi-part barcodes
+        if (this.keyboardInputTimeout) {
+          clearTimeout(this.keyboardInputTimeout);
+        }
+      } else if (event.key === 'Enter') {
+        event.preventDefault();
+        if (this.keyboardInputBuffer.length > 0) {
+          this.handleScanResult(this.keyboardInputBuffer);
+          this.keyboardInputBuffer = '';
+        }
+      } else if (event.key === 'Escape') {
+        this.keyboardInputBuffer = '';
+        this.stop();
+      }
+
+      // Auto-trigger if buffer looks complete (common barcode lengths)
+      if ([8, 12, 13, 17].includes(this.keyboardInputBuffer.length)) {
+        this.keyboardInputTimeout = setTimeout(() => {
+          if (this.keyboardInputBuffer.length > 0) {
+            this.handleScanResult(this.keyboardInputBuffer);
+            this.keyboardInputBuffer = '';
+          }
+        }, 200);
+      }
+    };
+
+    document.addEventListener('keydown', this.keyboardListener);
+  }
+
+  /**
+   * Remove keyboard input listener
+   */
+  removeKeyboardInput() {
+    if (this.keyboardListener) {
+      document.removeEventListener('keydown', this.keyboardListener);
+      this.keyboardListener = null;
+    }
+    this.keyboardInputBuffer = '';
+  }
+
+  /**
+   * Upload image for server-side decoding (fallback)
+   * Requires /api/scan_upload endpoint
+   */
+  static async uploadImageForDecoding(file, onSuccess, onError) {
+    try {
+      const formData = new FormData();
+      formData.append('image', file);
+
+      const response = await fetch('/api/scan_upload', {
+        method: 'POST',
+        body: formData,
+      });
+
+      const data = await response.json();
+
+      if (data.ok && data.barcodes && data.barcodes.length > 0) {
+        // Return first detected barcode (highest confidence)
+        onSuccess(data.barcodes[0].value);
+      } else {
+        onError(data.message || 'No barcode detected in image.');
+      }
+    } catch (err) {
+      onError(`Upload error: ${err.message}`);
+    }
+  }
+
+  /**
+   * Toggle camera (front/rear on mobile)
+   */
+  toggleCamera() {
+    if (this.options.facingMode === 'environment') {
+      this.options.facingMode = 'user';
+    } else {
+      this.options.facingMode = 'environment';
+    }
+
+    // Restart scanning with new camera
+    this.stop();
+    this.start();
+  }
+}
+
+// Export for use in templates
+if (typeof window !== 'undefined') {
+  window.HybridScanner = HybridScanner;
+}

Web/templates/base.html

@@ -1279,7 +1279,6 @@
             </div>
         </nav>
     {% endif %}
-        {% endif %}
 
         {% if library_module_enabled and CURRENT_MODULE == 'library' %}
         <nav class="navbar navbar-expand-lg navbar-dark" id="libraryNavbar">
@@ -1391,31 +1390,9 @@
             </div>
         </nav>
         {% endif %}
-        {% endif %}
 
     {% else %}
-    <nav class="navbar navbar-expand-lg navbar-dark" id="loginNavbar">
-        <div class="container-fluid">
-                    <a class="navbar-brand py-0" href="{{ url_for('home') }}">
-                        {% set school_logo_thumb = school_info.get('logo_thumb') if school_info else '' %}
-                        {% set school_logo_path = school_info.get('logo_path') if school_info else '' %}
-                        {% if school_logo_thumb or school_logo_path %}
-                            {% if school_logo_thumb %}
-                                <img src="{{ url_for('uploaded_file', filename=school_logo_thumb) }}" alt="{{ school_info.name or 'Schullogo' }}" class="invario-logo">
-                            {% else %}
-                                <img src="{{ url_for('uploaded_file', filename=school_logo_path) }}" alt="{{ school_info.name or 'Schullogo' }}" class="invario-logo">
-                            {% endif %}
-                        {% else %}
-                            <img src="{{ url_for('static', filename='img/invario-logo.png') }}" alt="Invario" class="invario-logo">
-                        {% endif %}
-                    </a>
-            <ul class="navbar-nav ms-auto mb-2 mb-lg-0">
-                <li class="nav-item">
-                    <a class="nav-link" href="{{ url_for('impressum') }}">Impressum</a>
-                </li>
-            </ul>
-        </div>
-    </nav>
+    <!-- No navbar for anonymous users on public pages. -->
     {% endif %}
     <div class="container">
         {% with messages = get_flashed_messages(with_categories=true) %}
@@ -1429,6 +1406,11 @@
         {% endwith %}
         {% block content %}{% endblock %}
     </div>
+    {% if 'username' not in session %}
+    <div class="guest-impressum-footer">
+        <a href="{{ url_for('impressum') }}">Impressum</a>
+    </div>
+    {% endif %}
     <!-- Cookie consent banner -->
     <style>
         #cookie-banner { position: fixed; bottom: 0; left: 0; right: 0; background: rgba(33,37,41,.98); color: #fff; padding: 14px 16px; display: none; z-index: 2000; box-shadow: 0 -2px 8px rgba(0,0,0,.25); }
@@ -1562,6 +1544,29 @@
             margin-bottom: 2px;
         }
 
+        .guest-impressum-footer {
+            position: fixed;
+            left: 0;
+            right: 0;
+            bottom: 10px;
+            text-align: center;
+            z-index: 1200;
+            pointer-events: none;
+        }
+
+        .guest-impressum-footer a {
+            pointer-events: auto;
+            font-size: 0.76rem;
+            color: rgba(15, 23, 42, 0.72);
+            text-decoration: none;
+            border-bottom: 1px solid rgba(15, 23, 42, 0.28);
+        }
+
+        .guest-impressum-footer a:hover {
+            color: rgba(15, 23, 42, 0.92);
+            border-bottom-color: rgba(15, 23, 42, 0.52);
+        }
+
         .notification-toast.show {
             display: block;
         }

Web/templates/library.html

@@ -67,8 +67,22 @@
 
     <!-- Scanner Panel -->
     <div id="qrContainer" class="qr-container" style="display: none;">
-        <div id="qr-reader" style="width: auto; height: 300px;"></div>
-        <span id="qr-result" style="display: none;"></span>
+        <div class="scanner-header">
+            <h3>Barcode/QR-Code Scanner</h3>
+            <div class="scanner-controls">
+                <button type="button" id="cameraToggle" class="scanner-button" title="Kamera wechseln">📷 Kamera</button>
+                <label for="uploadScanImage" class="scanner-button" title="Bild hochladen zum Dekodieren">📤 Upload</label>
+                <input type="file" id="uploadScanImage" accept="image/*" style="display: none;">
+            </div>
+        </div>
+        <div class="scanner-video-wrapper">
+            <video id="qr-reader" playsinline style="width: 100%; max-width: 100%; height: auto; aspect-ratio: 4/3; object-fit: cover; border-radius: 8px;"></video>
+            <canvas id="scanner-canvas" style="display: none;"></canvas>
+        </div>
+        <div id="scanMessage" class="scanner-message" style="margin-top: 10px; text-align: center; font-weight: bold; color: #666;"></div>
+        <p style="font-size: 0.85em; color: #999; margin-top: 10px; margin-bottom: 0; text-align: center;">
+            💡 Hinweis: Scan-Ergebnis wird automatisch in das Feld oben übernommen. USB-Scanner werden als Tastatureingabe erkannt.
+        </p>
     </div>
 
     <!-- Table Header (only in table mode) -->
@@ -206,7 +220,8 @@
     </div>
 </div>
 
-<script src="https://cdn.jsdelivr.net/npm/html5-qrcode/minified/html5-qrcode.min.js"></script>
+<script src="https://unpkg.com/@zxing/library@latest/umd/index.min.js"></script>
+<script src="/static/js/scanner.js"></script>
 <script>
 // View mode persistence
 const LIBRARY_VIEW_MODE_KEY = 'inventarLibraryViewMode';
@@ -631,8 +646,9 @@ document.getElementById('favoriteToggle').addEventListener('click', function() {
     // TODO: Implement favorites filtering
 });
 
-// Scanner toggle
+// Scanner instance (hybrid: real-time + upload + keyboard)
 let scanner = null;
+
 document.getElementById('scannerBtn').addEventListener('click', function(e) {
     e.stopPropagation();
     const container = document.getElementById('qrContainer');
@@ -640,7 +656,10 @@ document.getElementById('scannerBtn').addEventListener('click', function(e) {
     
     if (isOpen) {
         container.style.display = 'none';
-        if (scanner) scanner.clear();
+        if (scanner) {
+            scanner.stop();
+            scanner = null;
+        }
         this.classList.remove('open');
         this.setAttribute('aria-expanded', 'false');
     } else {
@@ -649,17 +668,66 @@ document.getElementById('scannerBtn').addEventListener('click', function(e) {
         this.setAttribute('aria-expanded', 'true');
         
         if (!scanner) {
-            scanner = new Html5Qrcode('qr-reader');
-            scanner.start(
-                { facingMode: "environment" },
-                { fps: 10, qrbox: 250 },
-                onScanSuccess,
-                onScanError
-            );
+            initScanner();
         }
     }
 });
 
+function initScanner() {
+    scanner = new HybridScanner({
+        videoId: 'qr-reader',
+        canvasId: 'scanner-canvas',
+        formats: ['QR_CODE', 'CODE_128', 'EAN_13', 'ISBN', 'CODE_39', 'UPC_A', 'EAN_8'],
+        fps: 10,
+        facingMode: 'environment',
+        onSuccess: function(decodedText) {
+            const studentId = decodedText.trim();
+            document.getElementById('studentIdInput').value = studentId;
+            document.getElementById('scanMessage').textContent = '✓ Erkannt: ' + studentId;
+            document.getElementById('scanMessage').style.color = '#4CAF50';
+        },
+        onError: function(error) {
+            document.getElementById('scanMessage').textContent = '✗ ' + error;
+            document.getElementById('scanMessage').style.color = '#f44336';
+        }
+    });
+
+    scanner.start();
+}
+
+// Camera toggle
+document.getElementById('cameraToggle')?.addEventListener('click', function() {
+    if (scanner) {
+        scanner.toggleCamera();
+        this.textContent = scanner.options.facingMode === 'user' ? '📷 Rückkamera' : '🤳 Frontkamera';
+    }
+});
+
+// Image upload fallback
+document.getElementById('uploadScanImage')?.addEventListener('change', function(e) {
+    const file = e.target.files[0];
+    if (file) {
+        const messageEl = document.getElementById('scanMessage');
+        messageEl.textContent = 'Wird dekodiert...';
+        messageEl.style.color = '#2196F3';
+        
+        HybridScanner.uploadImageForDecoding(
+            file,
+            (decodedText) => {
+                document.getElementById('studentIdInput').value = decodedText;
+                messageEl.textContent = '✓ Erkannt (Upload): ' + decodedText;
+                messageEl.style.color = '#4CAF50';
+                e.target.value = ''; // Reset file input
+            },
+            (error) => {
+                messageEl.textContent = '✗ ' + error;
+                messageEl.style.color = '#f44336';
+                e.target.value = '';
+            }
+        );
+    }
+});
+
 function onScanSuccess(decodedText, decodedResult) {
     const studentId = decodedText.trim();
     document.getElementById('studentIdInput').value = studentId;
@@ -729,6 +797,9 @@ function onScanError(error) {
         overflow-x: auto;
         -webkit-overflow-scrolling: touch;
         width: 100%;
+        box-sizing: border-box;
+        margin: 0 -12px;
+        padding: 0 12px;
     }
     .library-table-wrapper .table-row {
         min-width: 720px; /* allow table to have intrinsic width and be scrolled */
@@ -737,5 +808,129 @@ function onScanError(error) {
         display: block; /* keep rows stacked but allow horizontal scroll */
     }
 }
+
+/* Hybrid Scanner Styles */
+.qr-container {
+    background: #f5f5f5;
+    border: 1px solid #ddd;
+    border-radius: 8px;
+    padding: 12px;
+    margin: 12px 0;
+    overflow-x: hidden;
+    width: 100%;
+    box-sizing: border-box;
+}
+
+.scanner-header {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    margin-bottom: 12px;
+    flex-wrap: wrap;
+    gap: 8px;
+    width: 100%;
+    box-sizing: border-box;
+}
+
+.scanner-header h3 {
+    margin: 0;
+    color: #333;
+    font-size: 1em;
+    flex: 0 0 auto;
+    white-space: nowrap;
+}
+
+.scanner-controls {
+    display: flex;
+    gap: 6px;
+    flex-wrap: wrap;
+    flex: 1 1 auto;
+    min-width: 0;
+}
+
+.scanner-button {
+    background: #2196F3;
+    color: white;
+    border: none;
+    padding: 6px 10px;
+    border-radius: 4px;
+    cursor: pointer;
+    font-size: 0.85em;
+    white-space: nowrap;
+    flex: 0 1 auto;
+    transition: background-color 0.2s;
+}
+
+.scanner-button:hover {
+    background: #1976D2;
+}
+
+.scanner-button:active {
+    background: #1565C0;
+}
+
+.scanner-video-wrapper {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin: 12px 0;
+    width: 100%;
+    box-sizing: border-box;
+    overflow: hidden;
+}
+
+#qr-reader {
+    width: 100%;
+    max-width: 100%;
+    height: auto;
+    border: 2px solid #2196F3;
+    border-radius: 8px;
+    display: block;
+}
+
+.scanner-message {
+    min-height: 20px;
+    font-size: 0.9em;
+    text-align: center;
+    word-wrap: break-word;
+}
+
+@media (max-width: 600px) {
+    .qr-container {
+        padding: 10px;
+        margin: 10px 0;
+    }
+
+    .scanner-header {
+        flex-direction: column;
+        align-items: stretch;
+        gap: 8px;
+    }
+
+    .scanner-header h3 {
+        width: 100%;
+        font-size: 0.95em;
+    }
+
+    .scanner-controls {
+        width: 100%;
+        justify-content: space-between;
+    }
+
+    .scanner-button {
+        flex: 1 1 auto;
+        padding: 8px 6px;
+        font-size: 0.8em;
+    }
+
+    #qr-reader {
+        max-width: 100%;
+        border-radius: 6px;
+    }
+
+    .scanner-message {
+        font-size: 0.85em;
+    }
+}
 </style>
 {% endblock %}

Web/templates/library_table.html

@@ -459,7 +459,10 @@
             Hinweis: Im Schnellmodus zuerst den Schülerausweis scannen, danach den Buch-/Mediencode.
         </div>
         <div id="scanReaderWrap" class="library-scan-reader-wrap">
-            <div id="libraryQrReader" class="library-scan-reader"></div>
+            <div id="libraryQrReader" class="library-scan-reader">
+                <video id="libraryQrReaderVideo" playsinline style="width: 100%; border-radius: 8px;"></video>
+                <canvas id="libraryQrReaderCanvas" style="display: none;"></canvas>
+            </div>
         </div>
     </div>
     <div id="filterPanel" class="library-filter-panel">
@@ -547,7 +550,8 @@
     </div>
 </div>
 
-<script src="https://cdn.jsdelivr.net/npm/html5-qrcode/minified/html5-qrcode.min.js"></script>
+<script src="https://unpkg.com/@zxing/library@latest/umd/index.min.js"></script>
+<script src="/static/js/scanner.js"></script>
 <script>
     // State
     let libraryItems = [];
@@ -1002,54 +1006,8 @@
     }
 
     async function ensureScannerLibraryLoaded() {
-        if (typeof Html5QrcodeScanner !== 'undefined') {
-            return true;
-        }
-
-        const sources = [
-            'https://cdn.jsdelivr.net/npm/html5-qrcode/minified/html5-qrcode.min.js'
-        ];
-
-        for (const src of sources) {
-            try {
-                await new Promise((resolve, reject) => {
-                    const existing = document.querySelector(`script[data-scanner-src="${src}"]`);
-                    if (existing) {
-                        const onLoad = () => resolve();
-                        const onError = () => reject(new Error('Script load failed'));
-                        existing.addEventListener('load', onLoad, { once: true });
-                        existing.addEventListener('error', onError, { once: true });
-                        setTimeout(() => {
-                            existing.removeEventListener('load', onLoad);
-                            existing.removeEventListener('error', onError);
-                            if (typeof Html5QrcodeScanner !== 'undefined') {
-                                resolve();
-                            } else {
-                                reject(new Error('Script not available'));
-                            }
-                        }, 1200);
-                        return;
-                    }
-
-                    const script = document.createElement('script');
-                    script.src = src;
-                    script.async = true;
-                    script.defer = true;
-                    script.dataset.scannerSrc = src;
-                    script.onload = () => resolve();
-                    script.onerror = () => reject(new Error('Script load failed'));
-                    document.head.appendChild(script);
-                });
-
-                if (typeof Html5QrcodeScanner !== 'undefined') {
-                    return true;
-                }
-            } catch (err) {
-                console.warn('Scanner library load failed from', src, err);
-            }
-        }
-
-        return false;
+        // HybridScanner is loaded globally via script tag
+        return typeof HybridScanner !== 'undefined';
     }
 
     async function startScanner() {
@@ -1066,37 +1024,17 @@
         readerWrap.style.display = 'block';
 
         try {
-            const formats = [];
-            if (typeof Html5QrcodeSupportedFormats !== 'undefined') {
-                formats.push(
-                    Html5QrcodeSupportedFormats.QR_CODE,
-                    Html5QrcodeSupportedFormats.EAN_13,
-                    Html5QrcodeSupportedFormats.EAN_8,
-                    Html5QrcodeSupportedFormats.CODE_128,
-                    Html5QrcodeSupportedFormats.CODE_39,
-                    Html5QrcodeSupportedFormats.UPC_A,
-                    Html5QrcodeSupportedFormats.UPC_E,
-                    Html5QrcodeSupportedFormats.ITF,
-                    Html5QrcodeSupportedFormats.CODABAR
-                );
-            }
-
-            const scannerConfig = {
+            scannerInstance = scannerInstance || new HybridScanner({
+                videoId: 'libraryQrReaderVideo',
+                canvasId: 'libraryQrReaderCanvas',
+                formats: ['QR_CODE', 'EAN_13', 'EAN_8', 'CODE_128', 'CODE_39', 'UPC_A', 'UPC_E', 'ITF', 'CODABAR'],
                 fps: 10,
-                rememberLastUsedCamera: true,
-                aspectRatio: 1.333334
-            };
-            if (formats.length > 0) {
-                scannerConfig.formatsToSupport = formats;
-            }
+                facingMode: 'environment',
+                onSuccess: handleScanSuccess,
+                onError: handleScanError
+            });
 
-            scannerInstance = scannerInstance || new Html5QrcodeScanner(
-                'libraryQrReader',
-                scannerConfig,
-                false
-            );
-
-            scannerInstance.render(handleScanSuccess, handleScanError);
+            scannerInstance.start();
             scannerRunning = true;
             toggleBtn.textContent = 'Scanner stoppen';
             setScanStatus('Scanner aktiv. Jetzt Code scannen.', 'warn');
@@ -1113,7 +1051,7 @@
         const readerWrap = document.getElementById('scanReaderWrap');
         const toggleBtn = document.getElementById('toggleScannerBtn');
         try {
-            await scannerInstance.clear();
+            scannerInstance.stop();
         } catch (err) {
             console.error('Scanner stop failed:', err);
         }

Web/templates/main.html

@@ -269,23 +269,6 @@
         line-height: 1;
     }
 
-    /* Compact appointment badge on cards */
-    .appointment-badge {
-        margin-top: 10px;
-        padding: 10px 12px;
-        background-color: #e1f5fe;
-        border-left: 4px solid #03a9f4;
-        border-radius: 4px;
-        font-size: 0.9rem;
-        line-height: 1.3;
-    }
-    .appointment-badge .appointment-time {
-        display: inline-block;
-        margin-top: 4px;
-        color: #01579b;
-        font-weight: 600;
-    }
-
     /* Search styles */
     .search-container {
         display: flex;
@@ -430,7 +413,10 @@
         </div>
         <div class="qr-container">
             <button id="scanButton" class="scan-button" aria-controls="qr-reader" aria-expanded="false">Barcode scannen</button>
-            <div id="qr-reader"></div>
+            <div id="qr-reader" style="display: none;">
+                <video id="qr-reader-video" playsinline style="width: 100%; max-width: 500px; border-radius: 8px;"></video>
+                <canvas id="qr-reader-canvas" style="display: none;"></canvas>
+            </div>
         </div>
         <div id="table-view-header" class="table-view-header" aria-hidden="true">
             <span>Name</span>
@@ -543,7 +529,8 @@
     window.isDebug = false; // Set to true only for development environment
 </script>
 
-<script src="https://unpkg.com/html5-qrcode@2.0.9/dist/html5-qrcode.min.js"></script>
+<script src="https://unpkg.com/@zxing/library@latest/umd/index.min.js"></script>
+<script src="/static/js/scanner.js"></script>
 <script>
     // Global state
     const highlightItemId = (window.serverVars && window.serverVars.highlightItemId && window.serverVars.highlightItemId !== 'null')
@@ -556,7 +543,7 @@
     document.addEventListener('DOMContentLoaded', function() {
         const scanButton = document.getElementById('scanButton');
         const qrReader = document.getElementById('qr-reader');
-        let html5QrcodeScanner = null;
+        let hybridScanner = null;
 
         if (!scanButton || !qrReader) return;
 
@@ -570,28 +557,36 @@
             if (qrReader.style.display !== 'block') {
                 qrReader.style.display = 'block';
                 
-                html5QrcodeScanner = new Html5QrcodeScanner(
-                    'qr-reader', { fps: 10, qrbox: 250 }
-                );
-                
-                html5QrcodeScanner.render((decodedText) => {
-                    html5QrcodeScanner.clear();
-                    qrReader.style.display = 'none';
-                    
-                    // Put scanned code into the search box and trigger search
-                    const searchInput = document.getElementById('code-search');
-                    if (searchInput) {
-                        searchInput.value = decodedText;
-                        searchByCode();
-                    }
+                hybridScanner = new HybridScanner({
+                    videoId: 'qr-reader-video',
+                    canvasId: 'qr-reader-canvas',
+                    formats: ['QR_CODE', 'CODE_128', 'EAN_13', 'EAN_8', 'CODE_39'],
+                    fps: 10,
+                    facingMode: 'environment',
+                    onSuccess: function(decodedText) {
+                        hybridScanner.stop();
+                        qrReader.style.display = 'none';
+                        
+                        // Put scanned code into the search box and trigger search
+                        const searchInput = document.getElementById('code-search');
+                        if (searchInput) {
+                            searchInput.value = decodedText;
+                            searchByCode();
+                        }
 
-                    setScannerUi(false);
+                        setScannerUi(false);
+                    },
+                    onError: function(error) {
+                        console.error('Scanner error:', error);
+                    }
                 });
 
+                hybridScanner.start();
                 setScannerUi(true);
             } else {
-                if (html5QrcodeScanner) {
-                    html5QrcodeScanner.clear();
+                if (hybridScanner) {
+                    hybridScanner.stop();
+                    hybridScanner = null;
                 }
                 qrReader.style.display = 'none';
                 setScannerUi(false);
@@ -1006,23 +1001,6 @@
                                 </div>`;
                         }
                         
-                        // Add appointment badge if item has upcoming appointments
-                        let appointmentBadge = '';
-                        if (item.appointments && Array.isArray(item.appointments) && item.appointments.length > 0) {
-                            const upcomingAppointment = getUpcomingAppointment(item.appointments);
-                            if (upcomingAppointment) {
-                                const formattedDate = formatAppointmentDate(upcomingAppointment.date);
-                                const startPeriod = formatAppointmentPeriod(upcomingAppointment.start_period);
-                                const endPeriod = formatAppointmentPeriod(upcomingAppointment.end_period);
-                                
-                                appointmentBadge = `
-                                    <div class="appointment-badge">
-                                        <strong>Geplant für:</strong> ${formattedDate}<br>
-                                        <span class="appointment-time">${startPeriod}${endPeriod && endPeriod !== startPeriod ? ' - ' + endPeriod : ''}</span>
-                                    </div>`;
-                            }
-                        }
-
                         card.innerHTML = `
                             <div class="card-content" data-item-id="${item._id}">
                                 <h3 class="item-col-name">${item.Name}</h3>
@@ -1037,7 +1015,6 @@
                                     ${imagesHtml}
                                 </div>
                                 ${borrowerBadge}
-                                ${appointmentBadge}
                             </div>
                             <div class="actions">
                                 ${isAvailableForBorrow && !item.BlockedNow ? 
@@ -1614,27 +1591,6 @@
             `;
         }
         
-        // Add appointment info panel if item has appointments
-        let appointmentInfoHtml = '';
-        if (item.appointments && Array.isArray(item.appointments) && item.appointments.length > 0) {
-            const upcomingAppointment = getUpcomingAppointment(item.appointments);
-            if (upcomingAppointment) {
-                const formattedDate = formatAppointmentDate(upcomingAppointment.date);
-                const startPeriod = formatAppointmentPeriod(upcomingAppointment.start_period);
-                const endPeriod = formatAppointmentPeriod(upcomingAppointment.end_period);
-                const timeDisplay = startPeriod + (endPeriod && endPeriod !== startPeriod ? ' - ' + endPeriod : '');
-                
-                appointmentInfoHtml = `
-                    <div class="appointment-info-panel">
-                        <h4>Geplanter Termin</h4>
-                        <p class="appointment-date">Datum: ${formattedDate}</p>
-                        <p class="appointment-time">Zeit: ${timeDisplay}</p>
-                        ${upcomingAppointment.notes ? `<p class="appointment-notes">Notizen: ${upcomingAppointment.notes}</p>` : ''}
-                    </div>
-                `;
-            }
-        }
-        
         // Build modal content HTML
         modalContent.innerHTML = `
             <h2>${item.Name}</h2>
@@ -1642,7 +1598,6 @@
                 <button type="button" class="bookmark-btn" id="modal-bookmark-btn" title="Merken">${(window.currentFavorites||new Set()).has(item._id) ? '★' : '☆'}</button>
             </div>
             ${borrowerInfoHtml}
-            ${appointmentInfoHtml}
             
             <div class="modal-image-container">
                 ${imagesHtml}
@@ -2804,66 +2759,6 @@
         }
     }
 
-    // Helper functions for appointment display
-    function formatAppointmentDate(dateString) {
-        if (!dateString) return '';
-        try {
-                       const date = new Date(dateString);
-            return date.toLocaleDateString('de-DE', {
-                day: '2-digit',
-                month: '2-digit',
-                year: 'numeric'
-            });
-        } catch (e) {
-            return dateString;
-        }
-    }
-
-    function formatAppointmentPeriod(period) {
-        if (!period) return '';
-        const periodMap = {
-            '1': '1. Stunde',
-            '2': '2. Stunde',
-            '3': '3. Stunde',
-            '4': '4. Stunde',
-            '5': '5. Stunde',
-            '6': '6. Stunde',
-            '7': '7. Stunde',
-            '8': '8. Stunde',
-            '9': '9. Stunde',
-            '10': '10. Stunde',
-            'pause1': '1. Pause',
-            'pause2': '2. Pause',
-            'mittagspause': 'Mittagspause'
-        };
-        return periodMap[period] || period;
-    }
-
-    function getUpcomingAppointment(appointments) {
-        if (!appointments || !Array.isArray(appointments) || appointments.length === 0) {
-            return null;
-        }
-        
-        const now = new Date();
-        const today = now.toDateString();
-        
-        // Filter appointments that are today or in the future
-        const futureAppointments = appointments.filter(apt => {
-            try {
-                const aptDate = new Date(apt.date);
-                return aptDate.toDateString() === today || aptDate >= now.setHours(0, 0, 0, 0);
-            } catch (e) {
-                return false;
-            }
-        });
-        
-        if (futureAppointments.length === 0) return null;
-        
-        // Sort by date and return the earliest
-        futureAppointments.sort((a, b) => new Date(a.date) - new Date(b.date));
-        return futureAppointments[0];
-    }
-
     function formatDateForInput(dateString) {
         const options = { year: 'numeric', month: '2-digit', day: '2-digit' };
         const date = new Date(dateString);
@@ -3947,16 +3842,6 @@
     .borrower-info-panel h4 { color: #856404; margin: 0 0 10px 0; font-size: 1.1rem; }
     .borrower-name, .borrow-time { margin: 5px 0; color: #856404; font-weight: 500; }
 
-    .appointment-info-panel {
-        background-color: #e1f5fe;
-        border: 1px solid #81d4fa;
-        border-radius: 5px;
-        padding: 15px;
-        margin-bottom: 20px;
-    }
-    .appointment-info-panel h4 { color: #0277bd; margin: 0 0 10px 0; font-size: 1.1rem; }
-    .appointment-date, .appointment-time, .appointment-user { margin: 5px 0; color: #0277bd; font-weight: 500; }
-
     /* Modal Details Styling (text formatting) */
     .modal-details { margin: 20px 0; }
     .detail-group { display: flex; margin-bottom: 10px; align-items: flex-start; }

Web/templates/main_admin.html

@@ -2435,7 +2435,10 @@ document.addEventListener('DOMContentLoaded', ()=>{
         </div>
         <div class="qr-container">
             <button id="scanButton" class="scan-button" aria-controls="qr-reader" aria-expanded="false">Barcode scannen</button>
-            <div id="qr-reader"></div>
+            <div id="qr-reader" style="display: none;">
+                <video id="qr-reader-video" playsinline style="width: 100%; max-width: 100%; height: auto; aspect-ratio: 4/3; object-fit: cover; border-radius: 8px;"></video>
+                <canvas id="qr-reader-canvas" style="display: none;"></canvas>
+            </div>
         </div>
 
         <div id="table-view-header" class="table-view-header" aria-hidden="true">
@@ -2729,7 +2732,8 @@ document.addEventListener('DOMContentLoaded', ()=>{
     
     window.isDebug = false; // Set to true only for development environment
 </script>
-<script src="https://unpkg.com/html5-qrcode@2.0.9/dist/html5-qrcode.min.js"></script>
+<script src="https://unpkg.com/@zxing/library@latest/umd/index.min.js"></script>
+<script src="/static/js/scanner.js"></script>
 <script>
     // Function to check if a file is a video
     function isVideoFile(filename) {
@@ -2739,7 +2743,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
     }
 
     // Initialize QR Code scanner and global variables
-    let html5QrcodeScanner = null;
+    let hybridScanner = null;
     let codeSearchTerm = '';
     let descSearchIds = null; // Set of matching IDs or null when disabled
     let currentUsername = '';
@@ -2783,33 +2787,37 @@ document.addEventListener('DOMContentLoaded', ()=>{
         if (qrReader.style.display === 'none') {
             qrReader.style.display = 'block';
             
-            html5QrcodeScanner = new Html5QrcodeScanner(
-                "qr-reader", { 
-                    fps: 10, 
-                    qrbox: 250,
-                    rememberLastUsedCamera: true
-                }
-            );
-            
-            html5QrcodeScanner.render((decodedText) => {
-                html5QrcodeScanner.clear();
-                qrReader.style.display = 'none';
-                
-                // Instead of navigating to the URL, put the scanned code in the search box
-                const searchInput = document.getElementById('code-search');
-                if (searchInput) {
-                    searchInput.value = decodedText;
-                    // Trigger search automatically
-                    searchByCode();
-                }
+            hybridScanner = new HybridScanner({
+                videoId: 'qr-reader-video',
+                canvasId: 'qr-reader-canvas',
+                formats: ['QR_CODE', 'CODE_128', 'EAN_13', 'EAN_8', 'CODE_39', 'UPC_A'],
+                fps: 10,
+                facingMode: 'environment',
+                onSuccess: function(decodedText) {
+                    hybridScanner.stop();
+                    qrReader.style.display = 'none';
+                    
+                    // Put the scanned code in the search box
+                    const searchInput = document.getElementById('code-search');
+                    if (searchInput) {
+                        searchInput.value = decodedText;
+                        // Trigger search automatically
+                        searchByCode();
+                    }
 
-                setScannerUi(false);
+                    setScannerUi(false);
+                },
+                onError: function(error) {
+                    console.error('Scanner error:', error);
+                }
             });
 
+            hybridScanner.start();
             setScannerUi(true);
         } else {
-            if (html5QrcodeScanner) {
-                html5QrcodeScanner.clear();
+            if (hybridScanner) {
+                hybridScanner.stop();
+                hybridScanner = null;
             }
             qrReader.style.display = 'none';
             setScannerUi(false);
@@ -2825,8 +2833,9 @@ document.addEventListener('DOMContentLoaded', ()=>{
         }
 
         if (qrReader.style.display !== 'none') {
-            if (html5QrcodeScanner) {
-                html5QrcodeScanner.clear();
+            if (hybridScanner) {
+                hybridScanner.stop();
+                hybridScanner = null;
             }
             qrReader.style.display = 'none';
             scanEditBtn.textContent = 'Barcode scannen';
@@ -2835,18 +2844,25 @@ document.addEventListener('DOMContentLoaded', ()=>{
 
         qrReader.style.display = 'block';
         scanEditBtn.textContent = 'Scanner schließen';
-        html5QrcodeScanner = new Html5QrcodeScanner('qr-reader', { 
-            fps: 10, 
-            qrbox: 250,
-            rememberLastUsedCamera: true
-        });
-        html5QrcodeScanner.render((decodedText) => {
-            html5QrcodeScanner.clear();
-            qrReader.style.display = 'none';
-            editCodeInput.value = String(decodedText || '').trim();
-            validateCodeField(editCodeInput, document.getElementById('edit-item-id')?.value || null);
-            scanEditBtn.textContent = 'Barcode scannen';
+        hybridScanner = new HybridScanner({
+            videoId: 'qr-reader-video',
+            canvasId: 'qr-reader-canvas',
+            formats: ['CODE_128', 'CODE_39', 'QR_CODE'],
+            fps: 10,
+            facingMode: 'environment',
+            onSuccess: function(decodedText) {
+                hybridScanner.stop();
+                qrReader.style.display = 'none';
+                editCodeInput.value = String(decodedText || '').trim();
+                validateCodeField(editCodeInput, document.getElementById('edit-item-id')?.value || null);
+                scanEditBtn.textContent = 'Barcode scannen';
+            },
+            onError: function(error) {
+                console.error('Scanner error:', error);
+            }
         });
+        
+        hybridScanner.start();
     }
 
     function scanIntoEditIsbn() {
@@ -2858,8 +2874,9 @@ document.addEventListener('DOMContentLoaded', ()=>{
         }
 
         if (qrReader.style.display !== 'none') {
-            if (html5QrcodeScanner) {
-                html5QrcodeScanner.clear();
+            if (hybridScanner) {
+                hybridScanner.stop();
+                hybridScanner = null;
             }
             qrReader.style.display = 'none';
             scanIsbnBtn.textContent = 'ISBN scannen';
@@ -2868,20 +2885,27 @@ document.addEventListener('DOMContentLoaded', ()=>{
 
         qrReader.style.display = 'block';
         scanIsbnBtn.textContent = 'Scanner schließen';
-        html5QrcodeScanner = new Html5QrcodeScanner('qr-reader', {
+        hybridScanner = new HybridScanner({
+            videoId: 'qr-reader-video',
+            canvasId: 'qr-reader-canvas',
+            formats: ['ISBN', 'EAN_13', 'EAN_8', 'QR_CODE'],
             fps: 10,
-            qrbox: 250,
-            rememberLastUsedCamera: true
-        });
-        html5QrcodeScanner.render((decodedText) => {
-            html5QrcodeScanner.clear();
-            qrReader.style.display = 'none';
-            editIsbnInput.value = String(decodedText || '').trim();
-            scanIsbnBtn.textContent = 'ISBN scannen';
-            if (typeof fetchBookInfo === 'function') {
-                fetchBookInfo('edit');
+            facingMode: 'environment',
+            onSuccess: function(decodedText) {
+                hybridScanner.stop();
+                qrReader.style.display = 'none';
+                editIsbnInput.value = String(decodedText || '').trim();
+                scanIsbnBtn.textContent = 'ISBN scannen';
+                if (typeof fetchBookInfo === 'function') {
+                    fetchBookInfo('edit');
+                }
+            },
+            onError: function(error) {
+                console.error('Scanner error:', error);
             }
         });
+        
+        hybridScanner.start();
     }
 
     function rebuildFilter3Options() {

Web/templates/maintenance.html

@@ -0,0 +1,28 @@
+{% extends "base.html" %}
+
+{% block title %}Wartungsarbeiten - Inventarsystem{% endblock %}
+
+{% block content %}
+<div class="container py-5">
+    <div class="row justify-content-center">
+        <div class="col-12 col-lg-8 col-xl-7">
+            <div class="card border-0 shadow-lg rounded-4 overflow-hidden">
+                <div class="card-header text-white" style="background: linear-gradient(135deg, #0f4c5c, #16697a);">
+                    <p class="text-uppercase small fw-semibold mb-1 opacity-75">Systemstatus</p>
+                    <h1 class="h3 mb-0 fw-bold">Wartungsarbeiten</h1>
+                </div>
+                <div class="card-body p-4 p-md-5 bg-white text-center">
+                    <div class="display-3 fw-bold text-warning mb-3">500</div>
+                    <p class="lead mb-2">Das System führt gerade Wartungsarbeiten durch.</p>
+                    <p class="text-muted mb-4">Bitte versuchen Sie es in wenigen Minuten erneut. Falls das Problem bestehen bleibt, informieren Sie bitte die Administration.</p>
+
+                    <div class="d-flex flex-column flex-sm-row justify-content-center gap-2">
+                        <a href="{{ url_for('login') }}" class="btn btn-primary btn-lg">Zum Login</a>
+                        <a href="javascript:history.back()" class="btn btn-outline-secondary btn-lg">Zurück</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}

Web/templates/termin_client.html

@@ -2,17 +2,49 @@
 
 {% block title %}Termin buchen - Inventarsystem{% endblock %}
 
+{% block head %}
+{{ super() }}
+<link href="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.15/index.global.min.css" rel="stylesheet">
+<style>
+    #client-slot-calendar {
+        min-height: 520px;
+    }
+    .fc .fc-timegrid-slot-label-cushion,
+    .fc .fc-timegrid-axis-cushion,
+    .fc .fc-col-header-cell-cushion {
+        font-weight: 600;
+    }
+    .slot-selected-chip {
+        display: inline-flex;
+        align-items: center;
+        gap: .4rem;
+        border-radius: 999px;
+        background: rgba(13, 110, 253, 0.1);
+        color: #0d6efd;
+        padding: .35rem .75rem;
+        font-size: .9rem;
+        font-weight: 700;
+    }
+    .day-slider-wrap {
+        background: #f8f9fa;
+        border: 1px solid #e9ecef;
+        border-radius: .9rem;
+        padding: .8rem 1rem;
+    }
+</style>
+{% endblock %}
+
 {% block content %}
 <div class="container py-4">
     <div class="row justify-content-center">
-        <div class="col-12 col-xl-10">
+        <div class="col-12 col-xxl-11">
             <div class="row g-4">
-                <div class="col-12 col-lg-5">
+                <div class="col-12 col-lg-4">
                     <div class="card border-0 shadow-lg rounded-4 h-100">
                         <div class="card-body p-4 p-md-5">
                             <p class="text-uppercase text-muted fw-semibold mb-2">Terminplaner</p>
                             <h1 class="h3 fw-bold mb-3">Termin buchen</h1>
-                            <p class="text-muted mb-4">Wählen Sie einen freien Zeitpunkt und tragen Sie Ihren Namen ein. Der Termin wird anschließend im Plan gespeichert.</p>
+                            <p class="text-muted mb-4">Wählen Sie im Kalender einen freien Slot aus. Den gewählten Termin können Sie danach direkt wie in einem Kalender-Block verschieben.</p>
 
                             <div class="p-3 rounded-3 bg-light mb-3">
                                 <div class="fw-semibold">Zeitraum</div>
@@ -27,12 +59,24 @@
                                 <div>{{ available.slot_lenght }} Minuten</div>
                             </div>
 
+                            <div class="p-3 rounded-3 bg-light mb-3">
+                                <div class="fw-semibold mb-2">Gewählter Termin</div>
+                                <div id="selected-slot-badge" class="text-muted small">Noch kein Slot ausgewählt.</div>
+                            </div>
+
                             {% if available.slots_booked %}
                             <div class="p-3 rounded-3 bg-light">
                                 <div class="fw-semibold mb-2">Bereits gebucht</div>
                                 <ul class="mb-0 small">
                                     {% for booking in available.slots_booked %}
-                                    <li>{{ booking.start }}{% if booking.name %} - {{ booking.name }}{% endif %}</li>
+                                    <li>
+                                        {{ booking.start }}
+                                        {% if can_view_booking_names and booking.name %}
+                                        - {{ booking.name }}
+                                        {% else %}
+                                        - Belegt
+                                        {% endif %}
+                                    </li>
                                     {% endfor %}
                                 </ul>
                             </div>
@@ -40,15 +84,26 @@
                         </div>
                     </div>
                 </div>
-                <div class="col-12 col-lg-7">
+                <div class="col-12 col-lg-8">
                     <div class="card border-0 shadow-lg rounded-4 h-100">
                         <div class="card-body p-4 p-md-5 bg-white">
-                            <h2 class="h4 fw-bold mb-4">Buchung absenden</h2>
-                            <form method="post" action="{{ url_for('terminplaner.client', appointment_id=appointment_id) }}" class="vstack gap-3">
+                            <h2 class="h4 fw-bold mb-3">Termin im Kalender auswählen</h2>
+
+                            <div class="day-slider-wrap mb-3">
+                                <div class="d-flex justify-content-between align-items-center gap-2 mb-2">
+                                    <span class="small text-muted">Tag wählen</span>
+                                    <strong id="day-slider-label" class="small"></strong>
+                                </div>
+                                <input id="day-slider" type="range" class="form-range m-0" min="0" max="0" value="0">
+                            </div>
+
+                            <div id="client-slot-calendar" class="mb-4"></div>
+
+                            <form id="client-booking-form" method="post" action="{{ url_for('terminplaner.client', appointment_id=appointment_id, tenant=tenant_id) }}" class="vstack gap-3">
                                 <div>
                                     <label for="start_day_time" class="form-label fw-semibold">Gewünschter Zeitpunkt</label>
-                                    <input type="text" id="start_day_time" name="start_day_time" class="form-control form-control-lg" placeholder="2026-05-29 10:30" required>
-                                    <div class="form-text">Tragen Sie Datum und Uhrzeit im Format YYYY-MM-DD HH:MM ein, sofern kein Kalenderfeld genutzt wird.</div>
+                                    <input type="text" id="start_day_time" name="start_day_time" class="form-control form-control-lg" placeholder="Bitte im Kalender auswählen" readonly required>
+                                    <div class="form-text">Klicken Sie auf einen freien Slot oder verschieben Sie den gewählten Block.</div>
                                 </div>
                                 <div>
                                     <label for="client_name" class="form-label fw-semibold">Ihr Name</label>
@@ -56,7 +111,7 @@
                                 </div>
                                 <div class="d-flex flex-column flex-sm-row gap-2 pt-2">
                                     <button type="submit" class="btn btn-primary btn-lg">Termin buchen</button>
-                                    <a class="btn btn-outline-secondary btn-lg" href="{{ url_for('terminplaner.main') }}">Zur Übersicht</a>
+                                    <a class="btn btn-outline-secondary btn-lg" href="{{ url_for('terminplaner.main', tenant=tenant_id) }}">Zur Übersicht</a>
                                 </div>
                             </form>
                         </div>
@@ -66,4 +121,403 @@
         </div>
     </div>
 </div>
+
+<div class="modal fade" id="calendarDownloadModal" tabindex="-1" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">Termin zum Kalender hinzufügen?</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Schließen"></button>
+            </div>
+            <div class="modal-body">
+                <p class="mb-2">Sie haben einen Termin ausgewählt.</p>
+                <p class="mb-0 small text-muted">Mit einem Klick auf ".ics herunterladen" können Sie den Termin in Apple/Google/Outlook-Kalender importieren.</p>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Abbrechen</button>
+                <button id="confirm-booking-only" type="button" class="btn btn-primary">Jetzt buchen</button>
+                <button id="confirm-booking-with-ics" type="button" class="btn btn-success">Buchen + .ics</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script src="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.15/index.global.min.js"></script>
+<script>
+    (function () {
+        const available = {{ available|tojson }};
+        const appointmentId = {{ appointment_id|tojson }};
+        const slider = document.getElementById('day-slider');
+        const sliderLabel = document.getElementById('day-slider-label');
+        const sliderWrap = slider ? slider.closest('.day-slider-wrap') : null;
+        const selectedSlotInput = document.getElementById('start_day_time');
+        const selectedSlotBadge = document.getElementById('selected-slot-badge');
+        const clientNameInput = document.getElementById('client_name');
+        const form = document.getElementById('client-booking-form');
+        const calendarEl = document.getElementById('client-slot-calendar');
+        const modalEl = document.getElementById('calendarDownloadModal');
+        const confirmBookingOnlyBtn = document.getElementById('confirm-booking-only');
+        const confirmBookingWithIcsBtn = document.getElementById('confirm-booking-with-ics');
+        const modal = modalEl ? new bootstrap.Modal(modalEl) : null;
+
+        const slotLength = Number.parseInt(available.slot_lenght, 10) || 45;
+        const bookedStarts = new Set((available.slots_booked || []).map(function (entry) {
+            return String(entry.start || '').trim();
+        }).filter(Boolean));
+
+        function formatDateForInput(dateObj) {
+            const y = dateObj.getFullYear();
+            const m = String(dateObj.getMonth() + 1).padStart(2, '0');
+            const d = String(dateObj.getDate()).padStart(2, '0');
+            const hh = String(dateObj.getHours()).padStart(2, '0');
+            const mm = String(dateObj.getMinutes()).padStart(2, '0');
+            return y + '-' + m + '-' + d + ' ' + hh + ':' + mm;
+        }
+
+        function formatDateReadable(value) {
+            if (!value) return 'Noch kein Slot ausgewählt.';
+            return 'Ausgewählt: ' + value;
+        }
+
+        function dateRangeInclusive(startStr, endStr) {
+            const days = [];
+            const start = new Date(startStr + 'T00:00:00');
+            const end = new Date(endStr + 'T00:00:00');
+            if (Number.isNaN(start.getTime()) || Number.isNaN(end.getTime())) {
+                return days;
+            }
+            const cursor = new Date(start);
+            while (cursor <= end) {
+                const y = cursor.getFullYear();
+                const m = String(cursor.getMonth() + 1).padStart(2, '0');
+                const d = String(cursor.getDate()).padStart(2, '0');
+                days.push(y + '-' + m + '-' + d);
+                cursor.setDate(cursor.getDate() + 1);
+            }
+            return days;
+        }
+
+        function addMinutes(dateObj, minutes) {
+            return new Date(dateObj.getTime() + minutes * 60000);
+        }
+
+        function formatTimeForCalendar(dateObj) {
+            return String(dateObj.getHours()).padStart(2, '0') + ':' + String(dateObj.getMinutes()).padStart(2, '0') + ':00';
+        }
+
+        function addDays(dateStr, days) {
+            const d = new Date(dateStr + 'T00:00:00');
+            d.setDate(d.getDate() + days);
+            const y = d.getFullYear();
+            const m = String(d.getMonth() + 1).padStart(2, '0');
+            const day = String(d.getDate()).padStart(2, '0');
+            return y + '-' + m + '-' + day;
+        }
+
+        function parseTimeSpanEntry(entry) {
+            const value = String(entry || '').trim();
+            let m = value.match(/^(\d{4}-\d{2}-\d{2})\s+(\d{2}:\d{2})-(\d{2}:\d{2})$/);
+            if (m) {
+                return { date: m[1], from: m[2], to: m[3] };
+            }
+            m = value.match(/^(\d{2}:\d{2})-(\d{2}:\d{2})$/);
+            if (m) {
+                return { date: null, from: m[1], to: m[2] };
+            }
+            return null;
+        }
+
+        function buildCandidateSlots() {
+            const slots = [];
+            const allowedDates = dateRangeInclusive(String(available.date_start || ''), String(available.date_end || ''));
+            const spans = Array.isArray(available.time_span) ? available.time_span : [];
+
+            spans.forEach(function (entry) {
+                const parsed = parseTimeSpanEntry(entry);
+                if (!parsed) {
+                    return;
+                }
+
+                const targetDates = parsed.date ? [parsed.date] : allowedDates;
+                targetDates.forEach(function (date) {
+                    const from = new Date(date + 'T' + parsed.from + ':00');
+                    const to = new Date(date + 'T' + parsed.to + ':00');
+                    if (Number.isNaN(from.getTime()) || Number.isNaN(to.getTime()) || from >= to) {
+                        return;
+                    }
+
+                    let cursor = new Date(from);
+                    while (addMinutes(cursor, slotLength) <= to) {
+                        const slotStart = formatDateForInput(cursor);
+                        if (!bookedStarts.has(slotStart)) {
+                            slots.push({
+                                start: slotStart,
+                                end: formatDateForInput(addMinutes(cursor, slotLength)),
+                            });
+                        }
+                        cursor = addMinutes(cursor, slotLength);
+                    }
+                });
+            });
+
+            return slots;
+        }
+
+        const candidateSlots = buildCandidateSlots();
+        const slotStartSet = new Set(candidateSlots.map(function (slot) { return slot.start; }));
+        const allDays = dateRangeInclusive(String(available.date_start || ''), String(available.date_end || ''));
+
+        // Show the requested UI time window from 08:15 to 20:00 and highlight available slots
+        let slotMinTime = '08:15:00';
+        let slotMaxTime = '20:00:00';
+        if (candidateSlots.length > 0) {
+            const starts = candidateSlots.map(function (slot) {
+                return new Date(slot.start.replace(' ', 'T') + ':00');
+            }).filter(function (d) { return !Number.isNaN(d.getTime()); });
+            const ends = candidateSlots.map(function (slot) {
+                return new Date(slot.end.replace(' ', 'T') + ':00');
+            }).filter(function (d) { return !Number.isNaN(d.getTime()); });
+
+            // Keep the computed min/max for gap calculations below
+            var computedMinStart = null;
+            var computedMaxEnd = null;
+            if (starts.length > 0 && ends.length > 0) {
+                computedMinStart = starts[0];
+                computedMaxEnd = ends[0];
+                starts.forEach(function (d) { if (d < computedMinStart) computedMinStart = d; });
+                ends.forEach(function (d) { if (d > computedMaxEnd) computedMaxEnd = d; });
+            }
+        }
+
+        const visibleStart = allDays[0] || String(available.date_start || '');
+        const visibleEndExclusive = allDays.length > 0
+            ? addDays(allDays[allDays.length - 1], 1)
+            : addDays(String(available.date_end || available.date_start || ''), 1);
+
+        const multiDayDuration = Math.max(1, allDays.length || 1);
+        const initialViewName = multiDayDuration === 1 ? 'timeGridDay' : 'timeGridRange';
+        let selectedSlot = '';
+        let selectedEvent = null;
+        let allowImmediateSubmit = false;
+
+        const calendar = new FullCalendar.Calendar(calendarEl, {
+            initialView: initialViewName,
+            views: {
+                timeGridRange: {
+                    type: 'timeGrid',
+                    duration: { days: multiDayDuration },
+                    buttonText: 'Zeitraum'
+                }
+            },
+            locale: 'de',
+            firstDay: 1,
+            height: 'auto',
+            allDaySlot: false,
+            editable: true,
+            eventStartEditable: true,
+            eventDurationEditable: false,
+            selectable: false,
+            slotDuration: '00:15:00',
+            snapDuration: '00:15:00',
+            slotMinTime: slotMinTime,
+            slotMaxTime: slotMaxTime,
+            nowIndicator: true,
+            validRange: {
+                start: visibleStart,
+                end: visibleEndExclusive,
+            },
+            visibleRange: {
+                start: visibleStart,
+                end: visibleEndExclusive,
+            },
+            headerToolbar: {
+                left: '',
+                center: 'title',
+                right: multiDayDuration === 1 ? '' : 'timeGridDay,timeGridRange'
+            },
+            events: [],
+            eventDrop: function (info) {
+                if (info.event.id !== 'selected-slot') {
+                    return;
+                }
+                const droppedStart = formatDateForInput(info.event.start);
+                if (!slotStartSet.has(droppedStart)) {
+                    info.revert();
+                    window.alert('Dieser Zeitpunkt ist nicht als freier Slot verfügbar.');
+                    return;
+                }
+                applySelectedSlot(droppedStart);
+            },
+            eventClick: function (info) {
+                const slotType = info.event.extendedProps ? info.event.extendedProps.slotType : '';
+                if (slotType !== 'free') {
+                    return;
+                }
+                applySelectedSlot(info.event.extendedProps.slotStart || '');
+            }
+        });
+
+        // No background greying: show full calendar skeleton and only mark possible slots
+
+        function updateSliderLabel() {
+            const dateList = dateRangeInclusive(String(available.date_start || ''), String(available.date_end || ''));
+            const idx = Number.parseInt(slider.value, 10) || 0;
+            sliderLabel.textContent = dateList[idx] || '';
+        }
+
+        function applySelectedSlot(value) {
+            selectedSlot = String(value || '').trim();
+            selectedSlotInput.value = selectedSlot;
+            selectedSlotBadge.innerHTML = selectedSlot
+                ? '<span class="slot-selected-chip">' + selectedSlot + '</span>'
+                : 'Noch kein Slot ausgewählt.';
+
+            if (selectedEvent) {
+                selectedEvent.remove();
+                selectedEvent = null;
+            }
+
+            if (!selectedSlot) {
+                return;
+            }
+
+            const start = new Date(selectedSlot.replace(' ', 'T') + ':00');
+            const end = addMinutes(start, slotLength);
+            selectedEvent = calendar.addEvent({
+                id: 'selected-slot',
+                title: 'Ihr ausgewählter Termin',
+                start: start,
+                end: end,
+                color: '#0d6efd',
+                editable: true,
+            });
+
+            refreshIcsLink();
+        }
+
+        function getIcsDownloadUrl() {
+            const base = {{ url_for('terminplaner.client_slot_calendar_export', appointment_id=appointment_id, tenant=tenant_id)|tojson }};
+            const url = new URL(base, window.location.origin);
+            if (selectedSlot) {
+                url.searchParams.set('start', selectedSlot);
+            }
+            const name = String(clientNameInput.value || '').trim();
+            if (name) {
+                url.searchParams.set('name', name);
+            }
+            return url.toString();
+        }
+
+        function refreshIcsLink() {
+            const icsUrl = getIcsDownloadUrl();
+            if (confirmBookingWithIcsBtn) {
+                confirmBookingWithIcsBtn.setAttribute('data-ics-url', icsUrl);
+            }
+        }
+
+        // No background gaps: keep full skeleton/grid visible
+
+        // Add candidate free slots (blue)
+        candidateSlots.forEach(function (slot) {
+            const start = new Date(slot.start.replace(' ', 'T') + ':00');
+            const end = new Date(slot.end.replace(' ', 'T') + ':00');
+            calendar.addEvent({
+                title: 'Freier Slot',
+                start: start,
+                end: end,
+                color: '#0d6efd',
+                textColor: '#ffffff',
+                editable: false,
+                extendedProps: {
+                    slotStart: slot.start,
+                    slotType: 'free',
+                }
+            });
+        });
+
+        (available.slots_booked || []).forEach(function (booking) {
+            const startStr = String(booking.start || '').trim();
+            if (!startStr) {
+                return;
+            }
+            const start = new Date(startStr.replace(' ', 'T') + ':00');
+            const end = addMinutes(start, slotLength);
+            calendar.addEvent({
+                title: 'Gebucht' + (booking.name ? ' - ' + booking.name : ''),
+                start: start,
+                end: end,
+                color: '#dc3545',
+                editable: false,
+                display: 'block',
+            });
+        });
+
+        form.addEventListener('submit', function (ev) {
+            if (!selectedSlotInput.value) {
+                ev.preventDefault();
+                window.alert('Bitte zuerst im Kalender einen freien Slot auswählen.');
+                return;
+            }
+
+            if (allowImmediateSubmit) {
+                return;
+            }
+
+            ev.preventDefault();
+            if (modal) {
+                modal.show();
+            }
+        });
+
+        if (confirmBookingOnlyBtn) {
+            confirmBookingOnlyBtn.addEventListener('click', function () {
+                allowImmediateSubmit = true;
+                if (modal) {
+                    modal.hide();
+                }
+                form.submit();
+            });
+        }
+
+        if (confirmBookingWithIcsBtn) {
+            confirmBookingWithIcsBtn.addEventListener('click', function () {
+                const icsUrl = confirmBookingWithIcsBtn.getAttribute('data-ics-url') || getIcsDownloadUrl();
+                if (icsUrl) {
+                    window.open(icsUrl, '_blank');
+                }
+                allowImmediateSubmit = true;
+                if (modal) {
+                    modal.hide();
+                }
+                form.submit();
+            });
+        }
+
+        clientNameInput.addEventListener('input', refreshIcsLink);
+
+        if (sliderWrap) {
+            sliderWrap.style.display = multiDayDuration > 1 ? '' : 'none';
+        }
+
+        slider.max = String(Math.max(0, allDays.length - 1));
+        slider.value = '0';
+        updateSliderLabel();
+        if (allDays.length > 0) {
+            calendar.gotoDate(allDays[0]);
+        }
+
+        slider.addEventListener('input', function () {
+            const idx = Number.parseInt(slider.value, 10) || 0;
+            updateSliderLabel();
+            if (allDays[idx]) {
+                if (calendar.view.type === 'timeGridDay') {
+                    calendar.gotoDate(allDays[idx]);
+                }
+            }
+        });
+
+        calendar.render();
+        refreshIcsLink();
+    })();
+</script>
 {% endblock %}

Web/templates/termin_client_success.html

@@ -0,0 +1,121 @@
+<!DOCTYPE html>
+<html lang="de">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Buchung erfolgreich</title>
+    <style>
+        :root {
+            color-scheme: light;
+            --bg-a: #0f4c5c;
+            --bg-b: #16697a;
+            --ok: #22c55e;
+            --text: #0f172a;
+            --muted: #475569;
+            --card: #ffffff;
+        }
+        * {
+            box-sizing: border-box;
+        }
+        body {
+            margin: 0;
+            min-height: 100vh;
+            font-family: "Manrope", "Segoe UI", sans-serif;
+            background: radial-gradient(circle at 20% 20%, rgba(255,255,255,0.14), transparent 45%), linear-gradient(135deg, var(--bg-a), var(--bg-b));
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            padding: 2rem;
+        }
+        .success-window {
+            width: min(900px, 100%);
+            background: var(--card);
+            border-radius: 1.25rem;
+            box-shadow: 0 28px 70px rgba(2, 6, 23, 0.32);
+            padding: clamp(1.5rem, 4vw, 3rem);
+            text-align: center;
+        }
+        .badge {
+            width: 84px;
+            height: 84px;
+            margin: 0 auto 1.25rem auto;
+            border-radius: 50%;
+            display: grid;
+            place-items: center;
+            background: rgba(34, 197, 94, 0.12);
+            color: var(--ok);
+            font-size: 2rem;
+            font-weight: 800;
+        }
+        h1 {
+            margin: 0 0 0.9rem 0;
+            font-size: clamp(1.8rem, 5vw, 3rem);
+            color: var(--text);
+            line-height: 1.1;
+        }
+        p {
+            margin: 0;
+            font-size: 1.1rem;
+            color: var(--muted);
+        }
+        .meta {
+            margin-top: 1.4rem;
+            padding: 1rem;
+            border-radius: 0.9rem;
+            background: #f8fafc;
+            color: #0f172a;
+            font-weight: 600;
+        }
+        .actions {
+            margin-top: 1.8rem;
+            display: flex;
+            justify-content: center;
+            gap: .75rem;
+            flex-wrap: wrap;
+        }
+        .btn {
+            border: 0;
+            border-radius: 0.8rem;
+            padding: .85rem 1.25rem;
+            font-size: 1rem;
+            font-weight: 700;
+            cursor: pointer;
+            text-decoration: none;
+            display: inline-flex;
+            align-items: center;
+            justify-content: center;
+        }
+        .btn-close {
+            background: #0f4c5c;
+            color: #fff;
+        }
+        .btn-link {
+            background: #e2e8f0;
+            color: #0f172a;
+        }
+    </style>
+</head>
+<body>
+    <main class="success-window" role="main" aria-live="polite">
+        <div class="badge">✓</div>
+        <h1>Buchung erfolgreich</h1>
+        <p>Sie können das Fenster jetzt schließen.</p>
+
+        {% if client_name or slot_start %}
+        <div class="meta">
+            {% if client_name %}
+            <div>Name: {{ client_name }}</div>
+            {% endif %}
+            {% if slot_start %}
+            <div>Termin: {{ slot_start }}</div>
+            {% endif %}
+        </div>
+        {% endif %}
+
+        <div class="actions">
+            <button class="btn btn-close" type="button" onclick="window.close()">Fenster schließen</button>
+            <a class="btn btn-link" href="{{ url_for('terminplaner.client', appointment_id=appointment_id, tenant=tenant_id) }}">Zurück zur Buchungsseite</a>
+        </div>
+    </main>
+</body>
+</html>

Web/templates/termin_configure.html

@@ -24,10 +24,33 @@
                             </div>
                         </div>
 
-                        <div>
-                            <label for="time_frame" class="form-label fw-semibold">Zeitfenster</label>
-                            <textarea id="time_frame" name="time_frame" class="form-control" rows="5" placeholder="Beispiele:\nMontag 08:00-12:00\nDienstag 08:00-12:00" required></textarea>
-                            <div class="form-text">Jede Zeile kann ein eigenes Zeitfenster enthalten.</div>
+                        <div class="border rounded-4 p-3 p-md-4 bg-light-subtle">
+                            <div class="d-flex flex-column flex-md-row justify-content-between align-items-md-center gap-2 mb-2">
+                                <div>
+                                    <label class="form-label fw-semibold mb-0">Zeitfenster pro Tag</label>
+                                    <div class="form-text mb-0">Sobald Start- und Enddatum gesetzt sind, wird für jeden Tag automatisch ein eigener Eintrag erzeugt.</div>
+                                </div>
+                                <button type="button" class="btn btn-outline-primary btn-sm" id="build_time_frame">Tage aus Zeitraum erzeugen</button>
+                            </div>
+
+                            <div class="row g-3 mb-3">
+                                <div class="col-12 col-md-6 col-xl-4">
+                                    <label for="default_day_start" class="form-label fw-semibold">Standard-Startzeit</label>
+                                    <input type="time" id="default_day_start" class="form-control" value="08:00">
+                                </div>
+                                <div class="col-12 col-md-6 col-xl-4">
+                                    <label for="default_day_end" class="form-label fw-semibold">Standard-Endzeit</label>
+                                    <input type="time" id="default_day_end" class="form-control" value="12:00">
+                                </div>
+                            </div>
+
+                            <div id="time_frame_days" class="vstack gap-2"></div>
+
+                            <div class="mt-3">
+                                <label for="time_frame" class="form-label fw-semibold">Gespeichertes Zeitfenster</label>
+                                <textarea id="time_frame" name="time_frame" class="form-control font-monospace" rows="5" placeholder="Wird automatisch aus den Tagen erzeugt" required></textarea>
+                                <div class="form-text">Das Formular überträgt die erzeugten Tageszeilen an das Backend. Sie können die Liste hier bei Bedarf noch anpassen.</div>
+                            </div>
                         </div>
 
                         <div class="row g-3">
@@ -51,6 +74,12 @@
                             <textarea id="note" name="note" class="form-control" rows="4" placeholder="Optionaler Einführungstext für die Mail"></textarea>
                         </div>
 
+                        <div class="form-check">
+                            <input class="form-check-input" type="checkbox" id="add_to_calendar" name="add_to_calendar" {% if add_to_calendar %}checked{% endif %}>
+                            <label class="form-check-label fw-semibold" for="add_to_calendar">Kalendereintrag für den Nutzer erzeugen</label>
+                            <div class="form-text">Erzeugt zusätzlich eine .ics-Datei, die in gängige Kalender importiert werden kann.</div>
+                        </div>
+
                         <div class="d-flex flex-column flex-sm-row gap-2 pt-2">
                             <button type="submit" class="btn btn-primary btn-lg">Terminplan erzeugen</button>
                             <a class="btn btn-outline-secondary btn-lg" href="{{ url_for('terminplaner.main') }}">Zur Übersicht</a>
@@ -62,11 +91,168 @@
             {% if generated_link %}
             <div class="alert alert-success mt-4 shadow-sm rounded-4">
                 <div class="fw-bold mb-1">Buchungslink erstellt</div>
-                <div class="mb-2">Teilen Sie diesen Link mit den Teilnehmenden:</div>
+                <div class="mb-2">
+                    {% if email_service_enabled %}
+                        Teilen Sie diesen Link mit den Teilnehmenden oder versenden Sie ihn direkt per E-Mail.
+                    {% else %}
+                        Der E-Mail-Service ist deaktiviert. Teilen Sie diesen Link manuell mit den Teilnehmenden.
+                    {% endif %}
+                </div>
                 <a href="{{ generated_link }}" class="d-inline-block text-break">{{ generated_link }}</a>
+                {% if calendar_link %}
+                <div class="mt-3">
+                    <div class="fw-semibold mb-1">Kalendereintrag</div>
+                    <a href="{{ calendar_link }}" class="btn btn-outline-primary btn-sm">.ics herunterladen</a>
+                </div>
+                {% endif %}
             </div>
             {% endif %}
         </div>
     </div>
 </div>
+<script>
+(function () {
+    const startDateInput = document.getElementById('start_date');
+    const endDateInput = document.getElementById('end_date');
+    const buildButton = document.getElementById('build_time_frame');
+    const daysContainer = document.getElementById('time_frame_days');
+    const timeFrameTextarea = document.getElementById('time_frame');
+    const defaultStartInput = document.getElementById('default_day_start');
+    const defaultEndInput = document.getElementById('default_day_end');
+
+    if (!startDateInput || !endDateInput || !buildButton || !daysContainer || !timeFrameTextarea || !defaultStartInput || !defaultEndInput) {
+        return;
+    }
+
+    const weekdayFormatter = new Intl.DateTimeFormat('de-DE', {
+        weekday: 'long',
+        day: '2-digit',
+        month: '2-digit',
+        year: 'numeric',
+    });
+
+    function parseDate(value) {
+        if (!value) {
+            return null;
+        }
+
+        const parts = value.split('-').map(Number);
+        if (parts.length !== 3 || parts.some(Number.isNaN)) {
+            return null;
+        }
+
+        return new Date(parts[0], parts[1] - 1, parts[2]);
+    }
+
+    function formatDateForRow(date) {
+        return weekdayFormatter.format(date);
+    }
+
+    function formatDateForValue(date) {
+        const year = date.getFullYear();
+        const month = String(date.getMonth() + 1).padStart(2, '0');
+        const day = String(date.getDate()).padStart(2, '0');
+        return `${year}-${month}-${day}`;
+    }
+
+    function addDays(date, days) {
+        const copy = new Date(date);
+        copy.setDate(copy.getDate() + days);
+        return copy;
+    }
+
+    function syncTextarea() {
+        const rows = Array.from(daysContainer.querySelectorAll('[data-day-row]'));
+        const lines = rows.map(function (row) {
+            const dayValue = row.getAttribute('data-day-value') || '';
+            const startTime = row.querySelector('[data-time-start]')?.value || '';
+            const endTime = row.querySelector('[data-time-end]')?.value || '';
+            return `${dayValue} ${startTime}-${endTime}`.trim();
+        }).filter(Boolean);
+
+        timeFrameTextarea.value = lines.join('\n');
+    }
+
+    function renderRows() {
+        const startDate = parseDate(startDateInput.value);
+        const endDate = parseDate(endDateInput.value);
+
+        if (!startDate || !endDate) {
+            daysContainer.innerHTML = '<div class="text-muted small">Bitte Start- und Enddatum auswählen, damit die Tageszeilen erzeugt werden.</div>';
+            timeFrameTextarea.value = '';
+            endDateInput.setCustomValidity('');
+            return;
+        }
+
+        if (endDate < startDate) {
+            daysContainer.innerHTML = '<div class="text-danger small">Das Enddatum muss nach dem Startdatum liegen.</div>';
+            timeFrameTextarea.value = '';
+            endDateInput.setCustomValidity('Das Enddatum muss nach dem Startdatum liegen.');
+            return;
+        }
+
+        endDateInput.setCustomValidity('');
+
+        const existingValues = new Map();
+        Array.from(daysContainer.querySelectorAll('[data-day-row]')).forEach(function (row) {
+            const dayValue = row.getAttribute('data-day-value');
+            const startTime = row.querySelector('[data-time-start]')?.value || '';
+            const endTime = row.querySelector('[data-time-end]')?.value || '';
+            if (dayValue) {
+                existingValues.set(dayValue, { startTime, endTime });
+            }
+        });
+
+        const defaultStart = defaultStartInput.value || '08:00';
+        const defaultEnd = defaultEndInput.value || '12:00';
+        const rows = [];
+
+        for (let current = startDate; current <= endDate; current = addDays(current, 1)) {
+            const dayValue = formatDateForValue(current);
+            const preserved = existingValues.get(dayValue) || {};
+            const rowStart = preserved.startTime || defaultStart;
+            const rowEnd = preserved.endTime || defaultEnd;
+
+            rows.push(`
+                <div class="border rounded-3 bg-white p-3" data-day-row data-day-value="${dayValue}">
+                    <div class="row g-2 align-items-end">
+                        <div class="col-12 col-lg-5">
+                            <label class="form-label fw-semibold mb-1">${formatDateForRow(current)}</label>
+                            <div class="text-muted small">${dayValue}</div>
+                        </div>
+                        <div class="col-6 col-lg-3">
+                            <label class="form-label mb-1">Von</label>
+                            <input type="time" class="form-control" value="${rowStart}" data-time-start>
+                        </div>
+                        <div class="col-6 col-lg-3">
+                            <label class="form-label mb-1">Bis</label>
+                            <input type="time" class="form-control" value="${rowEnd}" data-time-end>
+                        </div>
+                    </div>
+                </div>
+            `);
+        }
+
+        daysContainer.innerHTML = rows.join('');
+        daysContainer.querySelectorAll('input[type="time"]').forEach(function (input) {
+            input.addEventListener('input', syncTextarea);
+            input.addEventListener('change', syncTextarea);
+        });
+
+        syncTextarea();
+    }
+
+    buildButton.addEventListener('click', renderRows);
+    startDateInput.addEventListener('input', renderRows);
+    startDateInput.addEventListener('change', renderRows);
+    endDateInput.addEventListener('input', renderRows);
+    endDateInput.addEventListener('change', renderRows);
+    defaultStartInput.addEventListener('change', syncTextarea);
+    defaultEndInput.addEventListener('change', syncTextarea);
+
+    if (startDateInput.value && endDateInput.value) {
+        renderRows();
+    }
+})();
+</script>
 {% endblock %}

Web/templates/terminplaner.html

@@ -14,8 +14,8 @@
                         <p class="lead mb-0" style="max-width: 60ch; opacity: .95;">Erstellen Sie neue Terminreihen, teilen Sie Buchungslinks und öffnen Sie den Kalender für bestehende Reservierungen.</p>
                     </div>
                     <div class="d-flex flex-wrap gap-2">
-                        <a class="btn btn-light btn-lg fw-semibold" href="{{ url_for('terminplaner.configure') }}">Neue Planung</a>
-                        <a class="btn btn-outline-light btn-lg fw-semibold" href="{{ url_for('terminplan') }}">Kalender öffnen</a>
+                        <a class="btn btn-light btn-lg fw-semibold" href="{{ url_for('terminplaner.configure', tenant=tenant_id) }}">Neue Planung</a>
+                        <a class="btn btn-outline-light btn-lg fw-semibold" href="{{ url_for('terminplan', tenant=tenant_id) }}">Kalender öffnen</a>
                     </div>
                 </div>
             </section>
@@ -27,7 +27,7 @@
                             <div class="display-6 mb-3">🗓️</div>
                             <h2 class="h4 fw-bold">Kalender</h2>
                             <p class="mb-4 text-muted">Sehen Sie vorhandene Termine, ihre Auslastung und die aktuellen Reservierungen im Kalender.</p>
-                            <a class="btn btn-primary w-100" href="{{ url_for('terminplan') }}">Zum Kalender</a>
+                            <a class="btn btn-primary w-100" href="{{ url_for('terminplan', tenant=tenant_id) }}">Zum Kalender</a>
                         </div>
                     </div>
                 </div>
@@ -37,7 +37,7 @@
                             <div class="display-6 mb-3">✍️</div>
                             <h2 class="h4 fw-bold">Neue Planung</h2>
                             <p class="mb-4 text-muted">Erstellen Sie einen neuen Terminplan und verschicken Sie den Buchungslink an Ihre Zielgruppe.</p>
-                            <a class="btn btn-outline-primary w-100" href="{{ url_for('terminplaner.configure') }}">Konfiguration öffnen</a>
+                            <a class="btn btn-outline-primary w-100" href="{{ url_for('terminplaner.configure', tenant=tenant_id) }}">Konfiguration öffnen</a>
                         </div>
                     </div>
                 </div>
@@ -58,6 +58,48 @@
                 <h2 class="h5 fw-bold mb-2">Angemeldet als {{ current_user }}</h2>
                 <p class="mb-0 text-muted">Sie können Termine anlegen, den Kalender prüfen und Buchungslinks verteilen.</p>
             </div>
+
+            <div class="mt-4 p-4 rounded-4 bg-white shadow-sm">
+                <div class="d-flex flex-column flex-md-row justify-content-between align-items-md-center gap-2 mb-3">
+                    <h2 class="h5 fw-bold mb-0">Kommende Termine</h2>
+                    <span class="text-muted small">Alle offenen Terminpläne dieses Nutzers</span>
+                </div>
+
+                {% if upcoming_events %}
+                <div class="vstack gap-3">
+                    {% for event in upcoming_events %}
+                    <div class="border rounded-3 p-3">
+                        <div class="d-flex flex-column flex-lg-row justify-content-between gap-3">
+                            <div>
+                                <div class="fw-semibold">{{ event.date_start }} bis {{ event.date_end }}</div>
+                                <div class="text-muted small">ID: {{ event.appointment_id }}</div>
+                                {% if event.time_span %}
+                                <div class="small mt-1">Zeitfenster: {{ event.time_span|join(' | ') }}</div>
+                                {% endif %}
+                                {% if event.note %}
+                                <div class="small mt-1 text-muted">Notiz: {{ event.note }}</div>
+                                {% endif %}
+                            </div>
+                            <div class="text-lg-end">
+                                <div class="small mb-2">Gebucht: <strong>{{ event.slots_booked }}</strong> / {{ event.slots_total }} | Frei: <strong>{{ event.slots_left }}</strong></div>
+                                <div class="d-flex flex-wrap gap-2 justify-content-lg-end">
+                                    <a class="btn btn-sm btn-primary" href="{{ event.link }}" target="_blank" rel="noopener">Client-Link öffnen</a>
+                                    {% if event.calendar_link %}
+                                    <a class="btn btn-sm btn-outline-primary" href="{{ event.calendar_link }}">.ics</a>
+                                    {% endif %}
+                                    <form method="post" action="{{ url_for('terminplaner.delete_appointment', appointment_id=event.appointment_id, tenant=tenant_id) }}" class="d-inline" onsubmit="return confirm('Diesen Terminplan wirklich löschen?');">
+                                        <button type="submit" class="btn btn-sm btn-outline-danger">Entfernen</button>
+                                    </form>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    {% endfor %}
+                </div>
+                {% else %}
+                <div class="text-muted">Keine kommenden Termine gefunden.</div>
+                {% endif %}
+            </div>
             {% endif %}
         </div>
     </div>

Web/templates/terminplaner_not_found.html

@@ -0,0 +1,28 @@
+{% extends "base.html" %}
+
+{% block title %}Termin nicht gefunden - Inventarsystem{% endblock %}
+
+{% block content %}
+<div class="container py-5">
+    <div class="row justify-content-center">
+        <div class="col-12 col-lg-8 col-xl-7">
+            <div class="card border-0 shadow-lg rounded-4 overflow-hidden">
+                <div class="card-header text-white" style="background: linear-gradient(135deg, #0f4c5c, #16697a);">
+                    <p class="text-uppercase small fw-semibold mb-1 opacity-75">Terminplaner</p>
+                    <h1 class="h3 mb-0 fw-bold">Termin nicht gefunden</h1>
+                </div>
+                <div class="card-body p-4 p-md-5 bg-white text-center">
+                    <div class="display-3 fw-bold text-danger mb-3">404</div>
+                    <p class="lead mb-2">Der angeforderte Termin existiert nicht mehr oder der Link ist ungültig.</p>
+                    <p class="text-muted mb-4">Bitte prüfen Sie den Link erneut oder öffnen Sie den Terminplaner von der Startseite aus.</p>
+
+                    <div class="d-flex flex-column flex-sm-row justify-content-center gap-2">
+                        <a href="{{ url_for('home') }}" class="btn btn-primary btn-lg">Zur Startseite</a>
+                        <a href="javascript:history.back()" class="btn btn-outline-secondary btn-lg">Zurück</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}

Web/templates/upload_admin.html

@@ -876,7 +876,10 @@
                     <button type="button" id="scan-code4-btn" class="fetch-isbn-button">Barcode scannen</button>
                 </div>
                 <small style="display:block; color:#666;">Einzelcode manuell setzen oder per Scanner erfassen.</small>
-                <div id="code4-scanner" style="width:100%; max-width:520px; display:none; margin-top:10px;"></div>
+                <div id="code4-scanner" style="width:100%; max-width:520px; display:none; margin-top:10px;">
+                    <video id="code4-scanner-video" playsinline style="width: 100%; border-radius: 8px;"></video>
+                    <canvas id="code4-scanner-canvas" style="display: none;"></canvas>
+                </div>
                 <small id="code4-scan-status" style="display:block; color:#666; margin-top:6px;"></small>
             </div>
             <div class="form-group">
@@ -907,7 +910,10 @@
                     <button type="button" id="scan-isbn-btn" class="fetch-isbn-button">Barcode scannen</button>
                     <button type="button" class="fetch-isbn-button" onclick="fetchBookInfo('upload')">Bild abrufen</button>
                 </div>
-                <div id="isbn-scanner" style="width:100%; max-width:520px; display:none; margin-top:10px;"></div>
+                <div id="isbn-scanner" style="width:100%; max-width:520px; display:none; margin-top:10px;">
+                    <video id="isbn-scanner-video" playsinline style="width: 100%; border-radius: 8px;"></video>
+                    <canvas id="isbn-scanner-canvas" style="display: none;"></canvas>
+                </div>
                 <small id="isbn-scan-status" style="display:block; color:#666; margin-top:6px;">Scannen oder manuell eingeben. Gültige ISBNs helfen beim Abruf von Buchdaten, andere Codes werden trotzdem akzeptiert.</small>
                 <div id="book-info-container" class="book-info-container"></div>
             </div>
@@ -971,7 +977,8 @@
     }
 </script>
 
-<script src="https://unpkg.com/html5-qrcode@2.0.9/dist/html5-qrcode.min.js"></script>
+<script src="https://unpkg.com/@zxing/library@latest/umd/index.min.js"></script>
+<script src="/static/js/scanner.js"></script>
 <script>
     const libraryModuleEnabled = {{ 'true' if library_module_enabled else 'false' }};
 
@@ -1050,16 +1057,19 @@
 
         // Stop ISBN scanner if currently running to avoid camera conflicts.
         if (isbnScannerRunning && isbnScannerInstance) {
-            isbnScannerInstance.clear().catch(() => {});
+            isbnScannerInstance.stop();
+            isbnScannerInstance = null;
             const isbnScannerBox = document.getElementById('isbn-scanner');
             const isbnScanButton = document.getElementById('scan-isbn-btn');
             if (isbnScannerBox) isbnScannerBox.style.display = 'none';
             if (isbnScanButton) isbnScanButton.textContent = 'ISBN scannen';
             isbnScannerRunning = false;
+            setIsbnScanStatus('Scanner gestoppt.');
         }
 
         if (code4ScannerRunning && code4ScannerInstance) {
-            code4ScannerInstance.clear().catch(() => {});
+            code4ScannerInstance.stop();
+            code4ScannerInstance = null;
             scannerBox.style.display = 'none';
             scanButton.textContent = 'Barcode scannen';
             code4ScannerRunning = false;
@@ -1069,29 +1079,36 @@
 
         scannerBox.style.display = 'block';
         scanButton.textContent = 'Scanner stoppen';
-        code4ScannerInstance = new Html5QrcodeScanner('code4-scanner', { 
-            fps: 10, 
-            qrbox: 250,
-            rememberLastUsedCamera: true
-        });
         code4ScannerRunning = true;
         setCode4ScanStatus('Scanner läuft. Der Scan wird im Basis-Codefeld übernommen.');
 
-        code4ScannerInstance.render((decodedText) => {
-            const scannedCode = String(decodedText || '').trim();
-            if (!scannedCode) return;
+        code4ScannerInstance = new HybridScanner({
+            videoId: 'code4-scanner-video',
+            canvasId: 'code4-scanner-canvas',
+            formats: ['CODE_128', 'CODE_39', 'QR_CODE'],
+            fps: 10,
+            facingMode: 'environment',
+            onSuccess: function(decodedText) {
+                const scannedCode = String(decodedText || '').trim();
+                if (!scannedCode) return;
 
-            const now = Date.now();
-            if (scannedCode === code4LastScanned && (now - code4LastScannedAt) < 1500) {
-                return;
+                const now = Date.now();
+                if (scannedCode === code4LastScanned && (now - code4LastScannedAt) < 1500) {
+                    return;
+                }
+                code4LastScanned = scannedCode;
+                code4LastScannedAt = now;
+
+                codeField.value = scannedCode;
+                validateCodeField(codeField);
+                setCode4ScanStatus(`Code_4 gesetzt: ${scannedCode}`);
+            },
+            onError: function(error) {
+                setCode4ScanStatus(`Fehler: ${error}`, true);
             }
-            code4LastScanned = scannedCode;
-            code4LastScannedAt = now;
+        });
 
-            codeField.value = scannedCode;
-            validateCodeField(codeField);
-            setCode4ScanStatus(`Code_4 gesetzt: ${scannedCode}`);
-        }, () => {});
+        code4ScannerInstance.start();
     }
 
     function startIsbnScanner() {
@@ -1106,7 +1123,8 @@
 
         // Stop Code_4 scanner if currently running to avoid camera conflicts.
         if (code4ScannerRunning && code4ScannerInstance) {
-            code4ScannerInstance.clear().catch(() => {});
+            code4ScannerInstance.stop();
+            code4ScannerInstance = null;
             const codeScannerBox = document.getElementById('code4-scanner');
             const codeScanButton = document.getElementById('scan-code4-btn');
             if (codeScannerBox) codeScannerBox.style.display = 'none';
@@ -1116,7 +1134,8 @@
         }
 
         if (isbnScannerRunning && isbnScannerInstance) {
-            isbnScannerInstance.clear().catch(() => {});
+            isbnScannerInstance.stop();
+            isbnScannerInstance = null;
             scannerBox.style.display = 'none';
             scanButton.textContent = 'ISBN scannen';
             isbnScannerRunning = false;
@@ -1126,15 +1145,16 @@
 
         scannerBox.style.display = 'block';
         scanButton.textContent = 'Scanner stoppen';
-        isbnScannerInstance = new Html5QrcodeScanner('isbn-scanner', {
-            fps: 10,
-            qrbox: 250,
-            rememberLastUsedCamera: true
-        });
         isbnScannerRunning = true;
         setIsbnScanStatus('Scanner läuft. Bitte ISBN-Code erfassen.');
 
-        isbnScannerInstance.render((decodedText) => {
+        isbnScannerInstance = new HybridScanner({
+            videoId: 'isbn-scanner-video',
+            canvasId: 'isbn-scanner-canvas',
+            formats: ['ISBN', 'EAN_13', 'EAN_8', 'QR_CODE'],
+            fps: 10,
+            facingMode: 'environment',
+            onSuccess: function(decodedText) {
             const scannedCode = String(decodedText || '').trim();
             if (!scannedCode) return;
 
@@ -1147,7 +1167,11 @@
                 setIsbnScanStatus('Kein gültiges ISBN-Format erkannt, der gescannte Wert bleibt aber im Feld.', true);
             }
 
-            isbnScannerInstance.clear().catch(() => {});
+            // Stop scanner after successful scan
+            if (isbnScannerInstance) {
+                isbnScannerInstance.stop();
+                isbnScannerInstance = null;
+            }
             scannerBox.style.display = 'none';
             scanButton.textContent = 'ISBN scannen';
             isbnScannerRunning = false;
@@ -1156,7 +1180,13 @@
                 // Automatically load book metadata after a valid ISBN scan.
                 fetchBookInfo('upload');
             }
-        }, () => {});
+            },
+            onError: function(error) {
+                setIsbnScanStatus(`Fehler: ${error}`, true);
+            }
+        });
+
+        isbnScannerInstance.start();
     }
 
     // Load predefined filter values for dropdowns

Web/tenant.py

@@ -473,6 +473,20 @@ class TenantContext:
         if not has_request_context():
             return None
 
+        # Query parameters are useful for public links that must open a specific tenant
+        # even when the host/subdomain cannot be mapped reliably.
+        tenant_from_query = (
+            request.args.get('tenant', '').strip()
+            or request.args.get('tenant_id', '').strip()
+            or request.args.get('tenantId', '').strip()
+        )
+        if tenant_from_query:
+            matched_tenant = _find_registered_tenant_id(tenant_from_query) or tenant_from_query
+            self.tenant_id = matched_tenant
+            self.config = get_tenant_config(matched_tenant)
+            session['tenant_id'] = matched_tenant
+            return self._get_db_name(matched_tenant)
+
         # Priority 1: X-Tenant-ID header (for testing/internal APIs)
         tenant_from_header = request.headers.get('X-Tenant-ID', '').strip()
         if tenant_from_header:
@@ -531,6 +545,10 @@ class TenantContext:
                     potential_subdomain = parts[0]
                     if potential_subdomain not in ('www', 'api', 'admin', 'app', 'mail'):
                         matched_tenant = _find_registered_tenant_id(potential_subdomain)
+                        if not matched_tenant and potential_subdomain.startswith('school'):
+                            matched_tenant = _find_registered_tenant_id('schule' + potential_subdomain[len('school'):])
+                        elif not matched_tenant and potential_subdomain.startswith('schule'):
+                            matched_tenant = _find_registered_tenant_id('school' + potential_subdomain[len('schule'):])
                         if matched_tenant:
                             self.subdomain = potential_subdomain
                             self.tenant_id = matched_tenant

config.json

@@ -53,6 +53,9 @@
         "inventory": {
             "enabled": true
         },
+        "terminplan": {
+            "enabled": true
+        },
         "library": {
             "enabled": true
         },

docker-compose-multitenant.yml

@@ -66,7 +66,7 @@ services:
         PYTHON_VERSION: "3.13"
         OPTIMIZATION_LEVEL: 2
     working_dir: /app/Web
-    command: ["gunicorn", "app:app", "--bind", "0.0.0.0:8000", "--workers", "2", "--timeout", "30", "--graceful-timeout", "20", "--max-requests", "200", "--max-requests-jitter", "50", "--log-level", "info", "--access-logfile", "-", "--error-logfile", "-"]
+    command: ["gunicorn", "app:app", "--bind", "0.0.0.0:8000", "--workers", "2", "--timeout", "30", "--graceful-timeout", "20", "--max-requests", "1000", "--max-requests-jitter", "100", "--log-level", "info", "--access-logfile", "-", "--error-logfile", "-"]
     restart: unless-stopped
     security_opt:
       - no-new-privileges:true

start.sh

@@ -572,7 +572,7 @@ write_runtime_compose_override() {
 services:
   app:
     working_dir: /app/Web
-    command: ["gunicorn", "app:app", "--bind", "0.0.0.0:8000", "--workers", "${INVENTAR_WORKERS:-2}", "--threads", "${INVENTAR_THREADS:-2}", "--timeout", "${INVENTAR_WORKER_TIMEOUT:-30}", "--graceful-timeout", "20", "--worker-connections", "${INVENTAR_WORKER_CONNECTIONS:-100}", "--max-requests", "200", "--max-requests-jitter", "50", "--log-level", "info", "--access-logfile", "-", "--error-logfile", "-"]
+    command: ["gunicorn", "app:app", "--bind", "0.0.0.0:8000", "--workers", "${INVENTAR_WORKERS:-2}", "--threads", "${INVENTAR_THREADS:-2}", "--timeout", "${INVENTAR_WORKER_TIMEOUT:-30}", "--graceful-timeout", "20", "--worker-connections", "${INVENTAR_WORKER_CONNECTIONS:-100}", "--max-requests", "1000", "--max-requests-jitter", "100", "--log-level", "info", "--access-logfile", "-", "--error-logfile", "-"]
     image: ${APP_IMAGE_VALUE}
     build: null
 EOF

tools/debug_get_appointment.py

@@ -0,0 +1,54 @@
+#!/usr/bin/env python3
+"""
+Small debug script to check tenant-aware lookup for an appointment id.
+Usage: ./tools/debug_get_appointment.py <appointment_id> [tenant]
+"""
+import sys
+from bson.objectid import ObjectId
+from Web.modules.database.settings import MongoClient, MONGODB_HOST, MONGODB_PORT, MONGODB_DB
+import Web.modules.database.termine as termine
+
+
+def main():
+    if len(sys.argv) < 2:
+        print("Usage: debug_get_appointment.py <appointment_id> [tenant]")
+        sys.exit(2)
+    aid = sys.argv[1]
+    tenant = sys.argv[2] if len(sys.argv) > 2 else None
+
+    if tenant:
+        print(f"Looking up appointment {aid} for tenant {tenant}")
+    else:
+        print(f"Looking up appointment {aid} for default tenant")
+
+    try:
+        # Use the module helper directly
+        item = termine.get_item(aid)
+        if item:
+            print('Found with termini.get_item:')
+            print(item)
+        else:
+            print('termin.get_item returned None')
+
+        # Try explicit MongoClient + tenant DB resolution
+        client = MongoClient(MONGODB_HOST, MONGODB_PORT)
+        try:
+            from Web.tenant import TenantContext, get_tenant_db
+            if tenant:
+                ctx = TenantContext()
+                ctx.tenant_id = tenant
+                db = ctx.get_database(client)
+            else:
+                db = get_tenant_db(client) if 'get_tenant_db' in dir() else client[MONGODB_DB]
+
+            doc = db['appointments'].find_one({'_id': ObjectId(aid)})
+            print('Direct DB find_one returned:')
+            print(doc)
+        finally:
+            client.close()
+    except Exception as e:
+        print('Error during debug lookup:', e)
+
+
+if __name__ == '__main__':
+    main()