Debug changes

Web/app.py

@@ -46,7 +46,7 @@ import Web.modules.inventarsystem.pdf_export as pdf_export
 import Web.modules.inventarsystem.excel_export as excel_export
 import datetime
 from apscheduler.schedulers.background import BackgroundScheduler
-from bson.objectid import ObjectId
+from bson.objectid import ObjectId, InvalidId
 from urllib.parse import urlparse, urlunparse
 import requests
 import csv
@@ -3332,7 +3332,12 @@ def api_library_items():
             'User': 1,
             'Ort': 1,
             'Beschreibung': 1,
-            'Image': 1
+            'Image': 1,
+            'SeriesGroupId': 1,
+            'SeriesCount': 1,
+            'SeriesPosition': 1,
+            'IsGroupedSubItem': 1,
+            'ParentItemId': 1,
         }
 
         total_count = items_db.count_documents(query)
@@ -3360,6 +3365,10 @@ def api_library_items():
                 'Beschreibung': 1,
                 'Image': 1,
                 'ParentItemId': 1,
+                'SeriesGroupId': 1,
+                'SeriesCount': 1,
+                'SeriesPosition': 1,
+                'IsGroupedSubItem': 1,
             }
             child_items = list(items_db.find({
                 'ParentItemId': {'$in': parent_ids_list},
@@ -3473,6 +3482,48 @@ def api_library_items():
         return jsonify({'error': 'An error occurred while fetching library items'}), 500
 
 
+@app.route('/api/library_group/<series_group_id>')
+def api_library_group(series_group_id):
+    """Fetch all items belonging to one library series group."""
+    if 'username' not in session:
+        return jsonify({'items': []}), 401
+
+    try:
+        client = MongoClient(MONGODB_HOST, MONGODB_PORT)
+        db = client[MONGODB_DB]
+        items_col = db['items']
+
+        query = {
+            'SeriesGroupId': series_group_id,
+            'Deleted': {'$ne': True},
+            'ItemType': {'$in': ['book', 'cd', 'dvd', 'schoolbook', 'schulbuch', 'Buch', 'Schulbuch']},
+        }
+        projection = {
+            'Name': 1,
+            'ISBN': 1,
+            'Code_4': 1,
+            'Code4': 1,
+            'ItemType': 1,
+            'Ort': 1,
+            'Beschreibung': 1,
+            'SeriesGroupId': 1,
+            'SeriesCount': 1,
+            'SeriesPosition': 1,
+            'IsGroupedSubItem': 1,
+            'ParentItemId': 1,
+        }
+
+        items = list(items_col.find(query, projection).sort([('SeriesPosition', 1), ('Name', 1), ('_id', 1)]))
+        for item in items:
+            item['_id'] = str(item['_id'])
+
+        client.close()
+        return jsonify({'items': items, 'count': len(items), 'series_group_id': series_group_id})
+    except Exception as exc:
+        app.logger.error('Error loading library group %s: %s', series_group_id, exc)
+        return jsonify({'items': [], 'message': 'Gruppe konnte nicht geladen werden.'}), 500
+
+
 @app.route('/api/library_scan_action', methods=['POST'])
 def api_library_scan_action():
     """
@@ -3737,6 +3788,7 @@ def api_item_detail(item_id):
         <h2>{html.escape(str(item.get('Name', 'Untitled')))}</h2>
         <p><strong>ISBN:</strong> {html.escape(str(item.get('ISBN', item.get('Code4', '-'))))}</p>
         <p><strong>Anzahl:</strong> {html.escape(str(item.get('SeriesCount', '-')))}</p>
+        <p><strong>Code:</strong> {html.escape(str(item.get('Code_4', '-')))}</p>
         <p><strong>Ort:</strong> {html.escape(str(item.get('Ort', '-')))}</p>
         <p><strong>Typ:</strong> {html.escape(str(item.get('ItemType', '-')))}</p>
         <p><strong>Kategorie:</strong> {html.escape(str(item.get('library_category', '-')))}</p>
@@ -5729,7 +5781,7 @@ def upload_item():
                 app.logger.warning('Audit write failed for library_item_created')
 
         flash(success_msg, 'success')
-        return redirect(url_for(success_redirect_endpoint, highlight_item=str(item_id)))
+        return redirect(url_for(success_redirect_endpoint))
     else:
         error_msg = 'Fehler beim Hinzufügen des Elements'
         if is_mobile:
@@ -6315,6 +6367,170 @@ def edit_item(id):
     return redirect(url_for('home_admin'))
 
 
+@app.route('/item_edit/<id>', methods=['GET', 'POST'])
+def item_edit(id):
+    """
+    Endpoint zum Laden und Aktualisieren eines Eintrags (item_edit).
+    """
+    # 1. Rechte- & Auth-Check
+    if 'username' not in session:
+        if request.method == 'POST' and request.is_json:
+            return jsonify({'success': False, 'message': 'Nicht angemeldet.'}), 401
+        flash('Bitte melden Sie sich an.', 'error')
+        return redirect(url_for('login'))
+
+    current_permissions = us.get_effective_permissions(session['username'])
+    if not current_permissions['actions'].get('can_edit', False):
+        if request.method == 'POST' and request.is_json:
+            return jsonify({'success': False, 'message': 'Keine Berechtigung zum Bearbeiten.'}), 403
+        flash('Keine Berechtigung zum Bearbeiten.', 'error')
+        return redirect(url_for('home_admin'))
+
+    try:
+        obj_id = ObjectId(id)
+    except InvalidId:
+        flash('Ungültige Element-ID.', 'error')
+        return redirect(url_for('home_admin'))
+
+
+    # --- GET: Template anzeigen ---
+    if request.method == 'GET':
+        item = it.get_item(id)
+        if not item:
+            flash('Element nicht gefunden.', 'error')
+            return redirect(url_for('home_admin'))
+
+        item['_id'] = str(item['_id'])
+        show_library = cfg.MODULES.is_enabled('library')
+
+        return render_template(
+            'edit_library.html',
+            username=session['username'],
+            item=item,
+            library_module_enabled=show_library,
+            show_library_features=show_library,
+            page_title=f"Bearbeiten: {item.get('Name', '')}"
+        )
+
+    # --- POST: Speichern ---
+    redirect_target = request.referrer or url_for('home_admin')
+    current_item = it.get_item(obj_id)
+
+    if not current_item:
+        flash('Element in der Datenbank nicht gefunden.', 'error')
+        return redirect(redirect_target)
+
+    # Formulardaten auslesen und bereinigen
+    name = sanitize_form_value(request.form.get('name'))
+    ort = sanitize_form_value(request.form.get('ort'))
+    beschreibung = sanitize_form_value(request.form.get('beschreibung'))
+    code_4 = sanitize_form_value(request.form.get('code_4'))
+    isbn_raw = sanitize_form_value(request.form.get('isbn', ''))
+
+    anschaffungs_jahr = sanitize_form_value(request.form.get('anschaffungsjahr'))
+    anschaffungs_kosten = sanitize_form_value(request.form.get('anschaffungskosten'))
+    reservierbar = 'reservierbar' in request.form
+
+    item_type_input = sanitize_form_value(request.form.get('item_type_input'))
+    library_category = sanitize_form_value(request.form.get('library_category'))
+
+    filter1 = expand_filter_selection(sanitize_form_value(request.form.getlist('filter')), 1)
+    filter2 = expand_filter_selection(sanitize_form_value(request.form.getlist('filter2')), 2)
+    filter3 = sanitize_form_value(request.form.getlist('filter3'))
+
+    # WICHTIG: Den aktuellen Verfügbarkeitsstatus aus der Datenbank übernehmen
+    verfuegbar = current_item.get('Verfuegbar', True)
+
+    # Barcode Prüfen
+    if code_4 and not it.is_code_unique(code_4, exclude_id=str(id)):
+        flash(f'Der Code "{code_4}" wird bereits verwendet.', 'error')
+        return redirect(redirect_target)
+
+    # ISBN und Medientyp verarbeiten
+    item_isbn = ''
+    item_type = item_type_input or current_item.get('ItemType', 'general')
+    if cfg.MODULES.is_enabled('library') and isbn_raw:
+        item_isbn = normalize_and_validate_isbn(isbn_raw)
+        if not item_isbn:
+            flash('Ungültiges ISBN-Format.', 'error')
+            return redirect(redirect_target)
+
+    # Bilder verarbeiten (GridFS)
+    images_to_keep = request.form.getlist('existing_images')
+    original_images = current_item.get('Images', [])
+    images = [img for img in original_images if img in images_to_keep]
+
+    new_files = request.files.getlist('images')
+    if new_files and new_files[0].filename != '':
+        fs = get_gridfs()
+        for file in new_files:
+            if file and file.filename:
+                is_allowed, error_msg = allowed_file(file.filename, file)
+                if not is_allowed:
+                    flash(error_msg, 'error')
+                    return redirect(redirect_target)
+
+                try:
+                    secure_name = secure_filename(file.filename)
+                    file.seek(0)
+                    image_bytes = file.read()
+
+                    if not image_bytes:
+                        continue
+
+                    optimized_io = io.BytesIO()
+                    with Image.open(io.BytesIO(image_bytes)) as img:
+                        if img.mode not in ('RGB', 'RGBA'):
+                            img = img.convert('RGBA')
+
+                        max_width = 800
+                        if img.width > max_width:
+                            ratio = max_width / img.width
+                            img = img.resize((max_width, int(img.height * ratio)), Image.Resampling.LANCZOS)
+
+                        img.save(optimized_io, format='WEBP', quality=85, optimize=True)
+
+                    optimized_io.seek(0)
+                    new_filename = f"{uuid.uuid4().hex}_{int(time.time())}.webp"
+
+                    fs.put(
+                        optimized_io,
+                        filename=new_filename,
+                        content_type='image/webp',
+                        metadata={'original_filename': secure_name, 'item_id': str(id)}
+                    )
+                    images.append(new_filename)
+                except Exception as e:
+                    app.logger.error(f"Bild-Fehler bei Item {id}: {e}")
+
+    if ort and ort not in it.get_predefined_locations():
+        it.add_predefined_location(ort)
+
+    success = it.update_item(
+        id=str(id),
+        name=name,
+        ort=ort,
+        beschreibung=beschreibung,
+        images=images,
+        verfuegbar=verfuegbar,
+        filter1=filter1,
+        filter2=filter2,
+        filter3=filter3,
+        ansch_jahr=anschaffungs_jahr,
+        ansch_kost=anschaffungs_kosten,
+        code_4=code_4,
+        reservierbar=reservierbar,
+        isbn=item_isbn,
+        item_type=item_type
+    )
+
+    if success:
+        flash('Artikel erfolgreich aktualisiert.', 'success')
+    else:
+        flash('Fehler beim Aktualisieren des Artikels.', 'error')
+
+    return redirect(redirect_target)
+
 @app.route('/update_group', methods=['POST'])
 def update_group():
 
@@ -6336,17 +6552,20 @@ def update_group():
 
     # 1. Shared Fields (Group Logic)
     # These apply to every item in the group
-    shared_update = {
-        'Name': data.get('name'),
-        'Ort': data.get('ort'),
-        'Beschreibung': data.get('beschreibung'),
-        'Anschaffungsjahr': data.get('ansch_jahr'),
-        'Anschaffungskosten': data.get('ansch_kost'),
-        'Reservierbar': data.get('reservierbar'),
-        'ISBN': data.get('isbn'),
-        'ItemType': data.get('item_type'),
-        'LastUpdated': datetime.datetime.now()
-    }
+    shared_update = {'LastUpdated': datetime.datetime.now()}
+    for source_key, target_key in (
+        ('name', 'Name'),
+        ('ort', 'Ort'),
+        ('beschreibung', 'Beschreibung'),
+        ('ansch_jahr', 'Anschaffungsjahr'),
+        ('ansch_kost', 'Anschaffungskosten'),
+        ('reservierbar', 'Reservierbar'),
+        ('isbn', 'ISBN'),
+        ('item_type', 'ItemType'),
+    ):
+        value = data.get(source_key)
+        if value is not None:
+            shared_update[target_key] = value
 
     # 2. Individual Updates (Specific Code Logic)
     # Expected format: [{'id': '...', 'code_4': '...'}, ...]
@@ -7643,7 +7862,7 @@ def user_del():
                 last_name = ""
                 fullname = None
             users_list.append({
-                'username': username,
+                'username': decrypt_text(username),
                 'admin': user.get('Admin', False),
                 'fullname': fullname,
                 'name': name,

Web/modules/database/user.py

@@ -650,7 +650,7 @@ def add_user(
         safe_last_name = last_name.strip() if last_name else ''
 
         user_doc = {
-            'Username': dp.encrypt_text(username),
+            'Username': username,
             'Password': hashing(password),
             'Admin': (permission_preset == "full_access"),
             'active_ausleihung': None,

Web/templates/library_table.html

@@ -524,7 +524,7 @@
                 <option value="card_only">Nur Ausweis erfassen</option>
                 <option value="quick_toggle">Schnellmodus: Ausweis + Mediencode</option>
             </select>
-            <input type="text" id="activeStudentCard" placeholder="Aktiver Ausweis (gescannt)" readonly>
+            <input type="text" id="activeStudentCard" placeholder="Aktiver Ausweis (gescannt)" >
             <input type="text" id="manualItemCode" placeholder="Manueller Mediencode (optional)" style="min-width:180px;">
             <button id="resetCardBtn" class="button" type="button">Ausweis löschen</button>
             <button id="toggleScannerBtn" class="button" type="button">Scanner starten</button>
@@ -669,6 +669,11 @@
     let keyboardScanBuffer = '';
     let keyboardLastKeyAt = 0;
     const KEYBOARD_SCAN_INTERCHAR_MS = 100; // max time between keystrokes to consider them one scan
+    let editLibraryState = {
+        itemId: '',
+        seriesGroupId: '',
+        groupMembers: []
+    };
     
     const canEditLibraryItems = (document.getElementById('libraryTableContainer')?.dataset.canEdit === '1');
 
@@ -795,7 +800,7 @@
             return `
         <tr>
             <td class="table-title">${escapeHtml(item.Name || 'Untitled')}</td>
-            <td>${escapeHtml(item.ISBN || item.Code_4 || item.Code4 || '-')}</td>
+            <td>${escapeHtml(item.ISBN || '-')}</td>
             <td>${getItemTypeLabel(item.ItemType || 'book')}</td>
             <td style="font-weight:600; text-align:center;">${item.Quantity || item.GroupedDisplayCount || 1}</td>
             <td>
@@ -1022,20 +1027,55 @@
     }
 
     async function processQuickToggleScan(scannedCode) {
+        // 1. Prüfen, ob "Nur Rückgabe"-Modus aktiv ist
+        const returnOnly = (document.getElementById('returnOnlyToggle') || {}).checked;
+        if (returnOnly) {
+            await returnByCode(scannedCode);
+            return;
+        }
+
+        // 2. Wenn kein Ausweis gesetzt ist, wird der Code als Ausweis interpretiert
         if (!activeStudentCardId) {
-            // If return-only mode is active, always attempt to return by code
-            const returnOnly = (document.getElementById('returnOnlyToggle') || {}).checked;
-            if (returnOnly) {
-                await returnByCode(scannedCode);
+            setActiveStudentCard(scannedCode);
+            setScanStatus(`Ausweis gesetzt: ${activeStudentCardId}`, 'ok');
+            return;
+        }
+
+        // 3. Ausleihe/Rückgabe verarbeiten (wenn Ausweis vorhanden)
+        try {
+            setScanStatus('Verarbeite Mediencode...', 'warn');
+            const response = await fetch('/api/library_scan_action', {
+                method: 'POST',
+                headers: {'Content-Type': 'application/json'},
+                body: JSON.stringify({
+                    student_card_id: activeStudentCardId,
+                    item_code: scannedCode
+                })
+            });
+
+            const result = await response.json();
+            if (!response.ok || !result.ok) {
+                setScanStatus(result.message || 'Scan-Aktion fehlgeschlagen.', 'error');
                 return;
             }
 
-            if (!activeStudentCardId) {
-                setActiveStudentCard(scannedCode);
-                setScanStatus(`Ausweis gesetzt: ${activeStudentCardId}`, 'ok');
-                return;
+            if (result.action === 'borrowed') {
+                setScanStatus(`Ausgeliehen: ${result.item_name}`, 'ok');
+                showSmallConfirm(`Ausgeliehen: ${result.item_name}`, 'ok');
+            } else if (result.action === 'returned') {
+                setScanStatus(`Zurückgegeben: ${result.item_name}`, 'ok');
+                showSmallConfirm(`Zurückgegeben: ${result.item_name}`, 'ok');
+            } else {
+                setScanStatus(result.message || 'Aktion durchgeführt.', 'ok');
+                showSmallConfirm(result.message || 'Aktion durchgeführt.', 'ok');
             }
-    
+
+            await loadLibraryItems();
+        } catch (err) {
+            console.error('Quick scan action failed:', err);
+            setScanStatus('Fehler beim Verarbeiten des Scans.', 'error');
+        }
+    }
 
     async function returnByCode(code) {
         if (!code) return;
@@ -1063,40 +1103,6 @@
             return false;
         }
     }
-        try {
-            setScanStatus('Verarbeite Mediencode...', 'warn');
-            const response = await fetch('/api/library_scan_action', {
-                method: 'POST',
-                headers: {'Content-Type': 'application/json'},
-                body: JSON.stringify({
-                    student_card_id: activeStudentCardId,
-                    item_code: scannedCode
-                })
-            });
-        
-            const result = await response.json();
-            if (!response.ok || !result.ok) {
-                setScanStatus(result.message || 'Scan-Aktion fehlgeschlagen.', 'error');
-                return;
-            }
-        
-            if (result.action === 'borrowed') {
-                setScanStatus(`Ausgeliehen: ${result.item_name}`, 'ok');
-                showSmallConfirm(`Ausgeliehen: ${result.item_name}`, 'ok');
-            } else if (result.action === 'returned') {
-                setScanStatus(`Zurückgegeben: ${result.item_name}`, 'ok');
-                showSmallConfirm(`Zurückgegeben: ${result.item_name}`, 'ok');
-            } else {
-                setScanStatus(result.message || 'Aktion durchgeführt.', 'ok');
-                showSmallConfirm(result.message || 'Aktion durchgeführt.', 'ok');
-            }
-        
-            await loadLibraryItems();
-        } catch (err) {
-            console.error('Quick scan action failed:', err);
-            setScanStatus('Fehler beim Verarbeiten des Scans.', 'error');
-        }
-    }
 
     function scanIntoEditCode() {
         const scanReaderWrap = document.getElementById('scanReaderWrap');
@@ -1105,15 +1111,15 @@
         if (!scanReaderWrap || !editCodeInput || !scanEditBtn) {
             return;
         }
-    
+
         if (scannerRunning && scanReaderWrap.style.display !== 'none') {
             stopScanner();
             scanEditBtn.textContent = 'Barcode scannen';
             return;
         }
-    
+
         scanEditBtn.textContent = 'Scanner schließen';
-    
+
         startScanner(function(decodedText) {
             editCodeInput.value = decodedText;
             if(typeof validateCodeField === "function") {
@@ -1132,16 +1138,16 @@
             alert('Dieses Medium ist als defekt/zerstört markiert und kann nicht ausgeliehen werden.');
             return;
         }
-    
+
         const defaultCardId = activeStudentCardId || '';
         const cardId = (window.prompt('Bitte Schülerausweis-ID eingeben:', defaultCardId) || '').trim().toUpperCase();
         if (!cardId) {
             alert('Ausleihe abgebrochen: Für Bibliotheksmedien ist eine gültige Schülerausweis-ID erforderlich.');
             return;
         }
-    
+
         setActiveStudentCard(cardId);
-    
+
         const durationInput = (window.prompt('Ausleihdauer in Tagen (optional):') || '').trim();
         const maxAvailable = Math.max(1, parseInt(selectedItem?.AvailableGroupedCount || selectedItem?.Quantity || 1, 10) || 1);
         const countPrompt = (window.prompt(`Anzahl ausleihen? (Standard: 1, verfügbar: ${maxAvailable})`, '1') || '').trim();
@@ -1153,29 +1159,29 @@
             alert(`Es sind nur ${maxAvailable} Exemplar(e) verfügbar.`);
             return;
         }
-    
+
         const form = document.createElement('form');
         form.method = 'POST';
         form.action = `/ausleihen/${itemId}`;
-    
+
         const csrfField = document.createElement('input');
         csrfField.type = 'hidden';
         csrfField.name = 'csrf_token';
         csrfField.value = '{{ csrf_token }}';
         form.appendChild(csrfField);
-    
+
         const cardField = document.createElement('input');
         cardField.type = 'hidden';
         cardField.name = 'borrower_card_id';
         cardField.value = cardId;
         form.appendChild(cardField);
-    
+
         const returnTargetField = document.createElement('input');
         returnTargetField.type = 'hidden';
         returnTargetField.name = 'return_to';
         returnTargetField.value = 'library';
         form.appendChild(returnTargetField);
-    
+
         if (durationInput) {
             const durationField = document.createElement('input');
             durationField.type = 'hidden';
@@ -1183,13 +1189,13 @@
             durationField.value = durationInput;
             form.appendChild(durationField);
         }
-    
+
         const countField = document.createElement('input');
         countField.type = 'hidden';
         countField.name = 'exemplare_count';
         countField.value = String(borrowCount || 1);
         form.appendChild(countField);
-    
+
         document.body.appendChild(form);
         form.submit();
     }
@@ -1216,13 +1222,13 @@
         // auto remove after 3 seconds
         setTimeout(() => { try { if (el && el.parentNode) el.parentNode.removeChild(el); } catch(e){} }, 3000);
     }
-    
+
     function setActiveStudentCard(cardId) {
         activeStudentCardId = (cardId || '').trim().toUpperCase();
         const input = document.getElementById('activeStudentCard');
         if (input) input.value = activeStudentCardId;
     }
-    
+
     function normalizeScannedCode(code) {
         return (code || '').trim();
     }
@@ -1287,7 +1293,7 @@
         const resetBtn = document.getElementById('resetCardBtn');
         const modeSelect = document.getElementById('scanModeSelect');
         const keyboardToggle = document.getElementById('keyboardScannerToggle');
-    
+
         if (toggleBtn) {
             toggleBtn.addEventListener('click', async () => {
                 if (scannerRunning) {
@@ -1297,14 +1303,14 @@
                 }
             });
         }
-    
+
         if (resetBtn) {
             resetBtn.addEventListener('click', () => {
                 setActiveStudentCard('');
                 setScanStatus('Ausweis zurückgesetzt. Bitte neu scannen.', 'warn');
             });
         }
-    
+
         if (modeSelect) {
             modeSelect.addEventListener('change', () => {
                 if (modeSelect.value === 'quick_toggle' && !activeStudentCardId) {
@@ -1330,8 +1336,8 @@
     }
 
     // Run when DOM structure is entirely ready
-    document.addEventListener('DOMContentLoaded', () => {
-        wireScannerUi();       // Setup scanner control buttons 
+    document.addEventListener('DOMContentLoaded', async () => {
+        wireScannerUi();       // Setup scanner control buttons
         loadLibraryItems();   // Fetch your database items right away!
 
         // Safely connect standard Filters and Search inputs inside DOMContentLoaded
@@ -1360,7 +1366,7 @@
                 document.getElementById('filterISBN').value = '';
                 document.getElementById('filterType').value = '';
                 document.getElementById('filterStatus').value = '';
-                activeFilters = { isbn: '', type: '', status: '' };
+                activeFilters = {isbn: '', type: '', status: ''};
                 applyFiltersAndSearch(true);
             });
         }
@@ -1394,44 +1400,94 @@
             });
         }
 
-        // Edit Modal Form processing
         const editForm = document.getElementById('editLibraryForm');
         if (editForm) {
-            editForm.addEventListener('submit', async function(e) {
-                e.preventDefault(); 
+            editForm.addEventListener('submit', async function (e) {
+                e.preventDefault();
 
                 const itemId = document.getElementById('editLibraryItemId').value;
+                const currentItem = libraryItems.find(i => i._id === itemId);
+                if (!currentItem) return;
 
-                const updatedData = {
+                const codeInputs = Array.from(document.querySelectorAll('#editLibraryCodesContainer input[data-item-id]'));
+
+                // Daten aus dem Formular sammeln
+                const sharedPayload = {
                     name: document.getElementById('editLibraryName').value,
                     item_type: document.getElementById('editLibraryType').value,
                     isbn: document.getElementById('editLibraryIsbn').value,
-                    code_4: document.getElementById('editLibraryCode4').value, 
                     ort: document.getElementById('editLibraryLocation').value,
-                    beschreibung: document.getElementById('editLibraryDescription').value
+                    beschreibung: document.getElementById('editLibraryDescription').value,
+                    ansch_jahr: currentItem.Anschaffungsjahr || '',
+                    ansch_kost: currentItem.Anschaffungskosten || '',
+                    reservierbar: currentItem.Reservierbar !== false,
                 };
 
+                const codeByItemId = new Map(codeInputs.map(input => [input.dataset.itemId, (input.value || '').trim()]));
+                const groupMembers = editLibraryState.groupMembers.length > 0 ? editLibraryState.groupMembers : [currentItem];
+                const isGroupedEdit = Boolean(currentItem.SeriesGroupId) && groupMembers.length > 1;
+
+                // API-Aufruf
                 try {
-                    const response = await fetch(`/api/library_item/${itemId}/update`, {
-                        method: 'POST',
-                        headers: {
-                            'Content-Type': 'application/json',
-                            'X-CSRFToken': '{{ csrf_token }}', 
-                            'X-CSRF-Token': '{{ csrf_token }}'
-                        },
-                        body: JSON.stringify(updatedData)
-                    });
+                    if (isGroupedEdit) {
+                        const payload = {
+                            series_group_id: currentItem.SeriesGroupId,
+                            ...sharedPayload,
+                            items: groupMembers.map(member => ({
+                                id: member._id,
+                                code_4: codeByItemId.get(member._id) || ''
+                            }))
+                        };
 
-                    const result = await response.json();
+                        const response = await fetch('/update_group', {
+                            method: 'POST',
+                            headers: {
+                                'Content-Type': 'application/json',
+                                'X-CSRFToken': '{{ csrf_token }}',
+                                'X-CSRF-Token': '{{ csrf_token }}'
+                            },
+                            body: JSON.stringify(payload)
+                        });
 
-                    if (response.ok && result.ok) {
-                        alert(result.message || 'Medium erfolgreich aktualisiert!');
-                        closeEditLibraryModal();
-
-                        pagingState.loading = false; 
-                        loadLibraryItems(); 
+                        const result = await response.json();
+                        if (response.ok && result.success) {
+                            alert(result.message || 'Gruppe erfolgreich aktualisiert!');
+                            closeEditLibraryModal();
+                            pagingState.loading = false;
+                            await loadLibraryItems();
+                        } else {
+                            alert(result.message || 'Fehler beim Speichern der Gruppenänderungen.');
+                        }
                     } else {
-                        alert(result.message || 'Fehler beim Speichern der Änderungen.');
+                        const primaryCodeInput = codeInputs[0];
+                        const payload = {
+                            name: sharedPayload.name,
+                            item_type: sharedPayload.item_type,
+                            isbn: sharedPayload.isbn,
+                            code_4: primaryCodeInput ? primaryCodeInput.value.trim() : (currentItem.Code_4 || currentItem.Code4 || '').trim(),
+                            ort: sharedPayload.ort,
+                            beschreibung: sharedPayload.beschreibung
+                        };
+
+                        const response = await fetch(`/api/library_item/${itemId}/update`, {
+                            method: 'POST',
+                            headers: {
+                                'Content-Type': 'application/json',
+                                'X-CSRFToken': '{{ csrf_token }}',
+                                'X-CSRF-Token': '{{ csrf_token }}'
+                            },
+                            body: JSON.stringify(payload)
+                        });
+
+                        const result = await response.json();
+                        if (response.ok && result.ok) {
+                            alert(result.message || 'Medium erfolgreich aktualisiert!');
+                            closeEditLibraryModal();
+                            pagingState.loading = false;
+                            await loadLibraryItems();
+                        } else {
+                            alert(result.message || 'Fehler beim Speichern der Änderungen.');
+                        }
                     }
                 } catch (error) {
                     console.error('Update failed:', error);
@@ -1441,195 +1497,76 @@
         }
     });
 
-    window.openEditLibraryItem = function(itemId) {
-        const item = libraryItems.find(i => i._id === itemId);
-        if (!item) return;
-
-        // 1. Felder befüllen
-        document.getElementById('editLibraryItemId').value = item._id;
-        document.getElementById('editLibraryName').value = item.Name;
-        document.getElementById('editLibraryType').value = item.ItemType;
-        document.getElementById('editLibraryIsbn').value = item.ISBN || '';
-        document.getElementById('editLibraryCode4').value = item.Code_4 || '';
-        document.getElementById('editLibraryLocation').value = item.Ort;
-        document.getElementById('editLibraryDescription').value = item.Beschreibung;
-
-        // 2. Gruppen-Logik
-        const warningDiv = document.getElementById('editLibraryGroupWarning');
-        const codesContainer = document.getElementById('editLibraryAllCodes');
-
-        if (item.SeriesGroupId) {
-            // Filtern aus dem aktuell geladenen Array
-            let groupMembers = libraryItems.filter(i => i.SeriesGroupId === item.SeriesGroupId);
-
-            // SCHLÜSSEL: Wenn die Anzahl der gefundenen Elemente nicht mit SeriesCount übereinstimmt,
-            // haben wir die Gruppe noch nicht vollständig geladen.
-            if (groupMembers.length < (item.SeriesCount || 0)) {
-                console.warn("Gruppe noch nicht vollständig geladen. Anzeige ggf. unvollständig.");
-                // Optional: Zeige einen Ladehinweis im Modal
-                codesContainer.textContent = "Lade restliche Gruppenmitglieder...";
-            } else {
-                // Daten sind vollständig -> Anzeigen
-                const codeList = groupMembers
-                    .sort((a, b) => (a.SeriesPosition || 0) - (b.SeriesPosition || 0))
-                    .map(m => m.Code_4 || "---")
-                    .join(', ');
-
-                codesContainer.textContent = codeList;
+    async function fetchLibraryGroupMembers(seriesGroupId) {
+        if (!seriesGroupId) return [];
+        try {
+            const response = await fetch(`/api/library_group/${encodeURIComponent(seriesGroupId)}`);
+            if (!response.ok) {
+                throw new Error(`HTTP ${response.status}`);
             }
 
-            document.getElementById('editLibraryGroupCount').textContent = groupMembers.length + " / " + (item.SeriesCount || "?");
-            warningDiv.style.display = 'block';
-        } else {
-            warningDiv.style.display = 'none';
+            const payload = await response.json();
+            return Array.isArray(payload.items) ? payload.items : [];
+        } catch (error) {
+            console.warn('Falling back to loaded library items for group editing:', error);
+            return (libraryItems || []).filter(item => item.SeriesGroupId === seriesGroupId);
         }
-
-        document.getElementById('editLibraryModal').style.display = 'flex';
-    };
-
-    function closeEditLibraryModal() {
-        document.getElementById('editLibraryModal').style.display = 'none';
     }
 
-    /**
-     * Event-Listener für das Formular (Initialisierung)
-     */
-    document.addEventListener('DOMContentLoaded', function() {
-        const editForm = document.getElementById('editLibraryForm');
-        if (editForm) {
-            editForm.addEventListener('submit', async function(e) {
-                e.preventDefault();
+    function renderLibraryGroupCodeFields(groupMembers, currentItemId) {
+        const codesContainer = document.getElementById('editLibraryCodesContainer');
+        const groupWarning = document.getElementById('editLibraryGroupWarning');
+        const groupCount = document.getElementById('editLibraryGroupCount');
+        const groupHint = document.getElementById('editLibraryGroupHint');
 
-                const itemId = document.getElementById('editLibraryItemId').value;
-                const currentItem = libraryItems.find(i => i._id === itemId);
+        if (!codesContainer) return;
 
-                if (!currentItem) return;
+        const items = Array.isArray(groupMembers) ? groupMembers.slice() : [];
+        items.sort((a, b) => (a.SeriesPosition || 0) - (b.SeriesPosition || 0) || String(a.Name || '').localeCompare(String(b.Name || '')));
 
-                // 1. Alle Mitglieder der Gruppe finden, um die Code-Liste aufzubauen
-                const groupMembers = libraryItems.filter(i => i.SeriesGroupId === currentItem.SeriesGroupId);
-                const individualUpdates = groupMembers.map(member => ({
-                    id: member._id,
-                    // Wenn dies das bearbeitete Item ist, nimm den neuen Code, sonst den alten
-                    code_4: (member._id === itemId) ? document.getElementById('editLibraryCode4').value : member.Code_4
-                }));
-
-                // 2. Payload für das Backend bauen
-                const payload = {
-                    series_group_id: currentItem.SeriesGroupId,
-                    name: document.getElementById('editLibraryName').value,
-                    ort: document.getElementById('editLibraryLocation').value,
-                    beschreibung: document.getElementById('editLibraryDescription').value,
-                    isbn: document.getElementById('editLibraryIsbn').value,
-                    item_type: document.getElementById('editLibraryType').value,
-                    items: individualUpdates
-                };
-
-                // 3. Request an die Gruppen-Update Route
-                try {
-                    const response = await fetch('/update_group', {
-                        method: 'POST',
-                        headers: { 'Content-Type': 'application/json' },
-                        body: JSON.stringify(payload)
-                    });
-
-                    const result = await response.json();
-                    if (result.success) {
-                        alert('Gruppe erfolgreich synchronisiert!');
-                        closeEditLibraryModal();
-                        await loadLibraryItems(); // Daten neu laden
-                        // renderTable(); // Ggf. Tabelle neu rendern
-                    } else {
-                        await loadLibraryItems();
-                        closeEditLibraryModal();
-                    }
-                } catch (error) {
-                    console.error('Update failed:', error);
-                    alert('Netzwerkfehler.');
-                }
-            });
+        editLibraryState.groupMembers = items;
 
+        if (groupWarning) {
+            groupWarning.style.display = items.length > 1 ? 'block' : 'none';
         }
-    });
+        if (groupCount) {
+            const totalCount = items.length || 1;
+            const declaredCount = items[0]?.SeriesCount || totalCount;
+            groupCount.textContent = `${totalCount} / ${declaredCount}`;
+        }
+        if (groupHint) {
+            groupHint.textContent = items.length > 1
+                ? 'Jeder Code gehört zu einem eigenen Exemplar. Änderungen werden für alle Codes gespeichert.'
+                : 'Einzelnes Exemplar. Der Code wird direkt gespeichert.';
+        }
+
+        if (!items.length) {
+            codesContainer.innerHTML = '<div style="padding:10px 0; color:#6b7280;">Keine Codes geladen.</div>';
+            return;
+        }
+
+        codesContainer.innerHTML = items.map((member, index) => {
+            const codeValue = member.Code_4 || member.Code4 || '';
+            const labelParts = [];
+            if (member.SeriesPosition !== undefined && member.SeriesPosition !== null) {
+                labelParts.push(`Exemplar ${member.SeriesPosition}`);
+            } else {
+                labelParts.push(`Exemplar ${index + 1}`);
+            }
+            if (member._id === currentItemId) {
+                labelParts.push('aktuelles Medium');
+            }
+            return `
+            <div style="display:flex; flex-direction:column; gap:6px; margin-bottom:10px;">
+                <label for="editLibraryCode-${member._id}" style="font-weight:600; font-size:0.9em; color:var(--ui-text);">${escapeHtml(labelParts.join(' · '))}</label>
+                <input id="editLibraryCode-${member._id}" data-item-id="${escapeHtml(member._id)}" value="${escapeHtml(codeValue)}" placeholder="Mediencode" style="width:100%; padding:8px 10px; border:1px solid #d0d7e2; border-radius:6px;">
+            </div>
+            `;
+        }).join('');
+    }
+
+    function openEditLibraryItem(itemId) {
+        window.location.href = `/item_edit/${itemId}`;
+    }
 </script>
-
-<div id="editLibraryModal" class="modal" style="display:none;">
-    <div class="modal-content" style="max-width: 760px; padding: 25px; border-radius: 8px;">
-        <span class="close" onclick="closeEditLibraryModal()" style="cursor: pointer; float: right; font-size: 24px;">&times;</span>
-        <h3 style="margin-top:0;">Bibliotheksmedium bearbeiten</h3>
-        
-        <!-- Bereich für Gruppen-Informationen (Hier konsolidiert!) -->
-        <div id="editLibraryGroupWarning" style="display:none; background-color: #fff; padding: 15px; border-radius: 6px; margin-bottom: 20px; border: 1px solid #0ea5e9;">
-            <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px; border-bottom: 1px solid #eee; padding-bottom: 10px;">
-                <strong style="color: #0ea5e9;">Gruppen-Range (Total: <span id="editLibraryGroupCount"></span>)</strong>
-            </div>
-            
-            <p style="margin: 5px 0; font-size: 12px; color: #555;">
-                Alle aufgeführten Codes gehören zu diesem Datensatz:
-            </p>
-            
-            <!-- Hier werden die Codes per JS eingefügt -->
-            <div id="editLibraryAllCodes" style="display: flex; flex-wrap: wrap; gap: 5px; margin-top: 10px;"></div>
-            
-            <div style="margin-top: 15px; font-size: 11px; background: #e0f2fe; padding: 8px; border-radius: 4px;">
-                <strong>Hinweis:</strong> Änderungen an Titel/Ort/Beschreibung werden auf <strong>alle</strong> Exemplare der Range übertragen.
-            </div>
-        </div>
-
-        <form id="editLibraryForm">
-            <input type="hidden" id="editLibraryItemId">
-            <div class="edit-grid">
-                <div class="full">
-                    <label for="editLibraryName">Titel</label>
-                    <input id="editLibraryName" required style="width: 100%;">
-                </div>
-                <div>
-                    <label for="editLibraryType">Medientyp</label>
-                    <select id="editLibraryType" style="width: 100%;">
-                        <option value="Buch">Buch</option>
-                        <option value="Schulbuch">Schulbuch</option>
-                        <option value="cd">CD</option>
-                        <option value="dvd">DVD</option>
-                        <option value="other">Sonstige Medien</option>
-                    </select>
-                </div>
-                <div>
-                    <label for="editLibraryIsbn">ISBN</label>
-                    <input id="editLibraryIsbn" placeholder="optional ISBN-10/13" style="width: 100%;">
-                </div>
-                <div>
-                    <label for="editLibraryCode4">Code</label>
-                    <input id="editLibraryCode4" placeholder="optional Mediencode" style="width: 100%;">
-                </div>
-                <div class="full">
-                    <label for="editLibraryLocation">Ort</label>
-                    <input id="editLibraryLocation" required style="width: 100%;">
-                </div>
-                <div class="full">
-                    <label for="editLibraryDescription">Beschreibung</label>
-                    <textarea id="editLibraryDescription" rows="4" required style="width: 100%;"></textarea>
-                </div>
-            </div>
-            <div class="edit-actions" style="margin-top:20px;">
-                <button type="submit" class="button" style="background:#0ea5e9;color:#fff;">Speichern & Synchronisieren</button>
-                <button type="button" class="button" onclick="closeEditLibraryModal()">Abbrechen</button>
-            </div>
-        </form>
-    </div>
-</div>
-<div id="editLibraryGroupWarning" style="display:none; background-color: #fff; padding: 15px; border-radius: 6px; margin-bottom: 20px; border: 1px solid #0ea5e9;">
-    <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px; border-bottom: 1px solid #eee; padding-bottom: 10px;">
-        <strong style="color: #0ea5e9;">Gruppen-Range (Total: <span id="editLibraryGroupCount"></span>)</strong>
-    </div>
-
-    <p style="margin: 5px 0; font-size: 12px; color: #555;">
-        Alle Codes in dieser Gruppe:
-    </p>
-
-    <!-- Hier wird die Liste als Komma-Text eingefügt -->
-    <div id="editLibraryAllCodes" style="font-family: monospace; font-size: 14px; font-weight: bold; color: #333; margin-top: 5px;"></div>
-
-    <div style="margin-top: 15px; font-size: 11px; background: #e0f2fe; padding: 8px; border-radius: 4px;">
-        <strong>Hinweis:</strong> Änderungen an Titel/Ort/Beschreibung werden auf <strong>alle</strong> Exemplare der Range übertragen.
-    </div>
-</div>
 {% endblock %}

Web/templates/main_admin.html

@@ -4315,6 +4315,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
                             hiddenInput.value = image;
                             editForm.appendChild(hiddenInput);
                         }
+
                     });
                 }
 
@@ -5632,6 +5633,61 @@ document.addEventListener('DOMContentLoaded', ()=>{
         futureAppointments.sort((a, b) => new Date(a.date) - new Date(b.date));
         return futureAppointments[0];
     }
+
+    // Load location options
+    function loadLocationOptions() {
+        fetch('/get_predefined_locations')
+            .then(response => response.json())
+            .then(data => {
+                const ortSelect = document.getElementById('ort');
+                if (ortSelect) {
+                    // Clear existing options except the first one
+                    while (ortSelect.children.length > 1) {
+                        ortSelect.removeChild(ortSelect.lastChild);
+                    }
+
+                    // Add new options - data.locations contains the array
+                    data.locations.forEach(location => {
+                        const option = document.createElement('option');
+                        option.value = location;
+                        option.textContent = location;
+                        ortSelect.appendChild(option);
+                    });
+                }
+            })
+            .catch(error => {
+                console.error('Error loading location options:', error);
+            });
+    }
+
+    // Function to add new location
+    function addNewLocation() {
+        const newLocationInput = document.getElementById('new-location-input');
+        const newLocation = newLocationInput.value.trim();
+
+        if (!newLocation) {
+            alert('Bitte geben Sie einen Ort ein.');
+            return;
+        }
+
+        // Add to dropdown
+        const ortSelect = document.getElementById('ort');
+        const option = document.createElement('option');
+        option.value = newLocation;
+        option.textContent = newLocation;
+        option.selected = true;
+        ortSelect.appendChild(option);
+
+        // Hide the input container
+        document.getElementById('new-location-container').style.display = 'none';
+        newLocationInput.value = '';
+    }
+
+    // Function to cancel adding new location
+    function cancelAddLocation() {
+        document.getElementById('new-location-container').style.display = 'none';
+        document.getElementById('new-location-input').value = '';
+    }
 </script>
 
 <!-- Include edit item functions -->