new implementation of the mail module relevant fuktions, in addition added thje funktion to add a title to the Terminplan

Web/app.py

@@ -1268,7 +1268,8 @@ def inject_version():
         'inventory_module_enabled': cfg.MODULES.is_enabled('inventory'),
         'terminplan_module_enabled': cfg.MODULES.is_enabled('terminplan'),
         'library_module_enabled': cfg.MODULES.is_enabled('library'),
-        'student_cards_module_enabled': cfg.MODULES.is_enabled('student_cards'),
+        'student_cards_module_enabled': cfg.MODULES.is_enabled('student_cards'),#
+        'mail_module_enabled': cfg.MODULES.is_enabled('mail'),
         'is_admin': is_admin,
         'unread_notification_count': unread_notification_count,
         'current_permissions': current_permissions,
@@ -2885,6 +2886,7 @@ def home():
             username=session['username'],
             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'),
             student_default_borrow_days=cfg.STUDENT_DEFAULT_BORROW_DAYS,
             student_max_borrow_days=cfg.STUDENT_MAX_BORROW_DAYS,
             open_item=request.args.get('open_item')
@@ -2927,6 +2929,7 @@ def home_admin():
         username=session['username'],
         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'),
         student_default_borrow_days=cfg.STUDENT_DEFAULT_BORROW_DAYS,
         student_max_borrow_days=cfg.STUDENT_MAX_BORROW_DAYS,
         school_info=_get_school_info_for_export(),
@@ -2947,6 +2950,7 @@ def tutorial_page():
         is_admin=us.check_admin(session['username']),
         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'),
         student_default_borrow_days=cfg.STUDENT_DEFAULT_BORROW_DAYS,
         student_max_borrow_days=cfg.STUDENT_MAX_BORROW_DAYS
     )
@@ -7980,7 +7984,8 @@ def admin_borrowings():
         'admin_borrowings.html',
         entries=entries,
         library_module_enabled=cfg.MODULES.is_enabled('library'),
-        student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards')
+        student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
+        mail_module_enabled=cfg.MODULES.is_enabled('mail')
     )
 
 """-----------------------------------------------------------Audit Routes-------------------------------------------------------"""
@@ -8043,6 +8048,7 @@ def admin_audit_dashboard():
             audit_rows=audit_rows,
             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'),
         )
     except Exception as exc:
         app.logger.error(f"Error loading audit dashboard: {exc}")
@@ -8858,6 +8864,7 @@ def library_item_invoices(item_id):
             invoices=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')
         )
     except Exception as e:
         app.logger.error(f"Error loading invoice history for item {item_id}: {e}")
@@ -10192,6 +10199,7 @@ def admin_damaged_items():
             damaged_items=damaged_rows,
             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')
         )
     except Exception as exc:
         app.logger.error(f"Error loading damaged-items admin view: {exc}")

Web/modules/emailservice/email.py

@@ -1,5 +1,6 @@
 from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
+from modules.module_registry import ModuleRegistry as mr
 import smtplib
 
 import Web.modules.database.settings as cfg
@@ -27,21 +28,24 @@ def send(email: list, subject: str, note: str, sender: str) -> bool:
   Output:
   - bool: true if the sending worked and false if it didnt
   """
-  msg = MIMEMultipart()
-  msg['Subject'] = subject
-  msg['From'] = sender or cfg.EMAIL_FROM_ADDRESS or cfg.EMAIL_USERNAME
-  msg['To'] = ', '.join(email) if isinstance(email, (list, tuple)) else str(email)
-  msg.attach(MIMEText(note))
-  smtp = None
-  try:
-    smtp = _build_smtp_client()
-    smtp.sendmail(from_addr=msg['From'], to_addrs=email, msg=msg.as_string())
-    return True
-  except Exception:
+  if not mr.registry.is_enabled('mail'):
     return False
-  finally:
+  else:
+    msg = MIMEMultipart()
+    msg['Subject'] = subject
+    msg['From'] = sender or cfg.EMAIL_FROM_ADDRESS or cfg.EMAIL_USERNAME
+    msg['To'] = ', '.join(email) if isinstance(email, (list, tuple)) else str(email)
+    msg.attach(MIMEText(note))
+    smtp = None
     try:
-      if smtp:
-        smtp.quit()
+      smtp = _build_smtp_client()
+      smtp.sendmail(from_addr=msg['From'], to_addrs=email, msg=msg.as_string())
+      return True
     except Exception:
-      pass
+      return False
+    finally:
+      try:
+        if smtp:
+          smtp.quit()
+      except Exception:
+        pass

Web/modules/terminplaner/backend_server.py

@@ -82,6 +82,7 @@ def build_calendar_ics(appointment_id: str) -> str | None:
     time_span = item.get('time_span', []) or []
     creator = item.get('user', 'Terminplaner')
     note = item.get('note', '') or ''
+    titel = item.get('title', '') or ''
     tenant_id = _current_tenant_id()
     try:
         link = url_for('terminplaner.client', appointment_id=str(appointment_id), tenant=tenant_id or None, _external=True)
@@ -108,6 +109,8 @@ def build_calendar_ics(appointment_id: str) -> str | None:
         description_lines.append('Zeitfenster: ' + '; '.join(str(entry) for entry in time_span))
     if note:
         description_lines.append('Notiz: ' + str(note))
+    if titel:
+        description_lines.append('Titel: ' + str(titel))
 
     ics_lines = [
         'BEGIN:VCALENDAR',
@@ -123,6 +126,7 @@ def build_calendar_ics(appointment_id: str) -> str | None:
         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))}',
+        f'Titel:{_escape_ics_text(titel)}',
         'END:VEVENT',
         'END:VCALENDAR',
         '',
@@ -159,7 +163,7 @@ def build_client_slot_ics(appointment_id: str, slot_start: str, client_name: str
         if tenant_id:
             link += f'?tenant={tenant_id}'
 
-    title_name = str(client_name or '').strip() or 'Termin'
+    title_name = item.get('title') or f"Terminbuchung mit {client_name}" if client_name else "Terminbuchung"
     summary = f"{title_name} - Terminbuchung"
     description_lines = [
         f"Buchungslink: {link}",
@@ -185,6 +189,7 @@ def build_client_slot_ics(appointment_id: str, slot_start: str, client_name: str
         f'URL:{_escape_ics_text(link)}',
         f'DTSTART:{dt_start}',
         f'DTEND:{dt_end}',
+        f'Titel:{_escape_ics_text(summary)}',
         'END:VEVENT',
         'END:VCALENDAR',
         '',
@@ -192,7 +197,7 @@ def build_client_slot_ics(appointment_id: str, slot_start: str, client_name: str
     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:
+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, title: str="") -> dict:
     """
     Generates a link for the executive to send to his clients to book a time Slot
     
@@ -208,7 +213,7 @@ 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, calendar_enabled=calendar_enabled)
+    id = termin.add(date_start, date_end, normalized_time_span, slots, slot_lenght, user, normalized_mail, note, calendar_enabled=calendar_enabled, title=title)
     id_str = str(id)
     tenant_id = _current_tenant_id()
 
@@ -219,7 +224,7 @@ def new(date_start: str, date_end: str, time_span: list, slots: int, slot_lenght
         link = host + "/terminplaner/client/" + id_str
         if tenant_id:
             link += f"?tenant={tenant_id}"
-    subject = f"Terminanfrage von {user}"
+    subject = f"{title} - Bitte Termin vereinbaren" if title else f"Terminanfrage von {user} - Bitte Termin vereinbaren"
     note_link = note + f"Bitte klicken sie auf den folgenden Link um einen Termin zu vereinbaren: {link}"
     calendar_link = None
     if calendar_enabled:
@@ -459,6 +464,7 @@ def get_user_upcoming_events(user: str, limit: int = 25) -> list[dict]:
                 'note': str(item.get('note') or ''),
                 'link': link,
                 'calendar_link': calendar_link if item.get('calendar_enabled') else None,
+                'title': str(item.get('title') or ''),
             }
         )
 

Web/modules/terminplaner/blueprint.py

@@ -173,8 +173,9 @@ def configure():
         mail = request.form.get('mail', '')
         note = request.form.get('note', '')
         add_to_calendar = request.form.get('add_to_calendar') == 'on'
+        titel = request.form.get('titel', '').strip()
 
-        if not start or not end or not time or not slots_amount or not slot_lenght:
+        if not start or not end or not time or not slots_amount or not slot_lenght or not titel:
             flash('Bitte alle Pflichtfelder ausfüllen.', 'error')
             return render_template(
                 'termin_configure.html',
@@ -183,7 +184,7 @@ def configure():
                 email_service_enabled=cfg.EMAIL_ENABLED,
             )
 
-        result = appointment_service.new(start, end, time, slots_amount, slot_lenght, session["username"], mail, note, calendar_enabled=add_to_calendar)
+        result = appointment_service.new(start, end, time, slots_amount, slot_lenght, session["username"], mail, note, calendar_enabled=add_to_calendar, title=titel)
         flash('Der Terminplan wurde angelegt.', 'success')
         return render_template(
             'termin_configure.html',
@@ -192,6 +193,7 @@ def configure():
             calendar_link=result.get('calendar_link'),
             add_to_calendar=add_to_calendar,
             email_service_enabled=cfg.EMAIL_ENABLED,
+            title=titel,
         )
     elif request.method == "GET":
         return render_template(
@@ -201,6 +203,7 @@ def configure():
             calendar_link=None,
             add_to_calendar=False,
             email_service_enabled=cfg.EMAIL_ENABLED,
+            title=None,
         )
 
 
@@ -214,8 +217,10 @@ def calendar_export(appointment_id):
     if not ics_content:
         return _appointment_not_found_response()
 
+    title = str(request.args.get('title', '') or '').strip() or appointment_id
+
     response = Response(ics_content, mimetype='text/calendar; charset=utf-8')
-    response.headers['Content-Disposition'] = f'attachment; filename=terminplan-{appointment_id}.ics'
+    response.headers['Content-Disposition'] = f'attachment; filename=terminplan-{title}-{appointment_id}.ics'
     return response
 
 
@@ -231,8 +236,10 @@ def client_slot_calendar_export(appointment_id):
     if not ics_content:
         return _appointment_not_found_response()
 
+    title = str(request.args.get('title', '') or '').strip() or appointment_id
+
     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'
+    response.headers['Content-Disposition'] = f'attachment; filename=termin-{title}-{appointment_id}-{slot_start.replace(" ", "_").replace(":", "")}.ics'
     return response
 
 @appoint_bp.route('/')

Web/templates/main.html

@@ -373,7 +373,7 @@
             
             <div class="filter-group">
                 <div class="filter-header">
-                    <label>Thema:</label>
+                    <label>Schlagwort:</label>
                     <button type="button" class="filter-toggle" onclick="toggleFilterDropdown('filter3-dropdown')">▼</button>
                     <button type="button" class="clear-filter" onclick="clearFilter(3)">Clear</button>
                 </div>
@@ -420,7 +420,7 @@
             <span>Ort</span>
             <span>Unterrichtsfach</span>
             <span>Jahrgangsstufe</span>
-            <span>Thema</span>
+            <span>Schlagwort</span>
             <span>Barcode</span>
         </div>
         <div id="items-container" class="items-container">
@@ -1057,7 +1057,7 @@
                                 <p class="item-col-location"><strong>Ort:</strong> ${item.Ort || '-'}</p>
                                 <p class="item-col-filter1"><strong>Unterrichtsfach:</strong> ${filter1Display}${filter1More}</p>
                                 <p class="item-col-filter2"><strong>Jahrgangsstufe:</strong> ${filter2Display}${filter2More}</p>
-                                <p class="item-col-filter3"><strong>Thema:</strong> ${filter3Display}${filter3More}</p>
+                                <p class="item-col-filter3"><strong>Schlagwort:</strong> ${filter3Display}${filter3More}</p>
                                 <p class="item-col-code"><strong>Barcode:</strong> ${item.Code_4 || '-'}</p>
                                 <p class="item-col-count"><strong>Anzahl:</strong> ${groupedCount}</p>
                                 ${isGroupedItem ? `<p class="item-col-count"><strong>Verfügbar:</strong> ${availableGroupedCount}</p>` : ''}
@@ -1682,7 +1682,7 @@
                 </div>
                 
                 <div class="detail-group">
-                    <div class="detail-label">Thema:</div>
+                    <div class="detail-label">Schlagwort:</div>
                     <div class="detail-value">${filter3Array.join(', ') || '-'}</div>
                 </div>
                 

Web/templates/main_admin.html

@@ -2395,7 +2395,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
             
             <div class="filter-group">
                 <div class="filter-header">
-                    <label>Thema:</label>
+                    <label>Schlagwort:</label>
                     <button type="button" class="filter-toggle" onclick="toggleFilterDropdown('filter3-dropdown')">▼</button>
                     <button type="button" class="clear-filter" onclick="clearFilter(3)">Clear</button>
                 </div>
@@ -2446,7 +2446,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
             <span>Ort</span>
             <span>Unterrichtsfach</span>
             <span>Jahrgangsstufe</span>
-            <span>Thema</span>
+            <span>Schlagwort</span>
             <span>Barcode</span>
             <span>Anzahl</span>
         </div>
@@ -2567,7 +2567,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
                         </div>
                     </div>
                     
-                    <h3>Thema:</h3>
+                    <h3>Schlagwort:</h3>
                     <div class="multi-filter">
                         <div class="form-group">
                             <label for="edit-filter3-1">Wert 1:</label>
@@ -3686,7 +3686,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
                                 <p class="item-col-location"><strong>Ort:</strong> ${item.Ort || '-'}</p>
                                 <p class="item-col-filter1"><strong>Unterrichtsfach:</strong> ${filter1Display}${filter1More}</p>
                                 <p class="item-col-filter2"><strong>Jahrgangsstufe:</strong> ${filter2Display}${filter2More}</p>
-                                <p class="item-col-filter3"><strong>Thema:</strong> ${filter3Display}${filter3More}</p>
+                                <p class="item-col-filter3"><strong>Schlagwort:</strong> ${filter3Display}${filter3More}</p>
                                 <p class="item-col-code"><strong>Barcode:</strong> ${item.Code_4 || '-'}</p>
                                 <p class="item-col-count"><strong>Anzahl:</strong> ${groupedCount}</p>
                                 ${hasDamage ? `<div class="damage-badge">${damageCount > 0 ? `Schäden gemeldet: ${damageCount}` : 'Schäden gemeldet'}</div>` : ''}
@@ -4229,7 +4229,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
                 document.getElementById('edit-filter2-3').value = filter2Array[2] || '';
                 document.getElementById('edit-filter2-4').value = filter2Array[3] || '';
 
-                // Fill in filter 3 (Thema)
+                // Fill in filter 3 (Schlagwort)
                 const filter3Array = Array.isArray(item.Filter3) ? item.Filter3 : (item.Filter3 ? [item.Filter3] : []);
                 document.getElementById('edit-filter3-1').value = filter3Array[0] || '';
                 document.getElementById('edit-filter3-2').value = filter3Array[1] || '';
@@ -4543,7 +4543,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
                 </div>
                 
                 <div class="detail-group">
-                    <div class="detail-label">Thema:</div>
+                    <div class="detail-label">Schlagwort:</div>
                     <div class="detail-value">${filter3Array.join(', ') || '-'}</div>
                 </div>
                 

Web/templates/termin_configure.html

@@ -14,6 +14,8 @@
                 <div class="card-body p-4 p-md-5 bg-white">
                     <form method="post" action="{{ url_for('terminplaner.configure') }}" class="vstack gap-3">
                         <div class="row g-3">
+                            <labal for="title" class="form-label fw-semibold">Titel des Terminplans</label>
+                            <input type="text" id="title" name="title" class="form-control form-control-lg" placeholder="z.B. Elternsprechtag Klasse 10a" value="{{ title or '' }} required>">
                             <div class="col-12 col-md-6">
                                 <label for="start_date" class="form-label fw-semibold">Startdatum</label>
                                 <input type="date" id="start_date" name="start_date" class="form-control form-control-lg" required>
@@ -64,16 +66,18 @@
                             </div>
                         </div>
 
-                        <div>
-                            <label for="mail" class="form-label fw-semibold">Empfänger-Mails</label>
-                            <input type="text" id="mail" name="mail" class="form-control" placeholder="adresse1@schule.de, adresse2@schule.de">
-                        </div>
-
-                        <div>
-                            <label for="note" class="form-label fw-semibold">Notiz</label>
-                            <textarea id="note" name="note" class="form-control" rows="4" placeholder="Optionaler Einführungstext für die Mail"></textarea>
-                        </div>
+                        {% if mail_service_enabled %}
+                            <div>
+                                <label for="mail" class="form-label fw-semibold">Empfänger-Mails</label>
+                                <input type="text" id="mail" name="mail" class="form-control" placeholder="adresse1@schule.de, adresse2@schule.de">
+                            </div>
 
+                            <div>
+                                <label for="note" class="form-label fw-semibold">Notiz</label>
+                                <textarea id="note" name="note" class="form-control" rows="4" placeholder="Optionaler Einführungstext für die Mail"></textarea>
+                            </div>
+                        
+                        {% endif %}
                         <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>

Web/templates/terminplan.html

@@ -26,12 +26,6 @@
             </div>
             <button id="new-booking" class="primary-button">Zur Termin-Konfiguration</button>
         </div>
-        <div class="calendar-legend">
-            <span class="legend-item"><span class="legend-color current"></span> Aktuelle Termine</span>
-            <span class="legend-item"><span class="legend-color planned"></span> Geplante Termine</span>
-            <span class="legend-item"><span class="legend-color completed"></span> Abgeschlossene Termine</span>
-            <span class="legend-item"><span class="legend-color your-bookings"></span> Ihre Termine</span>
-        </div>
     </div>
     
     <div class="calendar-options">

Web/templates/terminplaner.html

@@ -71,6 +71,7 @@
                     <div class="border rounded-3 p-3">
                         <div class="d-flex flex-column flex-lg-row justify-content-between gap-3">
                             <div>
+                                <h3 class="h6 fw-bold mb-1">{{ event.title or "Terminplan" }}</h3>
                                 <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 %}

Web/templates/upload_admin.html

@@ -155,6 +155,27 @@
         background-color: #1e7e34;
     }
 
+    /* Quagga Scanner Video Styles */
+    #code4-scanner video, #code4-scanner canvas,
+    #isbn-scanner video, #isbn-scanner canvas {
+        width: 100%;
+        max-width: 640px;
+        height: auto;
+        border-radius: 5px;
+        box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+    }
+    
+    #code4-scanner canvas, #isbn-scanner canvas {
+        position: absolute;
+        top: 0;
+        left: 0;
+    }
+    
+    #code4-scanner, #isbn-scanner {
+        position: relative;
+        overflow: hidden;
+    }
+
     /* ISBN input group styling */
     .isbn-input-group {
         display: flex;
@@ -840,7 +861,7 @@
                     </div>
                 </div>
                 
-                <h3>Thema:</h3>
+                <h3>Schlagwort:</h3>
                 <div class="multi-filter">
                     <div class="form-group">
                         <label for="filter3-1">Wert 1:</label>
@@ -1003,8 +1024,8 @@
     // Quagga2 engine state management properties
     let scannerRunning = false;
     let activeScannerCallback = null; // Dynamically handles routing data to the active caller field
-    let code4LastScanned = '';
-    let code4LastScannedAt = 0;
+    var code4LastScanned = '';
+    var code4LastScannedAt = 0;
 
     function setCode4ScanStatus(message, isError = false) {
         const statusEl = document.getElementById('code4-scan-status');
@@ -1103,7 +1124,7 @@
     // Unified tracking capture listener
     Quagga.onDetected(function(data) {
         if (!data || !data.codeResult || !data.codeResult.code) return;
-        
+
         const rawBarcode = String(data.codeResult.code || '').trim();
         const currentTargetCallback = activeScannerCallback;
 
@@ -1112,10 +1133,10 @@
         }
     });
 
-    // Globale Variablen für den Scanner-Status (falls nicht schon woanders definiert)
-    let code4LastScanned = '';
-    let code4LastScannedAt = 0;
-    
+    // Globale Variablen für den Scanner-Status
+    var code4LastScanned = '';
+    var code4LastScannedAt = 0;
+
     /**
      * Schaltet das UI basierend auf dem ausgewählten Modus um
      */
@@ -1125,7 +1146,6 @@
         const scanButton = document.getElementById('scan-code4-btn');
         const scannerBox = document.getElementById('code4-scanner');
         
-        // Scanner stoppen, falls der Modus gewechselt wird und er noch läuft
         if (scannerBox && scannerBox.style.display !== 'none') {
             if (typeof killScannerHardware === 'function') killScannerHardware();
             scannerBox.style.display = 'none';
@@ -1133,14 +1153,14 @@
         }
     
         if (mode === 'range') {
-            rangeGroup.style.display = 'block';
-            if(scanButton) scanButton.style.display = 'none'; // Verstecke Scanner im Range-Modus
+            if(rangeGroup) rangeGroup.style.display = 'block';
+            if(scanButton) scanButton.style.display = 'none'; 
         } else {
-            rangeGroup.style.display = 'none';
+            if(rangeGroup) rangeGroup.style.display = 'none'; // Hier wurde der Fehler korrigiert
             if(scanButton) scanButton.style.display = 'inline-block';
         }
     }
-    
+
     /**
      * Generiert eine Liste von Codes basierend auf den Eingaben
      */
@@ -1148,49 +1168,42 @@
         const prefix = document.getElementById('range_prefix').value.trim();
         const startStr = document.getElementById('range_start').value.trim();
         const endStr = document.getElementById('range_end').value.trim();
-        
+
         const start = parseInt(startStr, 10);
         const end = parseInt(endStr, 10);
-        
-        // Die Länge des End-Wertes bestimmt das Padding (die führenden Nullen)
-        // Beispiel: Ende = "050" -> Länge 3 -> "001", "002", etc.
+
         const paddingLength = endStr.length; 
-    
+
         if (isNaN(start) || isNaN(end) || start > end) {
             alert("Bitte gültige Zahlen für Start und Ende eingeben. Der Startwert darf nicht größer als der Endwert sein.");
             return;
         }
-    
+
         let generatedCodes = [];
         for (let i = start; i <= end; i++) {
-            // Nullen auffüllen
             let numStr = i.toString().padStart(paddingLength, '0');
             generatedCodes.push(`${prefix}${numStr}`);
         }
-    
+
         const codeField = document.getElementById('code_4');
         const individualCodesArea = document.getElementById('individual_codes');
-    
+
         if (generatedCodes.length > 0) {
-            // 1. Basis-Code setzen (falls leer oder wenn wir komplett neu generieren)
             if (!codeField.value || confirm("Soll der aktuelle Basis-Code überschrieben werden?")) {
                 codeField.value = generatedCodes[0];
                 if (typeof validateCodeField === 'function') validateCodeField(codeField);
-                generatedCodes.shift(); // Den ersten aus dem Array entfernen, da er im Basis-Feld steht
+                generatedCodes.shift(); 
             }
-            
-            // 2. Den Rest in die Textarea einfügen
+
             if (generatedCodes.length > 0) {
                 let existing = individualCodesArea.value.trim();
-                // Wenn schon was drin steht, machen wir einen Zeilenumbruch, sonst nicht
                 individualCodesArea.value = existing ? existing + '\n' + generatedCodes.join('\n') : generatedCodes.join('\n');
             }
-            
-            // Visuelles Feedback
+
             alert(`Bereich erfolgreich generiert! (${end - start + 1} Codes)`);
         }
     }
-    
+
     /**
      * Scanner-Funktion (Single & Continuous Modus)
      */
@@ -1200,39 +1213,38 @@
         const codeField = document.getElementById('code_4');
         const individualCodesArea = document.getElementById('individual_codes');
         const scanMode = document.getElementById('scan_mode').value;
-    
+
         if (!scannerBox || !scanButton || !codeField) return;
-    
+
         // Beende evtl. laufenden ISBN Scanner
         const isbnScannerBox = document.getElementById('isbn-scanner');
         if (isbnScannerBox && isbnScannerBox.style.display !== 'none') {
-            if (typeof killScannerHardware === 'function') killScannerHardware();
+            killScannerHardware();
             isbnScannerBox.style.display = 'none';
             const isbnScanButton = document.getElementById('scan-isbn-btn');
-            if (isbnScanButton) isbnScanButton.textContent = 'ISBN scannen';
+            if (isbnScanButton) isbnScanButton.textContent = 'Barcode scannen';
             if (typeof setIsbnScanStatus === 'function') setIsbnScanStatus('Scanner gestoppt.');
         }
-    
+
         // Scanner ausschalten, wenn er bereits läuft
         if (scannerBox.style.display !== 'none') {
-            if (typeof killScannerHardware === 'function') killScannerHardware();
+            killScannerHardware();
             scannerBox.style.display = 'none';
             scanButton.textContent = 'Barcode scannen';
             if (typeof setCode4ScanStatus === 'function') setCode4ScanStatus('Scanner gestoppt.');
             return;
         }
-    
+
         // Scanner starten
         scannerBox.style.display = 'block';
         scanButton.textContent = scanMode === 'continuous' ? 'Fortlaufenden Scan stoppen' : 'Scanner stoppen';
         if (typeof setCode4ScanStatus === 'function') setCode4ScanStatus('Scanner initialisiert. Richte die Kamera auf den Barcode...');
-    
+
         if (typeof runEngineInitialization === 'function') {
             runEngineInitialization(
                 '#code4-scanner', 
                 function(decodedText) {
                     const now = Date.now();
-                    // Verhindere Doppel-Scans desselben Codes innerhalb von 1.5 Sekunden
                     if (decodedText === code4LastScanned && (now - code4LastScannedAt) < 1500) {
                         return;
                     }
@@ -1240,30 +1252,25 @@
                     code4LastScannedAt = now;
                 
                     if (scanMode === 'single') {
-                        // VERHALTEN: Einzel-Scan
-                        if (typeof killScannerHardware === 'function') killScannerHardware();
+                        killScannerHardware();
                         scannerBox.style.display = 'none';
                         scanButton.textContent = 'Barcode scannen';
                     
                         codeField.value = decodedText;
                         if (typeof validateCodeField === 'function') validateCodeField(codeField);
                         if (typeof setCode4ScanStatus === 'function') setCode4ScanStatus(`Code gesetzt: ${decodedText}`);
-                        
+
                     } else if (scanMode === 'continuous') {
-                        // VERHALTEN: Fortlaufender Scan
                         let currentAreaCodes = individualCodesArea.value.split('\n').map(c => c.trim()).filter(c => c !== '');
-                        
+
                         if (!codeField.value) {
-                            // Basis-Code setzen, falls noch leer
                             codeField.value = decodedText;
                             if (typeof validateCodeField === 'function') validateCodeField(codeField);
                             if (typeof setCode4ScanStatus === 'function') setCode4ScanStatus(`Basis-Code gesetzt: ${decodedText}`);
                         } else if (!currentAreaCodes.includes(decodedText) && codeField.value !== decodedText) {
-                            // In Textarea anhängen, falls Code noch nicht existiert
                             individualCodesArea.value += (individualCodesArea.value ? '\n' : '') + decodedText;
                             if (typeof setCode4ScanStatus === 'function') setCode4ScanStatus(`Zusatz-Code erfasst: ${decodedText}`);
-                            
-                            // Audio-Feedback für kontinuierliches Scannen (optional, aber sehr hilfreich)
+
                             try {
                                 const audioCtx = new (window.AudioContext || window.webkitAudioContext)();
                                 const oscillator = audioCtx.createOscillator();
@@ -1271,7 +1278,7 @@
                                 oscillator.connect(gainNode);
                                 gainNode.connect(audioCtx.destination);
                                 oscillator.type = 'sine';
-                                oscillator.frequency.value = 800; // Hoher Beep
+                                oscillator.frequency.value = 800; 
                                 gainNode.gain.setValueAtTime(0.1, audioCtx.currentTime);
                                 oscillator.start();
                                 oscillator.stop(audioCtx.currentTime + 0.1);
@@ -1286,14 +1293,15 @@
                 'Scanner läuft. Richte die Kamera auf den Barcode.',
                 setCode4ScanStatus
             );
-        } else {
-            console.error("runEngineInitialization is not defined. Ensure your scanner script is loaded.");
         }
     }
-    
+
+    /**
+     * ISBN Scanner-Funktion
+     */
     function startIsbnScanner() {
         if (!libraryModuleEnabled) {
-            setIsbnScanStatus('Bibliotheks-Modul ist deaktiviert.', true);
+            if (typeof setIsbnScanStatus === 'function') setIsbnScanStatus('Bibliotheks-Modul ist deaktiviert.', true);
             return;
         }
         const scannerBox = document.getElementById('isbn-scanner');
@@ -1301,21 +1309,20 @@
         const isbnField = document.getElementById('isbn');
         if (!scannerBox || !scanButton || !isbnField) return;
 
-        // Automatically clean up running Base Code_4 scanner to prevent track multi-binding
         const codeScannerBox = document.getElementById('code4-scanner');
         const codeScanButton = document.getElementById('scan-code4-btn');
         if (codeScannerBox && codeScannerBox.style.display !== 'none') {
             killScannerHardware();
-            if (codeScannerBox) codeScannerBox.style.display = 'none';
-            if (codeScanButton) codeScanButton.textContent = 'Barcode scannen';
-            setCode4ScanStatus('Scanner gestoppt.');
+            codeScannerBox.style.display = 'none';
+            codeScanButton.textContent = 'Barcode scannen';
+            if (typeof setCode4ScanStatus === 'function') setCode4ScanStatus('Scanner gestoppt.');
         }
 
         if (scannerBox.style.display !== 'none') {
             killScannerHardware();
             scannerBox.style.display = 'none';
-            scanButton.textContent = 'ISBN scannen';
-            setIsbnScanStatus('Scanner gestoppt.');
+            scanButton.textContent = 'Barcode scannen';
+            if (typeof setIsbnScanStatus === 'function') setIsbnScanStatus('Scanner gestoppt.');
             return;
         }
 
@@ -1327,18 +1334,17 @@
             function(decodedText) {
                 killScannerHardware();
                 scannerBox.style.display = 'none';
-                scanButton.textContent = 'ISBN scannen';
+                scanButton.textContent = 'Barcode scannen';
 
-                const normalizedIsbn = normalizeIsbnClient(decodedText);
+                const normalizedIsbn = typeof normalizeIsbnClient === 'function' ? normalizeIsbnClient(decodedText) : decodedText;
                 isbnField.value = normalizedIsbn || decodedText;
-                updateIsbnLiveValidation();
+                if (typeof updateIsbnLiveValidation === 'function') updateIsbnLiveValidation();
 
                 if (normalizedIsbn) {
-                    setIsbnScanStatus(`ISBN gesetzt: ${normalizedIsbn}`);
-                    // Automatically load book metadata after a valid ISBN scan.
-                    fetchBookInfo('upload');
+                    if (typeof setIsbnScanStatus === 'function') setIsbnScanStatus(`ISBN gesetzt: ${normalizedIsbn}`);
+                    if (typeof fetchBookInfo === 'function') fetchBookInfo('upload');
                 } else {
-                    setIsbnScanStatus('Kein gültiges ISBN-Format erkannt, der gescannte Wert bleibt aber im Feld.', true);
+                    if (typeof setIsbnScanStatus === 'function') setIsbnScanStatus('Kein gültiges ISBN-Format erkannt, der gescannte Wert bleibt aber im Feld.', true);
                 }
             },
             'Scanner läuft. Bitte ISBN-Code erfassen.',
@@ -1346,6 +1352,32 @@
         );
     }
 
+    // --- WICHTIG: Event Listener Binden sobald DOM geladen ist ---
+    document.addEventListener('DOMContentLoaded', function() {
+        // 1. Basis-Code Scanner Button aktivieren
+        const scanCode4Btn = document.getElementById('scan-code4-btn');
+        if (scanCode4Btn) {
+            scanCode4Btn.addEventListener('click', startCode4Scanner);
+        }
+
+        // 2. ISBN Scanner Button aktivieren
+        const scanIsbnBtn = document.getElementById('scan-isbn-btn');
+        if (scanIsbnBtn) {
+            scanIsbnBtn.addEventListener('click', startIsbnScanner);
+        }
+
+        // 3. Dropdown-Modus Wechsel überwachen
+        const scanModeSelect = document.getElementById('scan_mode');
+        if (scanModeSelect) {
+            scanModeSelect.addEventListener('change', toggleScanMode);
+        }
+
+        // 4. ISBN Live-Validierung
+        const isbnInput = document.getElementById('isbn');
+        if (isbnInput && typeof updateIsbnLiveValidation === 'function') {
+            isbnInput.addEventListener('input', updateIsbnLiveValidation);
+        }
+    });
     // Load predefined filter values for dropdowns
     function loadPredefinedFilterValues(filterNumber) {
         fetch(`/get_predefined_filter_values/${filterNumber}`)
@@ -1871,16 +1903,6 @@
             });
         }
 
-        const scanCodeBtn = document.getElementById('scan-code4-btn');
-        if (scanCodeBtn) {
-            scanCodeBtn.addEventListener('click', startCode4Scanner);
-        }
-
-        const scanIsbnBtn = document.getElementById('scan-isbn-btn');
-        if (scanIsbnBtn) {
-            scanIsbnBtn.addEventListener('click', startIsbnScanner);
-        }
-
         const isbnField = document.getElementById('isbn');
         if (isbnField) {
             isbnField.addEventListener('input', updateIsbnLiveValidation);

manage-tenant.sh

@@ -213,6 +213,7 @@ existing['modules'] = {
     'library': {'enabled': True},
     'student_cards': {'enabled': True, 'default_borrow_days': 14, 'max_borrow_days': 365},
         'terminplan': {'enabled': True},
+    'mail': {'enabled': True},
 }
 existing['trial'] = trial_config