implementation of the image

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
@@ -3313,7 +3313,8 @@ def api_library_items():
         ausleihungen_db = db['ausleihungen']
 
         query = {
-            'ItemType': {'$in': ['book', 'cd', 'dvd', 'schoolbook', 'schulbuch', 'Buch', 'Schulbuch']},
+            'ItemType': {'$in': ['book', 'cd', 'CD', 'DVD', 'dvd', 'schoolbook', 'schulbuch', 'Buch', 'Schulbuch']},
+            'IsGroupedSubItem': {'$ne': True},
             'Deleted': {'$ne': True}
         }
 
@@ -3787,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>
@@ -5779,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:
@@ -6365,6 +6367,204 @@ 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).
+    """
+    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'])
+
+        # Codes für die Ansicht trennen (Basis-Code vs. Einzelcodes)
+        base_code = item.get('Code_4', '')
+        individual_codes = []
+
+        group_id = item.get('SeriesGroupId')
+        if group_id:
+            group_ids = it.get_group_item_ids(str(item['_id']))
+            if group_ids:
+                for gid in group_ids:
+                    g_item = it.get_item(gid)
+                    c4 = g_item.get('Code_4')
+                    if c4 and c4 != base_code:
+                        individual_codes.append(c4)
+
+        item['IndividualCodes'] = '\n'.join(individual_codes)
+        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
+    name = sanitize_form_value(request.form.get('name'))
+    ort = sanitize_form_value(request.form.get('ort'))
+    beschreibung = sanitize_form_value(request.form.get('beschreibung'))
+
+    # Basis-Code & Einzelcodes aus der Textarea
+    code_4 = sanitize_form_value(request.form.get('code_4'))
+    individual_codes_raw = request.form.get('individual_codes', '')
+
+    individual_codes = []
+    for c in individual_codes_raw.replace('\r', '').split('\n'):
+        clean_c = sanitize_form_value(c)
+        if clean_c and clean_c != code_4 and clean_c not in individual_codes:
+            individual_codes.append(clean_c)
+
+    all_codes_to_check = [code_4] + individual_codes
+
+    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'))
+
+    verfuegbar = current_item.get('Verfuegbar', True)
+
+    # Uniqueness-Check über alle Codes
+    current_group_id = current_item.get('SeriesGroupId')
+    client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
+    db_instance = client[cfg.MONGODB_DB]
+    items_col = db_instance['items']
+
+    # 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}")
+
+    has_code_error = False
+    for code in all_codes_to_check:
+        if not code:
+            continue
+        existing = items_col.find_one({'Code_4': code, 'Deleted': {'$ne': True}})
+        if existing:
+            is_same_item = str(existing['_id']) == str(id)
+            is_in_same_group = current_group_id and existing.get('SeriesGroupId') == current_group_id
+            if not is_same_item and not is_in_same_group:
+                flash(f'Der Code "{code}" wird bereits von einem anderen Artikel verwendet.', 'error')
+                has_code_error = True
+                break
+    client.close()
+
+    if has_code_error:
+        return redirect(redirect_target)
+
+    # 1. Gruppen-Bestand über die korrigierte Helfer-Funktion synchronisieren
+    it.sync_group_codes(str(id), code_4, individual_codes)
+
+    # 2. Deine bestehende update_item Funktion aufrufen
+    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=isbn_raw,
+        item_type=item_type_input
+    )
+
+    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():
 
@@ -7696,7 +7896,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/items.py

@@ -20,6 +20,7 @@ Collection Structure:
 """
 from bson.objectid import ObjectId
 from bson.errors import InvalidId
+import uuid
 import datetime
 import Web.modules.database.settings as cfg
 from Web.modules.database.settings import MongoClient
@@ -1147,4 +1148,122 @@ def get_current_status(item_id, decrypt=True):
         return None
     except Exception as e:
         print(f"Error retrieving current status for item {item_id}: {e}")
-        return None
+        return None
+
+def sync_group_codes(primary_obj_id, base_code, individual_codes_list):
+    """
+    Synchronisiert die Barcodes einer Gruppe im korrekten Schema
+    (angelehnt an das 'Augenmodell groß'-Vorbild).
+    """
+    if not base_code:
+        return False
+
+    # Alle Ziel-Codes zusammenführen (Basis-Code an erster Stelle)
+    all_target_codes = [base_code]
+    for c in individual_codes_list:
+        if c and c not in all_target_codes:
+            all_target_codes.append(c)
+
+    item_count = len(all_target_codes)
+
+    try:
+        client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
+        db = client[cfg.MONGODB_DB]
+        items = db['items']
+
+        primary_item = items.find_one({'_id': ObjectId(primary_obj_id)})
+        if not primary_item:
+            client.close()
+            return False
+
+        group_id = primary_item.get('SeriesGroupId')
+
+        # Wenn es mehr als 1 Item gibt und noch keine Gruppe existiert -> Neue GroupID erzeugen
+        if not group_id and item_count > 1:
+            group_id = str(uuid.uuid4())
+
+        # Wenn es nun eine Gruppe gibt (item_count > 1)
+        if item_count > 1:
+            # 1. Haupt-Item (Parent) aktualisieren
+            items.update_one(
+                {'_id': primary_item['_id']},
+                {'$set': {
+                    'Code_4': base_code,
+                    'SeriesGroupId': group_id,
+                    'SeriesCount': item_count,
+                    'SeriesPosition': 1,
+                    'IsGroupedSubItem': False,
+                    'ParentItemId': None
+                }}
+            )
+
+            # Bestehende Gruppenmitglieder laden
+            existing_items = list(items.find({'SeriesGroupId': group_id}))
+            existing_map = {it.get('Code_4'): it for it in existing_items if
+                            it.get('Code_4') and str(it['_id']) != str(primary_item['_id'])}
+
+            # Alle verbleibenden Sub-Codes ab Position 2 abarbeiten
+            processed_sub_ids = []
+            for idx, code in enumerate(all_target_codes[1:], start=2):
+                if code in existing_map:
+                    # Existiert bereits in der Gruppe -> Nur Position und Count aktualisieren
+                    sub_item = existing_map[code]
+                    processed_sub_ids.append(sub_item['_id'])
+                    items.update_one(
+                        {'_id': sub_item['_id']},
+                        {'$set': {
+                            'SeriesCount': item_count,
+                            'SeriesPosition': idx,
+                            'IsGroupedSubItem': True,
+                            'ParentItemId': str(primary_item['_id'])
+                        }}
+                    )
+                else:
+                    # Neu hinzukommender Code -> Als Klon (Sub-Item) erstellen
+                    new_sub = primary_item.copy()
+                    if '_id' in new_sub:
+                        del new_sub['_id']
+
+                    new_sub.update({
+                        'Code_4': code,
+                        'SeriesGroupId': group_id,
+                        'SeriesCount': item_count,
+                        'SeriesPosition': idx,
+                        'IsGroupedSubItem': True,
+                        'ParentItemId': str(primary_item['_id']),
+                        'LastUpdated': primary_item.get('LastUpdated')
+                    })
+                    inserted_res = items.insert_one(new_sub)
+                    processed_sub_ids.append(inserted_res.inserted_id)
+
+            # Nicht mehr benötigte Sub-Items aus dieser Gruppe entfernen
+            for code, sub_item in existing_map.items():
+                if sub_item['_id'] not in processed_sub_ids:
+                    items.delete_one({'_id': sub_item['_id']})
+
+        else:
+            # Fall: Nur 1 einziges Item (keine Gruppe / Gruppe aufgelöst)
+            # Eventuelle alte Sub-Items dieser Gruppe löschen
+            if group_id:
+                items.delete_many({
+                    'SeriesGroupId': group_id,
+                    '_id': {'$ne': primary_item['_id']}
+                })
+
+            items.update_one(
+                {'_id': primary_item['_id']},
+                {'$set': {
+                    'Code_4': base_code,
+                    'SeriesGroupId': None,
+                    'SeriesCount': 1,
+                    'SeriesPosition': 1,
+                    'IsGroupedSubItem': False,
+                    'ParentItemId': None
+                }}
+            )
+
+        client.close()
+        return True
+    except Exception as e:
+        print(f"Error syncing group codes: {e}")
+        return False

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>
@@ -800,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>
@@ -1027,47 +1027,21 @@
     }
 
     async function processQuickToggleScan(scannedCode) {
-        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);
-                return;
-            }
-
-            if (!activeStudentCardId) {
-                setActiveStudentCard(scannedCode);
-                setScanStatus(`Ausweis gesetzt: ${activeStudentCardId}`, 'ok');
-                return;
-            }
-
-
-    async function returnByCode(code) {
-        if (!code) return;
-        setScanStatus('Verarbeite Rückgabe...', 'warn');
-        try {
-            const resp = await fetch('/api/library_return_by_code', {
-                method: 'POST',
-                headers: {'Content-Type': 'application/json'},
-                body: JSON.stringify({ item_code: code })
-            });
-            const result = await resp.json();
-            if (!resp.ok || !result.ok) {
-                setScanStatus(result.message || 'Rückgabe fehlgeschlagen.', 'error');
-                showSmallConfirm(result.message || 'Rückgabe fehlgeschlagen.', 'error');
-                return false;
-            }
-            setScanStatus(result.message || `Zurückgegeben: ${result.item_name || ''}`, 'ok');
-            showSmallConfirm(result.message || `Zurückgegeben: ${result.item_name || ''}`, 'ok');
-            await loadLibraryItems();
-            return true;
-        } catch (err) {
-            console.error('Return by code failed:', err);
-            setScanStatus('Fehler bei Rückgabe.', 'error');
-            showSmallConfirm('Fehler bei Rückgabe.', 'error');
-            return false;
+        // 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) {
+            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', {
@@ -1103,6 +1077,33 @@
         }
     }
 
+    async function returnByCode(code) {
+        if (!code) return;
+        setScanStatus('Verarbeite Rückgabe...', 'warn');
+        try {
+            const resp = await fetch('/api/library_return_by_code', {
+                method: 'POST',
+                headers: {'Content-Type': 'application/json'},
+                body: JSON.stringify({ item_code: code })
+            });
+            const result = await resp.json();
+            if (!resp.ok || !result.ok) {
+                setScanStatus(result.message || 'Rückgabe fehlgeschlagen.', 'error');
+                showSmallConfirm(result.message || 'Rückgabe fehlgeschlagen.', 'error');
+                return false;
+            }
+            setScanStatus(result.message || `Zurückgegeben: ${result.item_name || ''}`, 'ok');
+            showSmallConfirm(result.message || `Zurückgegeben: ${result.item_name || ''}`, 'ok');
+            await loadLibraryItems();
+            return true;
+        } catch (err) {
+            console.error('Return by code failed:', err);
+            setScanStatus('Fehler bei Rückgabe.', 'error');
+            showSmallConfirm('Fehler bei Rückgabe.', 'error');
+            return false;
+        }
+    }
+
     function scanIntoEditCode() {
         const scanReaderWrap = document.getElementById('scanReaderWrap');
         const editCodeInput = document.getElementById('edit-code4');
@@ -1399,74 +1400,8 @@
             });
         }
 
-        // Edit Modal Form processing
         const editForm = document.getElementById('editLibraryForm');
         if (editForm) {
-            try {
-                if (isGroupedEdit) {
-                    const payload = {
-                        series_group_id: currentItem.SeriesGroupId,
-                        ...sharedPayload,
-                        items: groupMembers.map(member => ({
-                            id: member._id,
-                            code_4: codeByItemId.get(member._id) || ''
-                        }))
-                    };
-
-                    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)
-                    });
-
-                    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 {
-                    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);
-                alert('Netzwerkfehler beim Aktualisieren des Mediums.');
-            }
             editForm.addEventListener('submit', async function (e) {
                 e.preventDefault();
 
@@ -1476,6 +1411,7 @@
 
                 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,
@@ -1486,175 +1422,151 @@
                     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 {
+                    if (isGroupedEdit) {
+                        const payload = {
+                            series_group_id: currentItem.SeriesGroupId,
+                            ...sharedPayload,
+                            items: groupMembers.map(member => ({
+                                id: member._id,
+                                code_4: codeByItemId.get(member._id) || ''
+                            }))
+                        };
+
+                        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)
+                        });
+
+                        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 {
+                        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);
+                    alert('Netzwerkfehler beim Aktualisieren des Mediums.');
+                }
             });
         }
     });
 
     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}`);
-                }
-
-                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);
+        try {
+            const response = await fetch(`/api/library_group/${encodeURIComponent(seriesGroupId)}`);
+            if (!response.ok) {
+                throw new Error(`HTTP ${response.status}`);
             }
+
+            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);
         }
-
-        function renderLibraryGroupCodeFields(groupMembers, currentItemId) {
-            const codesContainer = document.getElementById('editLibraryCodesContainer');
-            const groupWarning = document.getElementById('editLibraryGroupWarning');
-            const groupCount = document.getElementById('editLibraryGroupCount');
-            const groupHint = document.getElementById('editLibraryGroupHint');
-
-            if (!codesContainer) 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 || '')));
-
-            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('');
-        }
-
-        window.openEditLibraryItem = async function (itemId) {
-            const item = libraryItems.find(i => i._id === itemId);
-            if (!item) return;
-
-            editLibraryState.itemId = item._id;
-            editLibraryState.seriesGroupId = item.SeriesGroupId || '';
-            editLibraryState.groupMembers = [];
-
-            // 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('editLibraryLocation').value = item.Ort;
-            document.getElementById('editLibraryDescription').value = item.Beschreibung;
-
-            const codesContainer = document.getElementById('editLibraryCodesContainer');
-            if (codesContainer) {
-                codesContainer.innerHTML = '<div style="padding:10px 0; color:#6b7280;">Lade Codes...</div>';
-            }
-
-            const groupMembers = item.SeriesGroupId ? await fetchLibraryGroupMembers(item.SeriesGroupId) : [item];
-            renderLibraryGroupCodeFields(groupMembers.length > 0 ? groupMembers : [item], item._id);
-
-            document.getElementById('editLibraryModal').style.display = 'flex';
-        };
-
-    function closeEditLibraryModal() {
-        document.getElementById('editLibraryModal').style.display = 'none';
     }
+
+    function renderLibraryGroupCodeFields(groupMembers, currentItemId) {
+        const codesContainer = document.getElementById('editLibraryCodesContainer');
+        const groupWarning = document.getElementById('editLibraryGroupWarning');
+        const groupCount = document.getElementById('editLibraryGroupCount');
+        const groupHint = document.getElementById('editLibraryGroupHint');
+
+        if (!codesContainer) 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 || '')));
+
+        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 id="editLibraryGroupHint" style="margin: 5px 0; font-size: 12px; color: #555;">
-                Änderungen an Titel, Ort und Beschreibung werden auf alle Exemplare der Gruppe übertragen.
-            </p>
-
-            <div style="margin-top: 15px; font-size: 11px; background: #e0f2fe; padding: 8px; border-radius: 4px;">
-                <strong>Hinweis:</strong> Jeder Mediencode wird einzeln gespeichert, damit alle Exemplare der Gruppe korrekt bleiben.
-            </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>Mediencodes</label>
-                    <div id="editLibraryCodesContainer"></div>
-                </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>
 {% 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 -->