feat(pdf-export): improve table formatting for better readability and adjust column widths

QUICK_START_PDF_EXPORT.md

@@ -49,15 +49,6 @@ Bearbeite `config.json`:
 
 Falls nicht konfiguriert, werden Platzhalter verwendet.
 
-Alternativ können Sie die Schulinformationen tenant-spezifisch mit dem Manage-Skript setzen:
-
-```bash
-# Beispiel: Schulinformationen für Tenant 'school_a' setzen
-./manage-tenant.sh school school_a name="Grundschule Albert-Schweitzer-Straße" address="Albert-Schweitzer-Straße 1" postal_code=12345 city="Musterstadt" school_number=042123 it_admin="Max Mustermann"
-```
-
-Hinweis: `manage-tenant.sh school` schreibt die Daten unter `tenants.<tenant_id>.school` in `config.json` und löst bei aktiver App-Container-Instanz einen Neustart aus, damit die Änderungen wirksam werden.
-
 ### Schritt 2: System starten
 
 ```bash

Web/app.py

@@ -610,7 +610,9 @@ def _get_school_info_for_export():
     Returns default info if not configured.
     """
     try:
-        # Try to load from settings or config
+        if hasattr(cfg, 'get_school_info'):
+            return cfg.get_school_info()
+
         school_info = {
             'name': 'Schulname',
             'address': 'Schuladresse',
@@ -618,19 +620,8 @@ def _get_school_info_for_export():
             'city': 'Stadt',
             'school_number': '000000',
             'it_admin': 'IT-Beauftragter/in',
+            'logo_path': '',
         }
-        
-        # Try to load from config.json if available
-        config_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'config.json')
-        if os.path.exists(config_path):
-            try:
-                with open(config_path, 'r') as f:
-                    config = json.load(f)
-                    if 'school' in config:
-                        school_info.update(config.get('school', {}))
-            except Exception:
-                pass
-        
         return school_info
     except Exception:
         # Return defaults if anything fails
@@ -641,9 +632,55 @@ def _get_school_info_for_export():
             'city': 'Stadt',
             'school_number': '000000',
             'it_admin': 'IT-Beauftragter/in',
+            'logo_path': '',
         }
 
 
+def _save_school_logo_upload(upload_file, tenant_id=None, tenant_db=None):
+    """Save an uploaded school logo to the shared upload folder with a tenant-specific filename."""
+    if not upload_file or not getattr(upload_file, 'filename', ''):
+        return None
+
+    is_allowed, error_message = allowed_file(upload_file.filename, upload_file, max_size_mb=cfg.IMAGE_MAX_UPLOAD_MB)
+    if not is_allowed:
+        raise ValueError(error_message)
+
+    safe_tenant = re.sub(r'[^a-zA-Z0-9_\-]+', '_', str(tenant_id or tenant_db or 'default').strip())
+    safe_tenant = safe_tenant.strip('_') or 'default'
+    _, original_ext = os.path.splitext(secure_filename(upload_file.filename))
+    extension = (original_ext or '').lower()
+    if not extension:
+        raise ValueError('Das Logo benötigt eine Dateiendung.')
+
+    logo_filename = f'school-logo-{safe_tenant}{extension}'
+    logo_path = os.path.join(app.config['UPLOAD_FOLDER'], logo_filename)
+
+    os.makedirs(app.config['UPLOAD_FOLDER'], exist_ok=True)
+    upload_file.save(logo_path)
+
+    # Generate a thumbnail for consistent navbar sizing
+    try:
+        thumb_filename = f'school-logo-{safe_tenant}-thumb.png'
+        thumb_path = os.path.join(app.config['UPLOAD_FOLDER'], thumb_filename)
+
+        with Image.open(logo_path) as img:
+            # Ensure RGBA for transparency and convert if needed
+            if img.mode not in ('RGBA', 'RGB'):
+                img = img.convert('RGBA')
+
+            # Target max size: width up to 520px, height up to 114px (matches CSS constraints)
+            max_thumb_size = (520, 114)
+            img.thumbnail(max_thumb_size, Image.LANCZOS)
+
+            # Save as PNG for predictable rendering in web UI
+            img.save(thumb_path, format='PNG', optimize=True)
+    except Exception as e:
+        app.logger.warning(f"Thumbnail generation failed for {logo_path}: {e}")
+        thumb_filename = None
+
+    return (logo_filename, thumb_filename)
+
+
 def _parse_money_value(value):
     """Parse a user-facing money value into a float when possible."""
     if value is None:
@@ -1215,6 +1252,7 @@ def inject_version():
         'current_permissions': current_permissions,
         'current_tenant_db': current_tenant_db,
         'current_tenant_id': current_tenant_id,
+        'school_info': _get_school_info_for_export(),
         'permission_action_options': PERMISSION_ACTION_OPTIONS,
         'permission_page_options': PERMISSION_PAGE_OPTIONS,
         'permission_presets': us.get_permission_preset_definitions(),
@@ -2886,7 +2924,8 @@ def home_admin():
         library_module_enabled=cfg.LIBRARY_MODULE_ENABLED,
         student_cards_module_enabled=cfg.STUDENT_CARDS_MODULE_ENABLED,
         student_default_borrow_days=cfg.STUDENT_DEFAULT_BORROW_DAYS,
-        student_max_borrow_days=cfg.STUDENT_MAX_BORROW_DAYS
+        student_max_borrow_days=cfg.STUDENT_MAX_BORROW_DAYS,
+        school_info=_get_school_info_for_export(),
     )
 
 
@@ -9859,6 +9898,115 @@ def manage_locations():
         student_cards_module_enabled=cfg.STUDENT_CARDS_MODULE_ENABLED
     )
 
+
+@app.route('/admin/school-settings', methods=['GET', 'POST'])
+def admin_school_settings():
+    """Admin page for configuring school metadata used in exports."""
+    if 'username' not in session:
+        flash('Bitte melden Sie sich mit einem administrativen Konto an.', 'error')
+        return redirect(url_for('login'))
+    if not us.check_admin(session['username']):
+        flash('Für diese Seite sind Administratorrechte erforderlich.', 'error')
+        return redirect(url_for('login'))
+
+    permissions = _get_current_user_permissions()
+    if not _action_access_allowed(permissions, 'can_manage_settings'):
+        flash('Sie haben keine Berechtigung, die Schulstammdaten zu ändern.', 'error')
+        return redirect(url_for('home_admin'))
+
+    current_school = _get_school_info_for_export()
+    tenant_context = None
+    tenant_id = None
+    tenant_db = cfg.MONGODB_DB
+    try:
+        tenant_context = get_tenant_context()
+    except Exception:
+        tenant_context = None
+    if tenant_context:
+        tenant_id = tenant_context.tenant_id
+        tenant_db = tenant_context.db_name or tenant_db
+
+    if request.method == 'POST':
+        school_info = {
+            'name': sanitize_form_value(request.form.get('name')),
+            'address': sanitize_form_value(request.form.get('address')),
+            'postal_code': sanitize_form_value(request.form.get('postal_code')),
+            'city': sanitize_form_value(request.form.get('city')),
+            'school_number': sanitize_form_value(request.form.get('school_number')),
+            'it_admin': sanitize_form_value(request.form.get('it_admin')),
+            'logo_path': sanitize_form_value(request.form.get('logo_path')),
+            'logo_thumb': sanitize_form_value(request.form.get('logo_thumb')),
+        }
+
+        uploaded_logo = request.files.get('logo_upload')
+        if uploaded_logo and getattr(uploaded_logo, 'filename', ''):
+            try:
+                previous_logo_path = current_school.get('logo_path') if isinstance(current_school, dict) else ''
+                previous_thumb_path = current_school.get('logo_thumb') if isinstance(current_school, dict) else ''
+                saved = _save_school_logo_upload(uploaded_logo, tenant_id=tenant_id, tenant_db=tenant_db)
+                if isinstance(saved, (list, tuple)):
+                    saved_logo_filename, saved_thumb_filename = saved
+                else:
+                    saved_logo_filename, saved_thumb_filename = saved, None
+
+                if saved_logo_filename:
+                    school_info['logo_path'] = saved_logo_filename
+                    school_info['logo_thumb'] = saved_thumb_filename or ''
+
+                    # remove previous files if different
+                    if previous_logo_path and previous_logo_path != saved_logo_filename:
+                        previous_logo_file = os.path.join(app.config['UPLOAD_FOLDER'], previous_logo_path)
+                        if os.path.exists(previous_logo_file):
+                            try:
+                                os.remove(previous_logo_file)
+                            except Exception:
+                                pass
+                    if previous_thumb_path and previous_thumb_path != saved_thumb_filename:
+                        previous_thumb_file = os.path.join(app.config['UPLOAD_FOLDER'], previous_thumb_path)
+                        if os.path.exists(previous_thumb_file):
+                            try:
+                                os.remove(previous_thumb_file)
+                            except Exception:
+                                pass
+            except Exception as exc:
+                flash(f'Logo konnte nicht hochgeladen werden: {exc}', 'error')
+                return redirect(url_for('admin_school_settings'))
+
+        if not school_info.get('logo_path') and current_school.get('logo_path'):
+            school_info['logo_path'] = current_school.get('logo_path', '')
+        if not school_info.get('logo_thumb') and current_school.get('logo_thumb'):
+            school_info['logo_thumb'] = current_school.get('logo_thumb', '')
+
+        missing_fields = [
+            label for label, key in [
+                ('Schulname', 'name'),
+                ('Adresse', 'address'),
+                ('PLZ', 'postal_code'),
+                ('Ort', 'city'),
+                ('Schulnummer', 'school_number'),
+            ] if not school_info.get(key)
+        ]
+
+        if missing_fields:
+            flash(f'Bitte füllen Sie die Pflichtfelder aus: {", ".join(missing_fields)}.', 'error')
+        else:
+            try:
+                updated_school = cfg.update_school_info(school_info)
+                current_school = updated_school
+                flash('Schulstammdaten wurden erfolgreich gespeichert.', 'success')
+            except Exception as exc:
+                app.logger.error(f'Could not update school settings: {exc}\n{traceback.format_exc()}')
+                flash('Die Schulstammdaten konnten nicht gespeichert werden.', 'error')
+
+    return render_template(
+        'admin_school_settings.html',
+        school_info=current_school,
+        tenant_id=tenant_id,
+        tenant_db=tenant_db,
+        library_module_enabled=cfg.LIBRARY_MODULE_ENABLED,
+        student_cards_module_enabled=cfg.STUDENT_CARDS_MODULE_ENABLED,
+    )
+
 @app.route('/check_code_unique/<code>')
 def check_code_unique(code):
     """

Web/pdf_audit_export.py

@@ -7,6 +7,7 @@ PDF/A archiving standards for German schools and educational authorities.
 import io
 import json
 import datetime
+import os
 import qrcode
 from reportlab.lib.pagesizes import A4
 from reportlab.lib.styles import getSampleStyleSheet, ParagraphStyle
@@ -109,6 +110,20 @@ class DIN5008AuditPDF:
             fontName='Helvetica',
             textColor=HexColor('#000000'),
         )
+
+        logo_path = self.school_info.get('logo_path', '')
+        resolved_logo_path = None
+        if logo_path:
+            candidate_paths = [
+                logo_path,
+                os.path.join(cfg.UPLOAD_FOLDER, logo_path),
+                os.path.join('/opt/Inventarsystem/Web/uploads', logo_path),
+                os.path.join('/var/Inventarsystem/Web/uploads', logo_path),
+            ]
+            for candidate_path in candidate_paths:
+                if candidate_path and os.path.exists(candidate_path):
+                    resolved_logo_path = candidate_path
+                    break
         
         school_info_text = f"""
         <b>{school_name}</b><br/>
@@ -116,8 +131,28 @@ class DIN5008AuditPDF:
         {postal_code} {city}<br/>
         <i>Schulnummer: {school_number}</i>
         """
-        
-        story.append(Paragraph(school_info_text, header_style))
+
+        if resolved_logo_path:
+            logo_image = Image(resolved_logo_path)
+            try:
+                logo_image._restrictSize(3.4 * cm, 3.4 * cm)
+            except Exception:
+                pass
+
+            school_table = Table(
+                [[logo_image, Paragraph(school_info_text, header_style)]],
+                colWidths=[3.8 * cm, self.USABLE_WIDTH - 3.8 * cm],
+            )
+            school_table.setStyle(TableStyle([
+                ('VALIGN', (0, 0), (-1, -1), 'MIDDLE'),
+                ('LEFTPADDING', (0, 0), (-1, -1), 0),
+                ('RIGHTPADDING', (0, 0), (-1, -1), 0),
+                ('TOPPADDING', (0, 0), (-1, -1), 0),
+                ('BOTTOMPADDING', (0, 0), (-1, -1), 0),
+            ]))
+            story.append(school_table)
+        else:
+            story.append(Paragraph(school_info_text, header_style))
         
         # Information block (right side simulation)
         story.append(Spacer(1, 0.3 * cm))
@@ -250,66 +285,147 @@ class DIN5008AuditPDF:
                                  spaceAfter=8,
                              )))
         
+        # Build table data with wrapped cells for better readability on A4 pages
+        cell_style = ParagraphStyle(
+            'EventCell',
+            parent=styles['Normal'],
+            fontName='Helvetica',
+            fontSize=8,
+            leading=9.5,
+            textColor=HexColor('#1f2937'),
+            alignment=TA_LEFT,
+        )
+        hash_style = ParagraphStyle(
+            'EventHashCell',
+            parent=cell_style,
+            fontName='Courier',
+            fontSize=7.2,
+            leading=9,
+            wordWrap='CJK',
+        )
+
+        def _safe(value):
+            return str(value or '').replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;')
+
+        def _fmt_ts(value):
+            text = _safe(value)
+            if len(text) >= 19 and text[4] == '-' and text[7] == '-':
+                # Convert 2026-05-10 16:19:07... -> 10.05.2026 16:19
+                return f"{text[8:10]}.{text[5:7]}.{text[0:4]} {text[11:16]}"
+            return text[:16]
+
+        def _fmt_event(value):
+            text = _safe(value).replace('_', ' ').strip()
+            return text[:60]
+
+        def _chunk_text(value, chunk=4, sep=' '):
+            text = _safe(value)
+            if not text:
+                return ''
+            return sep.join(text[i:i + chunk] for i in range(0, len(text), chunk))
+
+        def _fmt_ip(value):
+            text = _safe(value)
+            # Keep IPv4 intact. For long IPv6 values insert only one line break in the middle.
+            if ':' in text and len(text) > 24:
+                parts = text.split(':')
+                if len(parts) > 4:
+                    return ':'.join(parts[:4]) + ':<br/>' + ':'.join(parts[4:])
+            return text
+
         # Build table data
         if self.export_type == 'quick':
             # Quick-Check: Minimal columns
             table_data = [
-                ['Index', 'Zeit', 'Ereignis', 'Benutzer', 'Hashwert (gekürzt)'],
+                ['Idx', 'Zeit', 'Ereignis', 'Benutzer', 'Hash (gekürzt)'],
             ]
             
             for row in audit_rows[:20]:  # Limit to 20 rows for quick check
-                chain_idx = str(row.get('chain_index', ''))
-                timestamp = str(row.get('timestamp') or row.get('created_at', ''))[:16]
-                event_type = str(row.get('event_type', ''))
-                actor = str(row.get('actor', ''))
-                entry_hash = str(row.get('entry_hash', ''))[:12] + '...'
+                chain_idx = _safe(row.get('chain_index', ''))
+                timestamp = _fmt_ts(row.get('timestamp') or row.get('created_at', ''))
+                event_type = _fmt_event(row.get('event_type', ''))
+                actor = _safe(row.get('actor', ''))
+                entry_hash = _chunk_text(_safe(row.get('entry_hash', ''))[:20], chunk=4)
+                if entry_hash:
+                    entry_hash += ' ...'
                 
-                table_data.append([chain_idx, timestamp, event_type, actor, entry_hash])
+                table_data.append([
+                    Paragraph(chain_idx, cell_style),
+                    Paragraph(timestamp, cell_style),
+                    Paragraph(event_type, cell_style),
+                    Paragraph(actor, cell_style),
+                    Paragraph(entry_hash, hash_style),
+                ])
             
-            colWidths = [1.2*cm, 1.8*cm, 2.2*cm, 2*cm, 3.8*cm]
+            colWidths = [1.1*cm, 2.7*cm, 4.8*cm, 3.1*cm, 4.9*cm]
         else:
             # Official Report: Full columns
             table_data = [
-                ['Idx', 'Zeitstempel', 'Ereignistyp', 'Benutzer', 'Quelle', 'IP-Adresse', 'Hashwert'],
+                ['Idx', 'Zeit', 'Ereignis', 'Benutzer', 'Quelle', 'IP', 'Hash'],
             ]
             
             for row in audit_rows:
-                chain_idx = str(row.get('chain_index', ''))
-                timestamp = str(row.get('timestamp') or row.get('created_at', ''))[:19]
-                event_type = str(row.get('event_type', ''))
-                actor = str(row.get('actor', ''))
-                source = str(row.get('source', 'System'))[:15]
-                ip = str(row.get('ip', ''))
-                entry_hash = str(row.get('entry_hash', ''))[:16]
+                chain_idx = _safe(row.get('chain_index', ''))
+                timestamp = _fmt_ts(row.get('timestamp') or row.get('created_at', ''))
+                event_type = _fmt_event(row.get('event_type', ''))
+                actor = _safe(row.get('actor', ''))
+                source = _safe(row.get('source', 'System'))
+                ip = _fmt_ip(row.get('ip', ''))
+                entry_hash = _chunk_text(_safe(row.get('entry_hash', ''))[:40], chunk=8)
                 
-                table_data.append([chain_idx, timestamp, event_type, actor, source, ip, entry_hash])
+                table_data.append([
+                    Paragraph(chain_idx, cell_style),
+                    Paragraph(timestamp, cell_style),
+                    Paragraph(event_type, cell_style),
+                    Paragraph(actor, cell_style),
+                    Paragraph(source, cell_style),
+                    Paragraph(ip, cell_style),
+                    Paragraph(entry_hash, hash_style),
+                ])
             
-            colWidths = [0.8*cm, 1.8*cm, 1.5*cm, 1.5*cm, 1.2*cm, 1.5*cm, 2.2*cm]
+            # Give IP and hash columns significantly more room for readability.
+            colWidths = [0.9*cm, 2.4*cm, 2.8*cm, 2.0*cm, 1.4*cm, 3.3*cm, 4.2*cm]
         
         # Create table
-        events_table = Table(table_data, colWidths=colWidths)
+        events_table = Table(table_data, colWidths=colWidths, repeatRows=1)
         events_table.setStyle(TableStyle([
             # Header styling
             ('BACKGROUND', (0, 0), (-1, 0), HexColor('#2c3e50')),
             ('TEXTCOLOR', (0, 0), (-1, 0), HexColor('#ffffff')),
             ('ALIGN', (0, 0), (-1, 0), 'CENTER'),
             ('FONTNAME', (0, 0), (-1, 0), 'Helvetica-Bold'),
-            ('FONTSIZE', (0, 0), (-1, 0), 8),
+            ('FONTSIZE', (0, 0), (-1, 0), 8.5),
+            ('TOPPADDING', (0, 0), (-1, 0), 6),
             ('BOTTOMPADDING', (0, 0), (-1, 0), 6),
             
             # Body styling
-            ('FONTSIZE', (0, 1), (-1, -1), 7),
+            ('FONTSIZE', (0, 1), (-1, -1), 8),
             ('ALIGN', (0, 0), (-1, -1), 'LEFT'),
             ('VALIGN', (0, 0), (-1, -1), 'TOP'),
             ('GRID', (0, 0), (-1, -1), 0.5, HexColor('#bdc3c7')),
             ('ROWBACKGROUNDS', (0, 1), (-1, -1), [HexColor('#ecf0f1'), HexColor('#ffffff')]),
-            ('TOPPADDING', (0, 1), (-1, -1), 4),
-            ('BOTTOMPADDING', (0, 1), (-1, -1), 4),
-            ('LEFTPADDING', (0, 1), (-1, -1), 3),
-            ('RIGHTPADDING', (0, 1), (-1, -1), 3),
+            ('TOPPADDING', (0, 1), (-1, -1), 5),
+            ('BOTTOMPADDING', (0, 1), (-1, -1), 5),
+            ('LEFTPADDING', (0, 1), (-1, -1), 4),
+            ('RIGHTPADDING', (0, 1), (-1, -1), 4),
+            ('ALIGN', (0, 1), (0, -1), 'CENTER'),
+            ('ALIGN', (1, 1), (1, -1), 'CENTER'),
+            ('ALIGN', (-1, 1), (-1, -1), 'LEFT'),
         ]))
         
         story.append(events_table)
+        story.append(Paragraph(
+            "Hinweis: Zeitangaben sind auf Minuten gerundet; Hashwerte werden aus Platzgründen gekürzt dargestellt.",
+            ParagraphStyle(
+                'TableHint',
+                parent=styles['Normal'],
+                fontSize=7.5,
+                leading=9,
+                textColor=HexColor('#6b7280'),
+                alignment=TA_LEFT,
+                spaceBefore=4,
+            )
+        ))
         story.append(Spacer(1, 0.2 * cm))
     
     def _add_mismatches(self, story, mismatches):

Web/settings.py

@@ -61,6 +61,17 @@ DEFAULTS = {
         'logs': os.path.join(os.path.dirname(os.path.dirname(BASE_DIR)), 'logs'),
         'deleted_archives': os.path.join(os.path.dirname(os.path.dirname(BASE_DIR)), 'deleted_archives'),
     },
+    'school': {
+        'name': 'Schulname',
+        'address': 'Schulstraße 1',
+        'postal_code': '00000',
+        'city': 'Ort',
+        'school_number': '000000',
+        'it_admin': 'IT-Beauftragte oder IT-Beauftragter',
+        'logo_path': '',
+        'logo_thumb': '',
+        'logo_thumb': '',
+    },
     'schoolPeriods': {
         "1": {"start": "08:00", "end": "08:45", "label": "1. Stunde (08:00 - 08:45)"},
         "2": {"start": "08:45", "end": "09:30", "label": "2. Stunde (08:45 - 09:30)"},
@@ -163,6 +174,7 @@ SSL_KEY = _get(_conf, ['ssl', 'key'], DEFAULTS['ssl']['key'])
 
 # School periods
 SCHOOL_PERIODS = _get(_conf, ['schoolPeriods'], DEFAULTS['schoolPeriods'])
+SCHOOL_INFO_DEFAULT = _get(_conf, ['school'], DEFAULTS['school'])
 
 # Optional feature modules
 TENANT_CONFIGS = _get(_conf, ['tenants'], {})
@@ -348,3 +360,65 @@ def MongoClient(*args, **kwargs):
         cached_client = _MongoClientProxy(client)
         _MONGO_CLIENT_CACHE[cache_key] = cached_client
         return cached_client
+
+
+def get_school_info():
+    """Return the tenant-scoped school metadata used for PDFs and admin views."""
+    school_info = dict(SCHOOL_INFO_DEFAULT)
+    client = None
+    try:
+        client = MongoClient(MONGODB_HOST, MONGODB_PORT)
+        db = client[MONGODB_DB]
+        if 'settings' not in db.list_collection_names():
+            return school_info
+
+        settings_collection = db['settings']
+        settings_document = settings_collection.find_one({'setting_type': 'school_info'})
+        if not settings_document:
+            return school_info
+
+        configured_school = settings_document.get('school', {})
+        if isinstance(configured_school, dict):
+            for key, value in configured_school.items():
+                if value is not None:
+                    school_info[key] = value
+        return school_info
+    except Exception:
+        return school_info
+    finally:
+        if client:
+            client.close()
+
+
+def update_school_info(school_info):
+    """Persist tenant-scoped school metadata into MongoDB and refresh the in-memory cache."""
+    if not isinstance(school_info, dict):
+        raise TypeError('school_info must be a dict')
+
+    updated_school = dict(SCHOOL_INFO_DEFAULT)
+    for key in updated_school.keys():
+        value = school_info.get(key, updated_school[key])
+        if value is None:
+            value = ''
+        updated_school[key] = str(value).strip()
+
+    client = None
+    try:
+        client = MongoClient(MONGODB_HOST, MONGODB_PORT)
+        db = client[MONGODB_DB]
+        settings_collection = db['settings']
+        settings_collection.update_one(
+            {'setting_type': 'school_info'},
+            {
+                '$set': {
+                    'setting_type': 'school_info',
+                    'school': updated_school,
+                }
+            },
+            upsert=True,
+        )
+    finally:
+        if client:
+            client.close()
+
+    return dict(updated_school)

Web/templates/admin_school_settings.html

@@ -0,0 +1,268 @@
+<!--
+   Copyright 2025-2026 AIIrondev
+
+   Licensed under the Inventarsystem EULA (Endbenutzer-Lizenzvertrag).
+   See Legal/LICENSE for the full license text.
+   Unauthorized commercial use, SaaS hosting, or removal of branding is prohibited.
+   For commercial licensing inquiries: https://github.com/AIIrondev
+-->
+{% extends "base.html" %}
+
+{% block title %}Schulstammdaten verwalten{% endblock %}
+
+{% block content %}
+<div class="container">
+    <div class="page-header">
+        <h1>Schulstammdaten verwalten</h1>
+        <p>Diese Angaben werden für amtliche Exporte, PDF-Berichte und die Zuordnung in Behörden verwendet.</p>
+    </div>
+
+    <div class="notice-card">
+        <strong>Hinweis:</strong> Die hier gespeicherten Daten werden tenantweise in der MongoDB gespeichert und sofort für die PDF-Exporte verwendet.
+    </div>
+
+    <div class="notice-card" style="background:#f8fafc; border-color:#dbe3ee; color:#334155;">
+        <strong>Aktueller Kontext:</strong>
+        Tenant {{ tenant_id or 'default' }} · Datenbank {{ tenant_db or 'Inventarsystem' }}
+    </div>
+
+    <div class="settings-grid">
+        <div class="card settings-card">
+            <div class="card-header">
+                <h2>Schuldaten</h2>
+            </div>
+            <div class="card-body">
+                <form method="POST" action="{{ url_for('admin_school_settings') }}" enctype="multipart/form-data">
+                    <div class="form-row">
+                        <div class="form-group">
+                            <label for="name">Schulname *</label>
+                            <input type="text" id="name" name="name" value="{{ school_info.name or '' }}" required placeholder="Grundschule Beispielstadt">
+                        </div>
+                        <div class="form-group">
+                            <label for="school_number">Schulnummer *</label>
+                            <input type="text" id="school_number" name="school_number" value="{{ school_info.school_number or '' }}" required placeholder="042123">
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="address">Adresse *</label>
+                        <input type="text" id="address" name="address" value="{{ school_info.address or '' }}" required placeholder="Musterstraße 12">
+                    </div>
+
+                    <div class="form-row">
+                        <div class="form-group">
+                            <label for="postal_code">PLZ *</label>
+                            <input type="text" id="postal_code" name="postal_code" value="{{ school_info.postal_code or '' }}" required placeholder="12345">
+                        </div>
+                        <div class="form-group">
+                            <label for="city">Ort *</label>
+                            <input type="text" id="city" name="city" value="{{ school_info.city or '' }}" required placeholder="Musterstadt">
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="it_admin">Verantwortliche Person</label>
+                        <input type="text" id="it_admin" name="it_admin" value="{{ school_info.it_admin or '' }}" placeholder="IT-Beauftragte/r, Sekretariat oder Schulleitung">
+                    </div>
+
+                    <div class="form-group">
+                        <label for="logo_upload">Schullogo hochladen</label>
+                        <input type="file" id="logo_upload" name="logo_upload" accept=".png,.jpg,.jpeg,.gif,.webp,.svg,image/*">
+                        <small>Upload ersetzt das bisherige Logo. Wenn kein neues Logo gewählt wird, bleibt das aktuelle erhalten.</small>
+                    </div>
+
+                    <div class="actions-row">
+                        <button type="submit" class="btn btn-primary">Schulstammdaten speichern</button>
+                        <a href="{{ url_for('home_admin') }}" class="btn btn-secondary">Zurück zur Admin-Übersicht</a>
+                    </div>
+                </form>
+            </div>
+        </div>
+
+        <div class="card preview-card">
+            <div class="card-header">
+                <h2>Aktuelle Vorschau</h2>
+            </div>
+            <div class="card-body">
+                {% if school_info.logo_path %}
+                <div style="margin-bottom:16px; padding:12px; border:1px solid #e5e7eb; border-radius:10px; background:#fff;">
+                    <div style="font-weight:700; margin-bottom:8px; color:#374151;">Aktuelles Logo</div>
+                    <img src="{{ url_for('uploaded_file', filename=school_info.logo_path) }}" alt="Aktuelles Schullogo" style="max-width:100%; max-height:180px; object-fit:contain; display:block;">
+                    <div style="margin-top:8px; font-size:0.85rem; color:#6b7280; word-break:break-word;">{{ school_info.logo_path }}</div>
+                </div>
+                {% endif %}
+                <p><strong>Schulname:</strong> {{ school_info.name or 'Nicht gesetzt' }}</p>
+                <p><strong>Adresse:</strong> {{ school_info.address or 'Nicht gesetzt' }}</p>
+                <p><strong>Schulnummer:</strong> {{ school_info.school_number or 'Nicht gesetzt' }}</p>
+                <p><strong>Ort:</strong> {{ school_info.postal_code or '' }} {{ school_info.city or '' }}</p>
+                <p><strong>Verantwortliche Person:</strong> {{ school_info.it_admin or 'Nicht gesetzt' }}</p>
+                <p><strong>Logo:</strong> {{ school_info.logo_path or 'Nicht gesetzt' }}</p>
+                <hr>
+                <p>Diese Angaben erscheinen künftig im amtlichen Audit-PDF und in anderen Behördenberichten.</p>
+            </div>
+        </div>
+    </div>
+</div>
+
+<style>
+    .container {
+        max-width: 1100px;
+        margin: 0 auto;
+        padding: 20px;
+    }
+
+    .page-header {
+        text-align: center;
+        margin-bottom: 18px;
+    }
+
+    .page-header h1 {
+        margin-bottom: 8px;
+        color: #1f2937;
+    }
+
+    .page-header p {
+        color: #4b5563;
+        margin: 0;
+    }
+
+    .notice-card {
+        background: #eff6ff;
+        border: 1px solid #bfdbfe;
+        color: #1d4ed8;
+        border-radius: 10px;
+        padding: 14px 16px;
+        margin-bottom: 18px;
+    }
+
+    .settings-grid {
+        display: grid;
+        grid-template-columns: 1.4fr 0.9fr;
+        gap: 18px;
+        align-items: start;
+    }
+
+    .card {
+        background: var(--ui-surface);
+        border: 1px solid #e5e7eb;
+        border-radius: 12px;
+        overflow: hidden;
+        box-shadow: 0 6px 20px rgba(15, 23, 42, 0.06);
+    }
+
+    .card-header {
+        background: var(--ui-surface-soft);
+        padding: 16px 18px;
+        border-bottom: 1px solid #e5e7eb;
+    }
+
+    .card-header h2 {
+        margin: 0;
+        font-size: 1.1rem;
+        color: #111827;
+    }
+
+    .card-body {
+        padding: 18px;
+    }
+
+    .form-row {
+        display: grid;
+        grid-template-columns: 1fr 1fr;
+        gap: 14px;
+    }
+
+    .form-group {
+        margin-bottom: 14px;
+    }
+
+    .form-group label {
+        display: block;
+        font-weight: 700;
+        margin-bottom: 6px;
+        color: #374151;
+    }
+
+    .form-group input {
+        width: 100%;
+        padding: 11px 12px;
+        border: 1px solid #cbd5e1;
+        border-radius: 8px;
+        background: #fff;
+        color: #111827;
+        font-size: 1rem;
+    }
+
+    .form-group input:focus {
+        outline: none;
+        border-color: #2563eb;
+        box-shadow: 0 0 0 3px rgba(37, 99, 235, 0.12);
+    }
+
+    .form-group small {
+        display: block;
+        margin-top: 6px;
+        color: #6b7280;
+        line-height: 1.35;
+    }
+
+    .actions-row {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 10px;
+        margin-top: 18px;
+    }
+
+    .btn {
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        gap: 6px;
+        padding: 10px 16px;
+        border-radius: 8px;
+        font-weight: 700;
+        text-decoration: none;
+        border: 1px solid transparent;
+        cursor: pointer;
+    }
+
+    .btn-primary {
+        background: #2563eb;
+        color: #fff;
+    }
+
+    .btn-primary:hover {
+        background: #1d4ed8;
+        color: #fff;
+    }
+
+    .btn-secondary {
+        background: #f3f4f6;
+        color: #111827;
+        border-color: #d1d5db;
+    }
+
+    .btn-secondary:hover {
+        background: #e5e7eb;
+        color: #111827;
+    }
+
+    .preview-card p {
+        margin: 0 0 10px;
+        line-height: 1.45;
+    }
+
+    .preview-card hr {
+        border: 0;
+        border-top: 1px solid #e5e7eb;
+        margin: 16px 0;
+    }
+
+    @media (max-width: 900px) {
+        .settings-grid,
+        .form-row {
+            grid-template-columns: 1fr;
+        }
+    }
+</style>
+{% endblock %}

Web/templates/base.html

@@ -1127,6 +1127,7 @@
                                 {% if current_permissions.pages.get('manage_locations', True) %}
                                 <li><a class="dropdown-item" href="{{ url_for('manage_locations') }}">Orte verwalten</a></li>
                                 {% endif %}
+                                <li><a class="dropdown-item" href="{{ url_for('admin_school_settings') }}">Schulstammdaten</a></li>
                                 {% if current_permissions.pages.get('admin_borrowings', True) %}
                                 <li><a class="dropdown-item" href="{{ url_for('admin_borrowings') }}">Ausleihen</a></li>
                                 {% endif %}
@@ -1252,6 +1253,7 @@
                                 {% if student_cards_module_enabled %}
                                 <li><a class="dropdown-item" href="{{ url_for('student_cards_admin') }}">Bibliotheksausweis</a></li>
                                 {% endif %}
+                                <li><a class="dropdown-item" href="{{ url_for('admin_school_settings') }}">Schulstammdaten</a></li>
                                 <li><hr class="dropdown-divider"></li>
                                 {% if current_permissions.actions.get('can_manage_users', True) %}
                                 <li><h6 class="dropdown-header">System</h6></li>
@@ -1311,9 +1313,19 @@
     {% 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') }}">
-                <img src="{{ url_for('static', filename='img/invario-logo.png') }}" alt="Invario" class="invario-logo">
-            </a>
+                    <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>
@@ -1519,6 +1531,7 @@
         <option value="Defekte Items"></option>
         <option value="Filter verwalten"></option>
         <option value="Orte verwalten"></option>
+        <option value="Schulstammdaten"></option>
         <option value="Audit Dashboard"></option>
         <option value="Logs"></option>
         <option value="Benutzer verwalten"></option>
@@ -1588,6 +1601,7 @@
                 { label: 'Defekte Items', keywords: ['defekte items', 'defekt', 'schaden'], url: {{ url_for('admin_damaged_items')|tojson }} },
                 { label: 'Filter verwalten', keywords: ['filter verwalten', 'filter'], url: {{ url_for('manage_filters')|tojson }} },
                 { label: 'Orte verwalten', keywords: ['orte verwalten', 'orte', 'location'], url: {{ url_for('manage_locations')|tojson }} },
+                { label: 'Schulstammdaten', keywords: ['schule', 'settings', 'stammdaten', 'school settings'], url: {{ url_for('admin_school_settings')|tojson }} },
                 { label: 'Audit Dashboard', keywords: ['audit', 'audit dashboard'], url: {{ url_for('admin_audit_dashboard')|tojson }} },
                 { label: 'Logs', keywords: ['logs', 'protokoll'], url: {{ url_for('logs')|tojson }} },
                 { label: 'Benutzer verwalten', keywords: ['benutzer verwalten', 'user'], url: {{ url_for('user_del')|tojson }} },

manage-tenant.sh

@@ -21,7 +21,6 @@ show_help() {
     echo "  restart-all                  Restart all application containers (zero-downtime reload)"
     echo "  list                         List active tenants"
     echo "  module <tenant_id> <module>=<on|off>... Enable/disable modules for a tenant"
-    echo "  school <tenant_id> [key]=[value]...  Set school configuration for tenant (name,address,postal_code,city,school_number,it_admin)"
     echo "  -h, --help                   Show this help message"
     echo ""
     echo "Examples:"
@@ -566,62 +565,6 @@ PY
         fi
         ;;
 
-    school)
-        # Usage: manage-tenant.sh school <tenant_id> key=value [...]
-        if [ -z "$TENANT_ID" ] || [ -z "${3:-}" ]; then
-            echo "Error: Usage: manage-tenant.sh school <tenant_id> key=value [...]"
-            exit 1
-        fi
-
-        # Pass all remaining args to python to update tenants[tenant_id]['school']
-        shift 2
-
-        if python3 - "$CONFIG_FILE" "$TENANT_ID" "$@" <<'PY'
-import json, sys, os
-path = sys.argv[1]
-tenant_id = sys.argv[2]
-kv_args = sys.argv[3:]
-
-if not os.path.isfile(path):
-    print(f"Error: config file not found: {path}", file=sys.stderr)
-    sys.exit(1)
-
-with open(path, 'r', encoding='utf-8') as f:
-    cfg = json.load(f)
-
-tenants = cfg.setdefault('tenants', {})
-tenant_cfg = tenants.setdefault(tenant_id, {})
-school_cfg = tenant_cfg.setdefault('school', {})
-
-for arg in kv_args:
-    if '=' not in arg:
-        print(f"Warning: Ignoring invalid argument '{arg}'. Expected key=value.", file=sys.stderr)
-        continue
-    key, val = arg.split('=', 1)
-    key = key.strip()
-    val = val.strip()
-    # try to coerce numeric values
-    if val.isdigit():
-        val_parsed = int(val)
-    else:
-        val_parsed = val
-    school_cfg[key] = val_parsed
-    print(f"Set school.{key} = {val_parsed} for tenant {tenant_id}")
-
-with open(path, 'w', encoding='utf-8') as f:
-    json.dump(cfg, f, indent=4, ensure_ascii=False)
-PY
-        then
-            echo "School configuration updated successfully in config.json for tenant '$TENANT_ID'."
-            if [ -n "$(docker ps -qf 'name=app' | head -n 1)" ]; then
-                restart_app_container
-            fi
-        else
-            echo "Failed to update school configuration for tenant '$TENANT_ID'."
-            exit 1
-        fi
-        ;;
-
     *)
         echo "Unknown command: $COMMAND"
         show_help