Refactor email configuration handling and improve logging for email delivery

Improve modal scrolling behavior and height constraints for better usability
implementation of the Email add on
2026-09-15 22:48:26 +02:00 · 2026-09-15 21:45:34 +02:00 · 2026-09-15 20:53:18 +02:00 · 2026-09-15 20:39:06 +02:00
10 changed files with 564 additions and 63 deletions
@@ -253,11 +253,12 @@ jobs:
                  INVENTAR_SECRET_KEY: ${{secrets.INVENTAR_SECRET_KEY}}
                  INVENTAR_DATA_ENCRYPTION_KEY: ${{secrets.INVENTAR_DATA_ENCRYPTION_KEY}}
                  INVENTAR_MONGODB_PASSWORD: ${{secrets.INVENTAR_MONGODB_PASSWORD}}
-                  EMAIL_ENABLED: ${{secrets.EMAIL_ENABLED}}
-                  EMAIL_SMTP_HOST: ${{secrets.EMAIL_SMTP_HOST}}
-                  EMAIL_SMTP_PORT: ${{secrets.EMAIL_SMTP_PORT}}
-                  EMAIL_USERNAME: ${{secrets.EMAIL_USERNAME}}
-                  EMAIL_PASSWORD: ${{secrets.EMAIL_PASSWORD}}
+                  EMAIL_ENABLED: "${{ secrets.EMAIL_ENABLED }}"
+                  EMAIL_SMTP_HOST: "${{ secrets.EMAIL_SMTP_HOST }}"
+                  EMAIL_SMTP_PORT: "${{ secrets.EMAIL_SMTP_PORT }}"
+                  EMAIL_USERNAME: "${{ secrets.EMAIL_USERNAME }}"
+                  EMAIL_PASSWORD: "${{ secrets.EMAIL_PASSWORD }}"
+                  EMAIL_FROM_ADDRESS: "${{ secrets.EMAIL_FROM_ADDRESS }}"
                expose:
                  - "8000"
                volumes:
@@ -48,7 +48,7 @@ import Web.modules.log.audit_log as al
 import push_notifications as pn
 import Web.modules.inventarsystem.pdf_export as pdf_export 
 import Web.modules.inventarsystem.excel_export as excel_export
-from Web.modules.emailservice.email import send
+from Web.modules.emailservice.email import send, send_pdf
 import datetime
 from apscheduler.schedulers.background import BackgroundScheduler
 from bson.objectid import ObjectId, InvalidId
@@ -4892,7 +4892,8 @@ def student_cards_admin():
        edit_mode=edit_mode,
        form_data=form_data,
        available_classes=available_classes, # Enthält nun die lesbaren Klassen
-        config=cfg.get_school_info()
+        config=cfg.get_school_info(),
+        email_service_enabled=cfg.MODULES.is_enabled('mail')
    )


@@ -5353,7 +5354,7 @@ def student_card_class_barcode_download():
        flash('Fehler beim PDF-Download', 'error')
        return redirect(url_for('student_cards_admin'))

-@app.route('/student_card_single_barcode_download/<card_id>', methods=['GET'])
+@app.route('/student_card_single_barcode_download/<card_id>', methods=['GET', 'POST'])
 def student_card_single_barcode_download(card_id):
    """
    Download PDF with single student card barcode.
@@ -5533,11 +5534,34 @@ def student_card_single_barcode_download(card_id):
        c.save()
        pdf_buffer.seek(0)

+        pdf_filename = f'ausweis_{card["AusweisId"]}.pdf'
+        if request.method == 'POST':
+            recipient_email = (request.form.get('recipient_email') or '').strip()
+            if not recipient_email:
+                flash('Bitte eine Empfänger-E-Mail-Adresse eingeben oder nur PDF auswählen.', 'error')
+                return redirect(url_for('student_cards_admin'))
+            if not cfg.MODULES.is_enabled('mail'):
+                flash('Das E-Mail-Add-on ist deaktiviert. Der Ausweis kann weiterhin als PDF heruntergeladen werden.', 'warning')
+                return redirect(url_for('student_cards_admin'))
+            sent = send_pdf(
+                recipient_email,
+                f'Bibliotheksausweis {card["AusweisId"]}',
+                f'Anbei erhalten Sie den Bibliotheksausweis für {card.get("SchülerName", "")} als PDF.',
+                'Bibliotheksverwaltung',
+                pdf_buffer.getvalue(),
+                pdf_filename,
+            )
+            flash(
+                'Bibliotheksausweis wurde per E-Mail versendet.' if sent else 'Bibliotheksausweis konnte nicht per E-Mail versendet werden.',
+                'success' if sent else 'error',
+            )
+            return redirect(url_for('student_cards_admin'))
+
        return send_file(
            pdf_buffer,
            mimetype='application/pdf',
            as_attachment=True,
-            download_name=f'ausweis_{card["AusweisId"]}.pdf'
+            download_name=pdf_filename
        )
    except Exception as e:
        app.logger.error(f"Error occurred while generating PDF for card {card['AusweisId']}: {e}")
@@ -5918,6 +5942,11 @@ def get_bookings():

        result = []
        for booking in bookings:
+            raw_booking_user = booking.get('User') or ''
+            try:
+                booking_user = decrypt_text(raw_booking_user) if raw_booking_user else ''
+            except Exception:
+                booking_user = str(raw_booking_user)
            start_dt = booking.get('Start')
            if not start_dt:
                continue
@@ -5960,10 +5989,10 @@ def get_bookings():
                'end': end_dt.isoformat() if isinstance(end_dt, datetime.datetime) else str(end_dt),
                'status': status,
                'itemId': item_id,
-                'userName': str(booking.get('User') or ''),
+                'userName': str(booking_user),
                'notes': str(booking.get('Notes') or ''),
                'period': period,
-                'isCurrentUser': str(booking.get('User') or '') == username,
+                'isCurrentUser': str(booking_user) == username,
                'itemBorrower': item_borrower,
            })

@@ -7911,9 +7940,14 @@ def get_planned_bookings(item_id):
        cursor = ausleihungen.find({'Item': item_id, 'Status': 'planned'}).sort('Start', 1)
        bookings = []
        for r in cursor:
+            raw_user = r.get('User') or ''
+            try:
+                booking_user = decrypt_text(raw_user) if raw_user else ''
+            except Exception:
+                booking_user = str(raw_user)
            bookings.append({
                'id': str(r.get('_id')),
-                'user': r.get('User', ''),
+                'user': booking_user,
                'period': r.get('Period'),
                'start': r.get('Start').isoformat() if r.get('Start') else None,
                'end': r.get('End').isoformat() if r.get('End') else None,
@@ -7940,7 +7974,13 @@ def get_planned_bookings_public(item_id):
        cursor = ausleihungen.find({'Item': item_id, 'Status': 'planned'}).sort('Start', 1)
        bookings = []
        for r in cursor:
+            raw_user = r.get('User') or ''
+            try:
+                booking_user = decrypt_text(raw_user) if raw_user else ''
+            except Exception:
+                booking_user = str(raw_user)
            bookings.append({
+                'user': booking_user,
                'period': r.get('Period'),
                'start': r.get('Start').isoformat() if r.get('Start') else None,
                'end': r.get('End').isoformat() if r.get('End') else None
@@ -8943,7 +8983,8 @@ def admin_borrowings():
        entries=entries,
        library_module_enabled=cfg.MODULES.is_enabled('library'),
        student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
-        mail_module_enabled=cfg.MODULES.is_enabled('mail')
+        mail_module_enabled=cfg.MODULES.is_enabled('mail'),
+        email_service_enabled=cfg.MODULES.is_enabled('mail')
    )

 """-----------------------------------------------------------Audit Routes-------------------------------------------------------"""
@@ -9035,7 +9076,7 @@ def admin_audit_dashboard():
        if client:
            client.close()

-@app.route('/admin/audit/export/pdf/official', methods=['GET'])
+@app.route('/admin/audit/export/pdf/official', methods=['GET', 'POST'])
 def admin_audit_export_pdf_official():
    """Export audit report as professional PDF (Official Report - full DIN 5008 compliant)."""
    if 'username' not in session:
@@ -9102,6 +9143,29 @@ def admin_audit_export_pdf_official():
            export_type='official',
            school_info=school_info
        )
+
+        if request.method == 'POST':
+            recipient_email = (request.form.get('recipient_email') or '').strip()
+            if not recipient_email:
+                flash('Bitte eine Empfänger-E-Mail-Adresse eingeben oder nur PDF auswählen.', 'error')
+                return redirect(url_for('admin_audit_dashboard'))
+            if not cfg.MODULES.is_enabled('mail'):
+                flash('Das E-Mail-Add-on ist deaktiviert. Der Auditbericht kann weiterhin als PDF heruntergeladen werden.', 'warning')
+                return redirect(url_for('admin_audit_dashboard'))
+            filename = f'audit-official-report-{datetime.datetime.now(ZoneInfo("Europe/Berlin")).strftime("%Y%m%d-%H%M%S")}.pdf'
+            sent = send_pdf(
+                recipient_email,
+                'Amtlicher Auditbericht',
+                'Anbei erhalten Sie den aktuellen amtlichen Auditbericht des Inventarsystems als PDF.',
+                'Inventarsystem',
+                pdf_content,
+                filename,
+            )
+            flash(
+                'Auditbericht wurde per E-Mail versendet.' if sent else 'Auditbericht konnte nicht per E-Mail versendet werden.',
+                'success' if sent else 'error',
+            )
+            return redirect(url_for('admin_audit_dashboard'))
    
        response = make_response(pdf_content)
        response.headers['Content-Type'] = 'application/pdf'
@@ -9476,11 +9540,33 @@ def admin_create_invoice(borrow_id):
        )

        pdf_buffer = pdf_export._build_invoice_pdf(invoice_data)
+        pdf_filename = f'rechnung_{invoice_number}.pdf'
+        if request.form.get('delivery') == 'email':
+            recipient_email = (request.form.get('recipient_email') or '').strip()
+            if not recipient_email:
+                flash('Bitte eine Empfänger-E-Mail-Adresse eingeben oder nur PDF auswählen.', 'error')
+                return redirect(url_for('admin_borrowings'))
+            if not cfg.MODULES.is_enabled('mail'):
+                flash('Das E-Mail-Add-on ist deaktiviert. Die PDF-Rechnung kann weiterhin heruntergeladen werden.', 'warning')
+                return redirect(url_for('admin_borrowings'))
+            sent = send_pdf(
+                recipient_email,
+                f'Rechnung {invoice_number} - {item_name}',
+                f'Anbei erhalten Sie die Rechnung {invoice_number} zum Element {item_name}.',
+                'Bibliotheksverwaltung',
+                pdf_buffer.getvalue(),
+                pdf_filename,
+            )
+            flash(
+                'PDF-Rechnung wurde per E-Mail versendet.' if sent else 'PDF-Rechnung konnte nicht per E-Mail versendet werden.',
+                'success' if sent else 'error',
+            )
+            return redirect(url_for('admin_borrowings'))
        return send_file(
            pdf_buffer,
            mimetype='application/pdf',
            as_attachment=True,
-            download_name=f'rechnung_{invoice_number}.pdf'
+            download_name=pdf_filename
        )
    except Exception as e:
        app.logger.error(f"Error creating damage invoice for borrow {borrow_id}: {e}")
@@ -12311,7 +12397,11 @@ def cancel_ausleihung_route(id):
            
        # Log ausleihung details for debugging
        ausleihung_status = ausleihung.get('Status', 'unknown')
-        ausleihung_user = ausleihung.get('User', 'unknown')
+        raw_ausleihung_user = ausleihung.get('User', '')
+        try:
+            ausleihung_user = decrypt_text(raw_ausleihung_user) if raw_ausleihung_user else ''
+        except Exception:
+            ausleihung_user = str(raw_ausleihung_user or '')
        print(f"Found ausleihung: ID={id}, Status={ausleihung_status}")

        current_permissions = us.get_effective_permissions(session['username'])
@@ -220,13 +220,25 @@ SSL_CERT = _get(_conf, ['ssl', 'cert'], DEFAULTS['ssl']['cert'])
 SSL_KEY = _get(_conf, ['ssl', 'key'], DEFAULTS['ssl']['key'])

 # Email settings
-EMAIL_ENABLED = bool(os.getenv('EMAIL_ENABLED', False))
-EMAIL_SMTP_HOST = str(os.getenv('EMAIL_SMTP_HOST', False))
+def _get_email_env(name, default=''):
+    value = os.getenv(name)
+    if value is None:
+        return default
+    value = value.strip()
+    return '' if value.lower() in {'', 'false', 'none', 'null'} else value
+
+
+EMAIL_ENABLED = _get_email_env('EMAIL_ENABLED').lower() in {'1', 'true', 'yes', 'on'}
+EMAIL_SMTP_HOST = _get_email_env('EMAIL_SMTP_HOST')
 EMAIL_SMTP_PORT = int(os.getenv('EMAIL_SMTP_PORT', 587))
 EMAIL_USE_TLS = True
-EMAIL_USERNAME = str(os.getenv('EMAIL_USERNAME', False))
-EMAIL_PASSWORD = str(os.getenv('EMAIL_PASSWORD', False))
-EMAIL_FROM_ADDRESS = _get(_conf, ['email', 'from_address'], EMAIL_USERNAME)
+EMAIL_USERNAME = _get_email_env('EMAIL_USERNAME')
+EMAIL_PASSWORD = _get_email_env('EMAIL_PASSWORD')
+EMAIL_FROM_ADDRESS = (
+    _get_email_env('EMAIL_FROM_ADDRESS')
+    or _get(_conf, ['email', 'from_address'], '')
+    or EMAIL_USERNAME
+)
 EMAIL_DEFAULT_SENDER_NAME = "Invario Inventarsystem Sender"
 EMAIL_TIMEOUT_SECONDS = 20

@@ -1,12 +1,20 @@
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
+from email.mime.application import MIMEApplication
 import smtplib
 import time
+import logging

 import Web.modules.database.settings as cfg


+logger = logging.getLogger(__name__)
+
+
 def _build_smtp_client():
+    if not cfg.EMAIL_SMTP_HOST:
+        raise RuntimeError('EMAIL_SMTP_HOST ist nicht konfiguriert')
+
    smtp = smtplib.SMTP(
        cfg.EMAIL_SMTP_HOST,
        cfg.EMAIL_SMTP_PORT,
@@ -17,18 +25,26 @@ def _build_smtp_client():
        smtp.starttls()
        smtp.ehlo()
    if cfg.EMAIL_USERNAME:
-        smtp.login("no-reply@invario-software.de", "#,EATwIn,68" or "")
+        smtp.login(cfg.EMAIL_USERNAME, cfg.EMAIL_PASSWORD or "")
    return smtp


-def send(email: list | str, subject: str, note: str, sender: str) -> bool:
-    """Sends the email with the link to the Clients."""
+def _normalize_recipients(email: list | str) -> list[str]:
+    if isinstance(email, str):
+        email = email.replace(';', ',').split(',')
+    return [str(recipient).strip() for recipient in (email or []) if str(recipient).strip()]
+
+
+def _send_message(email: list | str, subject: str, note: str, sender: str, attachment=None) -> bool:
+    """Send a plain/HTML message, optionally with one PDF attachment."""
    if not cfg.MODULES.is_enabled("mail"):
-        print("Debug: Module not enabled")
+        logger.info("Email delivery skipped because the mail module is disabled")
        return False

-    if isinstance(email, str):
-        email = [email]
+    recipients = _normalize_recipients(email)
+    if not recipients:
+        logger.warning("Email delivery skipped because no recipients were provided")
+        return False

    body_message = note

@@ -63,25 +79,27 @@ def send(email: list | str, subject: str, note: str, sender: str) -> bool:
    try:
        smtp = _build_smtp_client()

-        for i, recipient in enumerate(email):
+        for i, recipient in enumerate(recipients):
            start_time = time.time()

-            msg = MIMEMultipart("alternative")
+            msg = MIMEMultipart("mixed" if attachment else "alternative")
            msg["Subject"] = str(subject)
-            msg["From"] = f"{sender} <no-reply@invario-software.de>"
+            from_address = cfg.EMAIL_FROM_ADDRESS or cfg.EMAIL_USERNAME or "no-reply@invario-software.de"
+            msg["From"] = f"{sender} <{from_address}>"
            msg["To"] = str(recipient)

-            msg.attach(MIMEText(text_content, "plain"))
-            msg.attach(MIMEText(html_content, "html"))
-
-            #smtp.sendmail(
-            #    from_addr=cfg.EMAIL_USERNAME,
-            #    to_addrs=[recipient],
-            #    msg=msg.as_string()
-            #)
+            body = MIMEMultipart("alternative") if attachment else msg
+            body.attach(MIMEText(text_content, "plain"))
+            body.attach(MIMEText(html_content, "html"))
+            if attachment:
+                msg.attach(body)
+                attachment_payload, filename = attachment
+                pdf_part = MIMEApplication(attachment_payload, _subtype="pdf")
+                pdf_part.add_header("Content-Disposition", "attachment", filename=filename)
+                msg.attach(pdf_part)

            smtp.sendmail(
-                from_addr="no-reply@invario-software.de",
+                from_addr=from_address,
                to_addrs=[recipient],
                msg=msg.as_string()
            )
@@ -89,16 +107,26 @@ def send(email: list | str, subject: str, note: str, sender: str) -> bool:
            elapsed_time = time.time() - start_time
            sleep_time = interval - elapsed_time

-            if sleep_time > 0 and i < len(email) - 1:
+            if sleep_time > 0 and i < len(recipients) - 1:
                time.sleep(sleep_time)

        return True
    except Exception as e:
-        print(f"Debug: Fehler beim Senden der E-Mail: {e}")
+        logger.exception("Email delivery failed: %s", e)
        return False
    finally:
        if smtp:
            try:
                smtp.quit()
            except Exception:
-                pass
+                pass
+
+
+def send(email: list | str, subject: str, note: str, sender: str) -> bool:
+    """Send an HTML/plain email without an attachment."""
+    return _send_message(email, subject, note, sender)
+
+
+def send_pdf(email: list | str, subject: str, note: str, sender: str, pdf_bytes: bytes, filename: str) -> bool:
+    """Send an email with a PDF attachment."""
+    return _send_message(email, subject, note, sender, attachment=(pdf_bytes, filename))
@@ -3,6 +3,7 @@ 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
+from Web.modules.emailservice.email import send_pdf
 from Web.modules.terminplaner.backend_server import _resolve_public_base_url
 import csv
 import io
@@ -409,7 +410,7 @@ def client_slot_calendar_export(appointment_id):
    return response


-@appoint_bp.route('/export_pdf_brief/<plan_id>', methods=['GET'])
+@appoint_bp.route('/export_pdf_brief/<plan_id>', methods=['GET', 'POST'])
 def export_pdf_brief(plan_id):
    # 1. Daten holen (Hier als Beispiel, passe dies auf deine Datenbank an)
    # terminplan = Terminplan.query.get(plan_id)
@@ -532,12 +533,35 @@ def export_pdf_brief(plan_id):
    # Buffer auf Anfang zurücksetzen
    pdf_buffer.seek(0)
    
+    pdf_filename = f"Einladung_{plan_daten['titel'].replace(' ', '_')}.pdf"
+    if request.method == 'POST':
+        recipient_email = (request.form.get('recipient_email') or '').strip()
+        if not recipient_email:
+            flash('Bitte eine Empfänger-E-Mail-Adresse eingeben oder nur PDF auswählen.', 'error')
+            return redirect(url_for('terminplaner.main', tenant=tenant_id or None))
+        if not cfg.MODULES.is_enabled('mail'):
+            flash('Das E-Mail-Add-on ist deaktiviert. Der Einladungsbrief kann weiterhin als PDF heruntergeladen werden.', 'warning')
+            return redirect(url_for('terminplaner.main', tenant=tenant_id or None))
+        sent = send_pdf(
+            recipient_email,
+            f'Einladung zur Terminbuchung: {plan_daten["titel"]}',
+            f'Anbei erhalten Sie den Einladungsbrief für {plan_daten["titel"]} als PDF.',
+            'Terminplanungssystem',
+            pdf_buffer.getvalue(),
+            pdf_filename,
+        )
+        flash(
+            'Einladungsbrief wurde per E-Mail versendet.' if sent else 'Einladungsbrief konnte nicht per E-Mail versendet werden.',
+            'success' if sent else 'error',
+        )
+        return redirect(url_for('terminplaner.main', tenant=tenant_id or None))
+
    # An Nutzer ausliefern
    return send_file(
        pdf_buffer,
        mimetype='application/pdf',
        as_attachment=True,
-        download_name=f"Einladung_{plan_daten['titel'].replace(' ', '_')}.pdf"
+        download_name=pdf_filename
    )

@appoint_bp.route('/')
@@ -557,5 +581,6 @@ def main():
        current_user=current_user,
        upcoming_events=upcoming_events,
        tenant_id=tenant_id,
-        appointment_module_enabled=cfg.MODULES.is_enabled('terminplan')
+        appointment_module_enabled=cfg.MODULES.is_enabled('terminplan'),
+        mail_service_enabled=cfg.MODULES.is_enabled('mail')
    )
@@ -110,10 +110,16 @@
    <div class="audit-panel" style="padding:14px; border:1px solid #e2e8f0; border-radius:10px; background: var(--ui-surface);">
      <h4 style="margin:0 0 10px 0; color:#1a1a1a;">📄 PDF-Export (DIN 5008 konform)</h4>
      <p style="margin:0 0 10px 0; font-size:0.9rem; color:#666;">Professionelle Berichte für Schulträger und Behörden</p>
-      <div style="display:flex; gap:8px; flex-wrap:wrap;">
+      <div style="display:flex; gap:8px; flex-wrap:wrap; align-items:end;">
        <a class="btn btn-primary" href="{{ url_for('admin_audit_export_pdf_official') }}" style="flex:1; text-align:center;">
          📋 Amtlicher Bericht (DIN 5008)
        </a>
+        {% if mail_module_enabled %}
+        <form method="post" action="{{ url_for('admin_audit_export_pdf_official') }}" style="display:flex; gap:8px; flex:2; flex-wrap:wrap;">
+          <input type="email" name="recipient_email" required placeholder="Empfänger-E-Mail" aria-label="Empfänger-E-Mail für den Auditbericht" style="flex:1; min-width:220px; padding:8px; border:1px solid #cbd5e1; border-radius:6px;">
+          <button class="btn btn-outline-primary" type="submit">PDF per E-Mail senden</button>
+        </form>
+        {% endif %}
      </div>
    </div>

@@ -195,6 +195,13 @@
        <textarea id="damage-reason" name="damage_reason" rows="5" required style="width:100%; padding:10px; border:1px solid #ddd; border-radius:6px; resize:vertical;" placeholder="Beschreiben Sie kurz den Schaden oder die Zerstörung."></textarea>
      </div>

+      {% if email_service_enabled %}
+      <div style="margin-bottom:16px;">
+        <label for="invoice-recipient-email" style="display:block; font-weight:700; margin-bottom:6px;">Empfänger-E-Mail für den PDF-Versand</label>
+        <input id="invoice-recipient-email" name="recipient_email" type="email" style="width:100%; padding:10px; border:1px solid #ddd; border-radius:6px;" placeholder="name@beispiel.de">
+      </div>
+      {% endif %}
+
      <div style="display:flex; flex-wrap:wrap; gap:16px; align-items:center; margin-bottom:18px;">
        <label style="display:flex; align-items:center; gap:8px;">
          <input type="checkbox" name="mark_destroyed" checked>
@@ -208,7 +215,10 @@

      <div style="display:flex; justify-content:flex-end; gap:10px;">
        <button type="button" class="btn btn-secondary" onclick="closeInvoiceModal()">Abbrechen</button>
-        <button type="submit" class="btn btn-danger">PDF-Rechnung erstellen</button>
+        <button type="submit" class="btn btn-outline-danger" name="delivery" value="pdf">Nur PDF herunterladen</button>
+        {% if email_service_enabled %}
+        <button type="submit" class="btn btn-danger" name="delivery" value="email">PDF per E-Mail senden</button>
+        {% endif %}
      </div>
    </form>
  </div>
@@ -4063,21 +4063,29 @@ document.addEventListener('DOMContentLoaded', ()=>{
                const badgeText = entry.type === 'repair' ? 'Repariert' : 'Schaden';
                const metaLine = entry.meta ? `<div style="font-size:0.84rem;color:#4b5563;">${escapeHtml(entry.meta)}</div>` : '';
                return `
-                    <div style="border:1px solid var(--ui-border);border-radius:8px;padding:10px;background:var(--ui-surface);display:grid;gap:6px;">
-                        <div style="display:flex;flex-wrap:wrap;gap:8px;align-items:center;">
-                            <span style="display:inline-block;padding:2px 8px;border-radius:999px;font-size:0.75rem;font-weight:700;${badgeStyle}">${badgeText}</span>
-                            <span style="font-size:0.84rem;color:#475569;">${entry.dateLabel}</span>
+                    <div class="damage-history-entry ${entry.type === 'repair' ? 'is-repair' : 'is-report'}">
+                        <div class="damage-history-entry-head">
+                            <span class="damage-history-badge" style="${badgeStyle}">${badgeText}</span>
+                            <time>${entry.dateLabel}</time>
                        </div>
-                        <div style="font-size:0.9rem;color:#0f172a;"><strong>Von:</strong> ${entry.actor}</div>
-                        <div style="font-size:0.92rem;color:#1f2937;">${entry.description}</div>
-                        ${metaLine}
+                        <div class="damage-history-actor"><strong>Von</strong>${entry.actor}</div>
+                        <div class="damage-history-description">${entry.description}</div>
+                        ${entry.meta ? `<div class="damage-history-meta">${escapeHtml(entry.meta)}</div>` : ''}
                    </div>
                `;
            }).join('')
            : '<div style="font-size:0.92rem;color:#64748b;">Keine Beschädigungs-Historie vorhanden.</div>';
        
        modalContent.innerHTML = `
-            <h2>${escapeHtml(item.Name || '')}</h2>
+            <div class="item-modal-heading">
+                <div>
+                    <span class="item-modal-eyebrow">Objektdetails</span>
+                    <h2>${escapeHtml(item.Name || '')}</h2>
+                </div>
+                <span class="item-modal-status ${isBorrowed ? 'is-borrowed' : 'is-available'}">
+                    <span class="item-modal-status-dot"></span>${isBorrowed ? 'Ausgeliehen' : 'Verfügbar'}
+                </span>
+            </div>
            ${borrowerInfoHtml}
            ${appointmentInfoHtml}
                
@@ -4090,7 +4098,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
                ` : ''}
            </div>

-            <div class="modal-details">
+            <div class="modal-details item-modal-details">
                <div class="detail-group">
                    <div class="detail-label">Ort:</div>
                    <div class="detail-value">${escapeHtml(item.Ort || '-')}</div>
@@ -4145,22 +4153,22 @@ document.addEventListener('DOMContentLoaded', ()=>{
                </div>
            
                {% if current_permissions.actions.get('can_view_logs', False) %}
-                <div class="detail-group full-width" style="margin-top:12px;">
+                <div class="detail-group full-width item-modal-history" style="margin-top:12px;">
                    <div class="detail-label" style="font-weight:600; color:#374151;">Beschädigungs-Historie</div>
                    <div class="detail-value">
-                        <button id="toggle-damage-history" class="calendar-toggle-btn" style="margin-bottom:12px; padding:10px 16px; border-radius:6px; background:#f3f4f6; border:1px solid #d1d5db; font-weight:500; cursor:pointer; display:inline-flex; align-items:center; gap:8px; transition:all 0.2s ease;">
+                        <button id="toggle-damage-history" class="calendar-toggle-btn modal-section-toggle" style="margin-bottom:12px;">
                            <span>🛠️</span>
                            <span id="toggle-damage-history-text">Historie anzeigen</span>
                        </button>
-                        <div id="damage-history-panel" style="display:none; margin-top:8px; border:1px solid #e7edf5; border-radius:10px; padding:12px; background: var(--ui-surface-soft);">
-                            <div style="display:grid; gap:10px;">${damageHistoryHtml}</div>
+                        <div id="damage-history-panel" class="modal-history-panel" style="display:none;">
+                            <div class="damage-history-list">${damageHistoryHtml}</div>
                        </div>
                    </div>
                </div>
                {% endif %}
            
                <div class="detail-group full-width" style="margin-top:12px; padding:10px; border:1px solid #e3e3e3; border-radius:8px;">
-                    <div class="detail-label">Verfügbarkeit prüfen:</div>
+                    <div class="detail-label">Verfügbarkeit prüfen</div>
                    <div class="detail-value">
                        <div style="display:flex; flex-wrap:wrap; gap:8px; align-items:center;">
                            <input type="date" id="avail-date" style="padding:6px;">
@@ -4180,10 +4188,10 @@ document.addEventListener('DOMContentLoaded', ()=>{
                </div>
            </div>
        
-            <div class="detail-group full-width" style="margin-top:15px;">
+            <div class="detail-group full-width item-modal-bookings" style="margin-top:15px;">
                <div class="detail-label">Geplante Ausleihen:</div>
                <div class="detail-value">
-                    <button id="toggle-bookings" class="calendar-toggle-btn" style="margin-bottom:12px; padding:10px 16px; border-radius:6px; background:#f3f4f6; border:1px solid #d1d5db; font-weight:500; cursor:pointer; display:inline-flex; align-items:center; gap:8px; transition:all 0.2s ease;">
+                    <button id="toggle-bookings" class="calendar-toggle-btn modal-section-toggle" style="margin-bottom:12px;">
                        <span>📅</span>
                        <span id="toggle-bookings-text">Kalender anzeigen</span>
                    </button>
@@ -5381,5 +5389,314 @@ document.addEventListener('DOMContentLoaded', ()=>{
        border-radius: 10px !important;
    }
 }
+
+/* Detailed item modal: compact hierarchy and calm information density. */
+#item-modal .modal-content {
+    width: min(94vw, 880px);
+    max-width: 880px;
+    margin: 4vh auto;
+    padding: 0;
+    max-height: 92vh;
+    overflow-x: hidden;
+    overflow-y: auto;
+    overscroll-behavior: contain;
+    -webkit-overflow-scrolling: touch;
+    border: 1px solid #d8e1eb;
+    border-radius: 16px;
+    background: var(--ui-surface);
+    box-shadow: 0 24px 70px rgba(15, 23, 42, 0.22);
+}
+
+#item-modal .modal-content > *:not(.item-modal-heading):not(.modal-image-container):not(.modal-details):not(.modal-actions) {
+    margin-left: 28px;
+    margin-right: 28px;
+}
+
+#item-modal .item-modal-heading {
+    display: flex;
+    align-items: flex-start;
+    justify-content: space-between;
+    gap: 18px;
+    padding: 26px 30px 22px;
+    border-bottom: 1px solid #e6edf4;
+    background: linear-gradient(180deg, #f8fbfe 0%, var(--ui-surface) 100%);
+}
+
+#item-modal .item-modal-eyebrow {
+    display: block;
+    margin-bottom: 5px;
+    color: #708197;
+    font-size: 0.72rem;
+    font-weight: 800;
+    letter-spacing: 0.12em;
+    text-transform: uppercase;
+}
+
+#item-modal .item-modal-heading h2 {
+    margin: 0;
+    color: #172536;
+    font-size: clamp(1.25rem, 2.5vw, 1.7rem);
+    line-height: 1.2;
+    text-align: left;
+    overflow-wrap: anywhere;
+}
+
+#item-modal .item-modal-status {
+    display: inline-flex;
+    align-items: center;
+    gap: 7px;
+    flex: 0 0 auto;
+    margin-top: 5px;
+    padding: 6px 10px;
+    border: 1px solid;
+    border-radius: 999px;
+    font-size: 0.78rem;
+    font-weight: 800;
+    white-space: nowrap;
+}
+
+#item-modal .item-modal-status.is-available {
+    color: #17633b;
+    border-color: #b9e2ca;
+    background: #effaf3;
+}
+
+#item-modal .item-modal-status.is-borrowed {
+    color: #9b3d32;
+    border-color: #f2c5bf;
+    background: #fff4f2;
+}
+
+#item-modal .item-modal-status-dot {
+    width: 7px;
+    height: 7px;
+    border-radius: 50%;
+    background: currentColor;
+}
+
+#item-modal .modal-image-container {
+    min-height: 180px;
+    margin: 0;
+    padding: 22px 28px;
+    border-radius: 0;
+    background: #f4f7fa;
+}
+
+#item-modal .modal-image {
+    max-height: 320px;
+    border-radius: 10px;
+    box-shadow: 0 8px 24px rgba(15, 23, 42, 0.12);
+}
+
+#item-modal .item-modal-details {
+    display: grid;
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+    gap: 0 22px;
+    margin: 0;
+    padding: 24px 28px 4px;
+}
+
+#item-modal .item-modal-details .detail-group {
+    display: block;
+    min-width: 0;
+    margin: 0;
+    padding: 12px 0;
+    border-bottom: 1px solid #edf1f5;
+}
+
+#item-modal .item-modal-details .detail-label {
+    min-width: 0;
+    margin: 0 0 4px;
+    color: #718096;
+    font-size: 0.72rem;
+    font-weight: 800;
+    letter-spacing: 0.06em;
+    text-transform: uppercase;
+}
+
+#item-modal .item-modal-details .detail-value {
+    min-width: 0;
+    color: #243447;
+    font-size: 0.95rem;
+    line-height: 1.45;
+    overflow-wrap: anywhere;
+}
+
+#item-modal .item-modal-details .detail-group.full-width,
+#item-modal .item-modal-details .item-modal-history,
+#item-modal .item-modal-details .item-modal-bookings {
+    grid-column: 1 / -1;
+}
+
+#item-modal .item-modal-details .detail-group.full-width .detail-value {
+    padding: 12px 14px;
+    border: 1px solid #e1e8ef;
+    border-radius: 9px;
+    background: #f8fafc;
+}
+
+#item-modal .item-modal-details .item-modal-history,
+#item-modal .item-modal-details .item-modal-bookings {
+    margin-top: 12px !important;
+    padding: 16px;
+    border: 1px solid #dfe7ef;
+    border-radius: 12px;
+    background: #fbfcfd;
+}
+
+#item-modal .modal-section-toggle {
+    min-height: 38px;
+    margin: 0 0 12px !important;
+    padding: 8px 12px;
+    border: 1px solid #cdd8e3;
+    border-radius: 8px;
+    background: var(--ui-surface);
+    color: #36516c;
+    font-size: 0.86rem;
+    font-weight: 750;
+    box-shadow: 0 1px 2px rgba(15, 23, 42, 0.04);
+}
+
+#item-modal .modal-section-toggle:hover {
+    border-color: #9db6cc;
+    background: #f1f6fa;
+}
+
+#item-modal .modal-history-panel {
+    margin-top: 4px;
+    padding: 12px;
+    border: 1px solid #e2e9f0;
+    border-radius: 10px;
+    background: #f5f8fb;
+}
+
+#item-modal .damage-history-list {
+    display: grid;
+    gap: 9px;
+}
+
+#item-modal .damage-history-entry {
+    position: relative;
+    display: grid;
+    gap: 7px;
+    padding: 12px 14px 12px 17px;
+    border: 1px solid #dce5ed;
+    border-radius: 9px;
+    background: var(--ui-surface);
+}
+
+#item-modal .damage-history-entry::before {
+    position: absolute;
+    inset: 0 auto 0 0;
+    width: 3px;
+    content: '';
+    border-radius: 9px 0 0 9px;
+    background: #e35d54;
+}
+
+#item-modal .damage-history-entry.is-repair::before {
+    background: #3aa76d;
+}
+
+#item-modal .damage-history-entry-head {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 10px;
+}
+
+#item-modal .damage-history-badge {
+    padding: 3px 8px;
+    border-radius: 999px;
+    font-size: 0.72rem;
+    font-weight: 800;
+}
+
+#item-modal .damage-history-entry time,
+#item-modal .damage-history-meta {
+    color: #738196;
+    font-size: 0.78rem;
+}
+
+#item-modal .damage-history-actor {
+    display: flex;
+    gap: 5px;
+    color: #425466;
+    font-size: 0.84rem;
+}
+
+#item-modal .damage-history-actor strong {
+    color: #718096;
+    font-weight: 700;
+}
+
+#item-modal .damage-history-description {
+    color: #243447;
+    font-size: 0.91rem;
+    line-height: 1.4;
+}
+
+#item-modal .modal-actions {
+    justify-content: flex-end;
+    gap: 9px;
+    margin: 0;
+    padding: 18px 28px 24px;
+    border-top: 1px solid #e6edf4;
+    background: #fbfcfd;
+}
+
+@media (max-width: 640px) {
+    #item-modal .modal-content {
+        width: calc(100vw - 18px);
+        margin: 9px auto;
+        max-height: calc(100dvh - 18px);
+        overflow-y: auto;
+        border-radius: 13px;
+    }
+
+    #item-modal .item-modal-heading {
+        align-items: flex-start;
+        flex-direction: column;
+        gap: 10px;
+        padding: 21px 20px 17px;
+    }
+
+    #item-modal .item-modal-status {
+        margin-top: 0;
+    }
+
+    #item-modal .modal-image-container {
+        padding: 16px 18px;
+    }
+
+    #item-modal .item-modal-details {
+        grid-template-columns: 1fr;
+        gap: 0;
+        padding: 16px 18px 0;
+    }
+
+    #item-modal .item-modal-details .detail-group.full-width,
+    #item-modal .item-modal-details .item-modal-history,
+    #item-modal .item-modal-details .item-modal-bookings {
+        grid-column: auto;
+    }
+
+    #item-modal .item-modal-details .item-modal-history,
+    #item-modal .item-modal-details .item-modal-bookings {
+        padding: 13px;
+    }
+
+    #item-modal .modal-actions {
+        justify-content: stretch;
+        padding: 15px 18px 19px;
+    }
+
+    #item-modal .modal-actions > *,
+    #item-modal .modal-actions form,
+    #item-modal .modal-actions button {
+        flex: 1 1 100%;
+        width: 100%;
+    }
+}
 </style>
 {% endblock %}
@@ -529,6 +529,12 @@
                                        <button type="submit" class="btn-edit">Bearbeiten</button>
                                    </form>
                                    <a href="{{ url_for('student_card_single_barcode_download', card_id=card._id) }}" class="btn-export">📥 PDF</a>
+                                    {% if email_service_enabled %}
+                                    <form method="POST" action="{{ url_for('student_card_single_barcode_download', card_id=card._id) }}" style="display:flex; gap:4px; align-items:center;">
+                                        <input type="email" name="recipient_email" required placeholder="E-Mail" aria-label="E-Mail für {{ card.SchülerName }}" style="width:150px; padding:5px;">
+                                        <button type="submit" class="btn-export">PDF senden</button>
+                                    </form>
+                                    {% endif %}
                                    <form method="POST" style="display: inline;" onsubmit="return confirm('Wirklich löschen?');">
                                        <input type="hidden" name="action" value="delete">
                                        <input type="hidden" name="card_id" value="{{ card._id }}">
@@ -42,6 +42,12 @@
                    <a href="{{ url_for('terminplaner.export_pdf_brief', plan_id=plan_id) }}" class="btn btn-outline-success btn-sm">
                        📄 Brief als PDF herunterladen
                    </a>
+                    {% if mail_service_enabled %}
+                    <form method="post" action="{{ url_for('terminplaner.export_pdf_brief', plan_id=plan_id) }}" class="d-flex flex-wrap gap-2 mt-2">
+                        <input type="email" name="recipient_email" required placeholder="Empfänger-E-Mail" aria-label="Empfänger-E-Mail für den Einladungsbrief" class="form-control" style="max-width:280px;">
+                        <button type="submit" class="btn btn-outline-primary btn-sm">PDF per E-Mail senden</button>
+                    </form>
+                    {% endif %}
                </div>

                {% if calendar_link %}
Author	SHA1	Message	Date
Aiirondev_dev	92c86334e9	Refactor email configuration handling and improve logging for email delivery Release Inventarsystem / release-docker (push) Successful in 2m25s Details	2026-09-15 22:48:26 +02:00
Aiirondev_dev	98b1e39abb	Improve modal scrolling behavior and height constraints for better usability Release Inventarsystem / release-docker (push) Successful in 2m27s Details	2026-09-15 21:45:34 +02:00
Aiirondev_dev	e9aea7e039	implementation of the Email add on Release Inventarsystem / release-docker (push) Successful in 2m24s Details	2026-09-15 20:53:18 +02:00
Aiirondev_dev	00d45a9d1b	Enhance booking user decryption and improve item modal styling Release Inventarsystem / release-docker (push) Successful in 2m25s Details	2026-09-15 20:39:06 +02:00