implementation of the edeting function also for the Inventarsystem to complete the transformation from the old outdated system to the new and more refined one

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,7 @@ 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}
         }
@@ -3788,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>
@@ -5780,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 +6366,214 @@ def edit_item(id):
 
     return redirect(url_for('home_admin'))
 
+def is_library_item(item):
+    """
+    Prüft, ob ein Artikel ein Bibliotheks-Item ist.
+    - 'other', None oder Leerstring -> Inventarsystem (False)
+    - Jeder andere Medientyp ('Buch', 'CD', etc.) -> Bibliothek (True)
+    """
+    if not item:
+        return False
+    item_type = item.get('ItemType', 'other')
+    if not item_type:
+        return False
+    return item_type.strip().lower() != 'other'
+
+
+@app.route('/item_edit/<id>', methods=['GET', 'POST'])
+def item_edit(id):
+    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'))
+
+    current_item = it.get_item(obj_id)
+    if not current_item:
+        flash('Element in der Datenbank nicht gefunden.', 'error')
+        return redirect(url_for('home_admin'))
+
+    # Bibliothek-Status ermitteln
+    library_module_active = cfg.MODULES.is_enabled('library')
+    is_lib_item = it.is_library_item(current_item)
+    show_library_features = library_module_active and is_lib_item
+
+    # -------------------------------------------------------------------
+    # GET METHOD
+    # -------------------------------------------------------------------
+    if request.method == 'GET':
+        current_item['_id'] = str(current_item['_id'])
+
+        base_code = current_item.get('Code_4', '')
+        individual_codes = []
+        if current_item.get('SeriesGroupId'):
+            group_ids = it.get_group_item_ids(str(current_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)
+
+        current_item['IndividualCodes'] = '\n'.join(individual_codes)
+
+        return render_template(
+            'edit_library.html',
+            username=session['username'],
+            item=current_item,
+            show_library_features=show_library_features,
+            library_module_enabled=library_module_active,
+            page_title=f"Bearbeiten: {current_item.get('Name', '')}"
+        )
+
+    # -------------------------------------------------------------------
+    # POST METHOD
+    # -------------------------------------------------------------------
+    redirect_target = request.referrer or url_for('home_admin')
+
+    name = sanitize_form_value(request.form.get('name'))
+    ort = sanitize_form_value(request.form.get('ort'))
+    beschreibung = sanitize_form_value(request.form.get('beschreibung'))
+    anschaffungs_jahr = sanitize_form_value(request.form.get('anschaffungsjahr'))
+    anschaffungs_kosten = sanitize_form_value(request.form.get('anschaffungskosten'))
+    reservierbar = 'reservierbar' in request.form
+
+    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
+
+    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']
+
+    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)
+
+    if show_library_features:
+        # LIBRARY ITEM: Process ISBN/Medientyp/Category, preserve existing filters
+        isbn_raw = sanitize_form_value(request.form.get('isbn', ''))
+        item_isbn = normalize_and_validate_isbn(isbn_raw) if isbn_raw else ''
+        item_type = sanitize_form_value(request.form.get('item_type_input', current_item.get('ItemType', 'Buch')))
+        library_category = sanitize_form_value(request.form.get('library_category', ''))
+        images = current_item.get('Images', [])
+
+        filter1 = current_item.get('Filter', [])
+        filter2 = current_item.get('Filter2', [])
+        filter3 = current_item.get('Filter3', [])
+    else:
+        # NON-LIBRARY (INVENTORY) ITEM: Process Filter 1-3 from form
+        item_isbn = current_item.get('ISBN', '')
+        item_type = 'other'
+        library_category = current_item.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'))
+
+        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"Image error for item {id}: {e}")
+    if ort and ort not in it.get_predefined_locations():
+        it.add_predefined_location(ort)
+
+    it.sync_group_codes(str(id), code_4, individual_codes)
+
+    success = it.update_item(
+        id=str(id),
+        name=name,
+        ort=ort,
+        beschreibung=beschreibung,
+        images=images,
+        verfuegbar=current_item.get('Verfuegbar', True),
+        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,
+        library_category=library_category
+    )
+
+    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():
@@ -7697,7 +7906,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,12 +20,30 @@ 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
 import Web.modules.inventarsystem.data_protection as dp
 
 
+def is_library_item(item):
+    """
+    Ermittelt zuverlässig, ob ein Objekt zur Bibliothek gehört.
+    Gibt True zurück, wenn ItemType ein Medientyp ist (Buch, Schulbuch, CD, DVD etc.)
+    ODER wenn is_library explizit True ist.
+    """
+    if not item:
+        return False
+
+    # 1. Prüfe zuerst den Medientyp (ItemType)
+    item_type = str(item.get('ItemType', '') or '').strip().lower()
+    if item_type and item_type not in ['other', 'general', 'none', 'null']:
+        return True
+
+    # 2. Falls ItemType 'other' ist, prüfe das is_library Flag
+    return bool(item.get('is_library', False))
+
 def safe_decrypt_user(encrypted_user):
     """
     Safely decrypt an encrypted username string.
@@ -250,7 +268,10 @@ def get_group_item_ids(id):
 
 
 def update_item(id, name, ort, beschreibung, images, verfuegbar, filter1, filter2, filter3,
-                ansch_jahr, ansch_kost, code_4, reservierbar, isbn=None, item_type='general'):
+                ansch_jahr, ansch_kost, code_4, reservierbar, isbn="", item_type='other', library_category=""):
+    """
+    Aktualisiert ein Objekt in MongoDB und setzt is_library korrekt basierend auf dem Medientyp.
+    """
     try:
         client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
         db = client[cfg.MONGODB_DB]
@@ -258,29 +279,35 @@ def update_item(id, name, ort, beschreibung, images, verfuegbar, filter1, filter
 
         old_item = items.find_one({'_id': ObjectId(id)})
         if not old_item:
+            client.close()
             return False
 
         series_group_id = old_item.get('SeriesGroupId')
 
+        # is_library automatisch anhand des neuen item_type bestimmen
+        is_lib = is_library_item({'ItemType': item_type})
+
         shared_update = {
             'Name': name,
             'Ort': ort,
             'Beschreibung': beschreibung,
-            'Images': images,
-            'Filter': filter1,
-            'Filter2': filter2,
-            'Filter3': filter3,
+            'Images': images if isinstance(images, list) else [],
+            'Filter': filter1 if isinstance(filter1, list) else [],
+            'Filter2': filter2 if isinstance(filter2, list) else [],
+            'Filter3': filter3 if isinstance(filter3, list) else [],
             'Anschaffungsjahr': ansch_jahr,
             'Anschaffungskosten': ansch_kost,
-            'Reservierbar': reservierbar,
-            'ISBN': isbn,
+            'Reservierbar': bool(reservierbar),
+            'ISBN': str(isbn) if isbn else '',
             'ItemType': item_type,
-            'Verfuegbar': verfuegbar,
+            'is_library': is_lib,
+            'library_category': library_category,
+            'Verfuegbar': bool(verfuegbar),
             'LastUpdated': datetime.datetime.now()
         }
 
         specific_update = shared_update.copy()
-        specific_update['Code_4'] = code_4
+        specific_update['Code_4'] = str(code_4) if code_4 else ''
 
         items.update_one({'_id': ObjectId(id)}, {'$set': specific_update})
 
@@ -1147,4 +1174,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/edit_item_functions.html

@@ -1,288 +0,0 @@
-<!--
-   Copyright 2025-2026 AIIrondev
-
-   Licensed under the Inventarsystem EULA (Endbenutzer-Lizenzvertrag).
-   See Legal/LICENSE for the full license text.
-   Unauthorized commercial use, SaaS hosting, or removal of branding is prohibited.
-   For commercial licensing inquiries: https://github.com/AIIrondev
--->
-<!-- Edit Item Functions -->
-<script>
-    // Function to check if a file is a video
-    function isVideoFile(filename) {
-        const videoExtensions = ['.mp4', '.mov', '.avi', '.mkv', '.webm', '.flv', '.m4v', '.3gp'];
-        const extension = filename.toLowerCase().substring(filename.lastIndexOf('.'));
-        return videoExtensions.includes(extension);
-    }
-
-    // Load location options for edit modal
-    function loadLocationOptions() {
-        fetch('/get_predefined_locations')
-            .then(response => response.json())
-            .then(data => {
-                const ortSelect = document.getElementById('edit-location');
-                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);
-            });
-    }
-
-    // Edit modal functions
-    function openEditModal(itemId) {
-        if (typeof openEditModalFromServer === 'function') {
-            openEditModalFromServer(itemId);
-            return;
-        }
-
-        // Find the item data from allItems array
-        const item = allItems.find(i => i._id === itemId);
-        if (!item) {
-            console.error('Item not found:', itemId);
-            return;
-        }
-
-        // Populate the edit form with current item data
-        document.getElementById('edit-item-id').value = item._id;
-        document.getElementById('edit-name').value = item.Name || '';
-        document.getElementById('edit-description').value = item.Beschreibung || '';
-        document.getElementById('edit-code4').value = item.Code_4 || '';
-        document.getElementById('edit-year').value = item.Anschaffungsjahr || '';
-        document.getElementById('edit-cost').value = item.Anschaffungskosten || '';
-
-        // Set reservable status (default to true if undefined)
-        const reservierbarCheckbox = document.getElementById('edit-reservierbar');
-        if (reservierbarCheckbox) {
-            reservierbarCheckbox.checked = item.Reservierbar !== false;
-        }
-
-        // Load location options
-        loadLocationOptions();
-
-        // Set the current location
-        setTimeout(() => {
-            const locationSelect = document.getElementById('edit-location');
-            if (locationSelect && item.Ort) {
-                locationSelect.value = item.Ort;
-            }
-        }, 100);
-
-        // Handle filter arrays - set current values
-        const filter1Array = Array.isArray(item.Filter) ? item.Filter : (item.Filter ? [item.Filter] : []);
-        const filter2Array = Array.isArray(item.Filter2) ? item.Filter2 : (item.Filter2 ? [item.Filter2] : []);
-        const filter3Array = Array.isArray(item.Filter3) ? item.Filter3 : (item.Filter3 ? [item.Filter3] : []);
-
-        // Set filter dropdowns (up to 4 each)
-        for (let i = 1; i <= 4; i++) {
-            // Filter 1
-            const filter1Select = document.getElementById(`edit-filter1-${i}`);
-            if (filter1Select) {
-                filter1Select.value = filter1Array[i-1] || '';
-            }
-            
-            // Filter 2
-            const filter2Select = document.getElementById(`edit-filter2-${i}`);
-            if (filter2Select) {
-                filter2Select.value = filter2Array[i-1] || '';
-            }
-            
-            // Filter 3
-            const filter3Select = document.getElementById(`edit-filter3-${i}`);
-            if (filter3Select) {
-                filter3Select.value = filter3Array[i-1] || '';
-            }
-        }
-
-        // Populate existing images
-        populateExistingImages(item.Images || []);
-
-        // Show the modal
-        document.getElementById('edit-modal').style.display = 'block';
-    }
-
-    function closeEditModal() {
-        document.getElementById('edit-modal').style.display = 'none';
-    }
-    
-    // Function to add new location (for edit modal)
-    function addNewLocation(prefix) {
-        // Use different input IDs based on whether we're in edit mode
-        const inputId = prefix === 'edit' ? 'edit-new-location-input' : 'new-location-input';
-        const selectId = prefix === 'edit' ? 'edit-location' : 'ort';
-        
-        const newLocationInput = document.getElementById(inputId);
-        const newLocation = newLocationInput.value.trim();
-        
-        if (!newLocation) {
-            alert('Bitte geben Sie einen Ort ein.');
-            return;
-        }
-        
-        // Add to dropdown
-        const ortSelect = document.getElementById(selectId);
-        const option = document.createElement('option');
-        option.value = newLocation;
-        option.textContent = newLocation;
-        ortSelect.appendChild(option);
-        ortSelect.value = newLocation;
-        
-        // Hide the input field
-        document.getElementById(prefix + '-new-location-container').style.display = 'none';
-        newLocationInput.value = '';
-        
-        // Save to server
-        fetch('/add_location_value', {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded',
-            },
-            body: 'value=' + encodeURIComponent(newLocation)
-        })
-        .then(response => response.json())
-        .then(data => {
-            if (!data.success) {
-                console.warn('Failed to save location to server:', data.error);
-            }
-        })
-        .catch(error => {
-            console.error('Error saving location:', error);
-        });
-    }
-    
-    // Function to cancel adding a new location
-    function cancelAddLocation(prefix) {
-        const containerId = prefix === 'edit' ? 'edit-new-location-container' : 'new-location-container';
-        const inputId = prefix === 'edit' ? 'edit-new-location-input' : 'new-location-input';
-        document.getElementById(containerId).style.display = 'none';
-        document.getElementById(inputId).value = '';
-    }
-
-    // Function to populate existing images in edit modal
-    function populateExistingImages(images) {
-        const previewContainer = document.getElementById('edit-image-preview-container');
-        if (!previewContainer) return;
-        
-        previewContainer.innerHTML = '';
-        
-        if (!images || images.length === 0) {
-            previewContainer.innerHTML = '<p>Keine Bilder vorhanden</p>';
-            return;
-        }
-        
-        images.forEach((imageName, index) => {
-            const preview = document.createElement('div');
-            preview.className = 'image-preview-item';
-            
-            const isVideo = isVideoFile(imageName);
-            const mediaHtml = isVideo 
-                ? `<video src="/uploads/${imageName}" style="max-width: 150px; max-height: 150px; object-fit: cover;" controls preload="metadata"></video>`
-                : `<img src="/uploads/${imageName}" alt="Image ${index + 1}" style="max-width: 150px; max-height: 150px; object-fit: cover;">`;
-            
-            preview.innerHTML = `
-                ${mediaHtml}
-                <div class="image-controls">
-                    <button type="button" onclick="removeExistingImage('${imageName}', this)" style="background: #dc3545; color: white; border: none; padding: 5px 10px; border-radius: 3px; cursor: pointer; margin-left: 10px;">Entfernen</button>
-                </div>
-            `;
-            previewContainer.appendChild(preview);
-            
-            // Add hidden input for the image
-            const hiddenInput = document.createElement('input');
-            hiddenInput.type = 'hidden';
-            hiddenInput.name = 'existing_images';
-            hiddenInput.value = imageName;
-            previewContainer.appendChild(hiddenInput);
-        });
-    }
-    
-    // Function to remove an existing image
-    function removeExistingImage(imageName, button) {
-        try {
-            // First, determine context - are we in edit mode or main view?
-            const inEditMode = !!document.getElementById('edit-item-form');
-            
-            // Always remove the preview element (works in both contexts)
-            const previewItem = button.closest('.image-preview-item');
-            if (previewItem) {
-                previewItem.remove();
-            }
-            
-            // If we're in edit mode, handle form inputs
-            if (inEditMode) {
-                // Find and remove the corresponding hidden input in the edit form
-                const editForm = document.getElementById('edit-item-form');
-                
-                if (editForm) {
-                    // Remove from existing images
-                    const existingInputs = editForm.querySelectorAll('input[name="existing_images"]');
-                    existingInputs.forEach(input => {
-                        if (input.value === imageName) {
-                            input.remove();
-                        }
-                    });
-                    
-                    // Add to removed images
-                    const removedInput = document.createElement('input');
-                    removedInput.type = 'hidden';
-                    removedInput.name = 'removed_images';
-                    removedInput.value = imageName;
-                    editForm.appendChild(removedInput);
-                }
-            } else {
-                // In main view, we may need different logic
-                console.log(`Image ${imageName} removed from display in main view`);
-                // Add any main view specific handling here
-            }
-        } catch (error) {
-            console.error(`Error in removeExistingImage: ${error.message}`);
-        }
-    }
-    
-    // Validate file types for image uploads
-    document.addEventListener('DOMContentLoaded', function() {
-        // Check if we're in the edit item context
-        if (!document.getElementById('edit-item-form')) {
-            console.log('Edit item form not found, skipping edit item functions initialization');
-            return; // Exit early if we're not in the edit item context
-        }
-        
-        const imageInput = document.getElementById('edit-new-images');
-        const previewContainer = document.getElementById('edit-image-preview-container');
-        
-        if (imageInput) {
-            imageInput.addEventListener('change', function(e) {
-                // Validate file types before preview
-                const allowedTypes = ['image/jpeg', 'image/jpg', 'image/png', 'image/gif',
-                                    'video/mp4', 'video/quicktime', 'video/x-msvideo', 'video/x-matroska',
-                                    'video/webm', 'video/x-flv', 'video/mp4', 'video/3gpp'];
-                const files = this.files;
-                let hasInvalidFile = false;
-                
-                for (let i = 0; i < files.length; i++) {
-                    if (!allowedTypes.includes(files[i].type)) {
-                        hasInvalidFile = true;
-                        // Clear the file input to prevent submission
-                        this.value = '';
-                        alert('Fehler: Datei "' + files[i].name + '" hat ein nicht unterstütztes Format. Erlaubte Formate: JPG, JPEG, PNG, GIF, MP4, MOV, AVI, MKV, WEBM, FLV, M4V, 3GP');
-                        return; // Stop processing
-                    }
-                }
-                
-                // Continue with regular preview handling...
-            });
-        }
-    });
-</script>

Web/templates/edit_library.html

@@ -0,0 +1,509 @@
+<!--
+   Copyright 2025-2026 AIIrondev
+   Licensed under the Inventarsystem EULA.
+-->
+{% extends "base.html" %}
+
+{% block title %}{{ page_title|default('Artikel bearbeiten') }} - Inventarsystem{% endblock %}
+
+{% block content %}
+<style>
+    .edit-container {
+        max-width: 800px;
+        margin: 0 auto;
+        padding: 20px;
+        background-color: var(--ui-surface);
+        border-radius: 8px;
+        box-shadow: 0 2px 10px rgba(0,0,0,0.1);
+    }
+
+    .edit-form h1 {
+        color: var(--ui-text);
+        margin-bottom: 30px;
+        text-align: center;
+        font-size: 2em;
+    }
+
+    .form-group {
+        margin-bottom: 20px;
+    }
+
+    .form-group label {
+        display: block;
+        margin-bottom: 5px;
+        font-weight: bold;
+        color: var(--ui-text);
+    }
+
+    .form-group input,
+    .form-group select,
+    .form-group textarea {
+        width: 100%;
+        padding: 10px;
+        border: 1px solid #ddd;
+        border-radius: 4px;
+        font-size: 16px;
+        box-sizing: border-box;
+    }
+
+    .form-group textarea {
+        height: 100px;
+        resize: vertical;
+    }
+
+    .filter-inputs {
+        background-color: var(--ui-surface-soft);
+        padding: 20px;
+        border-radius: 5px;
+        margin: 20px 0;
+    }
+
+    .filter-inputs h3 {
+        color: var(--ui-text);
+        margin-bottom: 15px;
+        font-size: 1.2em;
+    }
+
+    .multi-filter {
+        display: grid;
+        grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+        gap: 15px;
+    }
+
+    .filter-dropdown-select {
+        width: 100%;
+        padding: 8px;
+        border: 1px solid #ddd;
+        border-radius: 4px;
+        background-color: white;
+    }
+
+    .isbn-input-group {
+        display: flex;
+        gap: 10px;
+        align-items: center;
+    }
+
+    .isbn-input-group input {
+        flex: 1;
+    }
+
+    .fetch-isbn-button {
+        background-color: #007bff;
+        color: white;
+        border: none;
+        padding: 8px 12px;
+        border-radius: 4px;
+        cursor: pointer;
+        white-space: nowrap;
+        transition: background-color 0.2s ease;
+    }
+
+    .fetch-isbn-button:hover {
+        background-color: #0056b3;
+    }
+
+    /* Scanner Elements */
+    #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;
+    }
+
+    /* Image Management */
+    .existing-images-grid {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 15px;
+        margin-top: 10px;
+    }
+
+    .existing-image-card {
+        border: 1px solid #ddd;
+        border-radius: 5px;
+        padding: 8px;
+        text-align: center;
+        background: #fff;
+        width: 120px;
+    }
+
+    .existing-image-card img {
+        width: 100%;
+        height: 100px;
+        object-fit: cover;
+        border-radius: 4px;
+    }
+
+    .existing-image-card label {
+        font-size: 0.8em;
+        margin-top: 5px;
+        cursor: pointer;
+        font-weight: normal;
+    }
+
+    .add-new-btn {
+        background-color: #007bff;
+        color: white;
+        border: none;
+        padding: 5px 10px;
+        border-radius: 3px;
+        cursor: pointer;
+        margin-top: 5px;
+        font-size: 12px;
+    }
+
+    .submit-button {
+        background-color: #28a745;
+        color: white;
+        border: none;
+        padding: 15px 30px;
+        border-radius: 5px;
+        font-size: 18px;
+        font-weight: bold;
+        cursor: pointer;
+        width: 100%;
+        margin-top: 20px;
+        transition: background-color 0.2s ease;
+    }
+
+    .submit-button:hover {
+        background-color: #218838;
+    }
+
+    .edit-new-location-container {
+        display: none;
+        margin-top: 10px;
+    }
+</style>
+
+<div class="edit-container">
+    <div class="edit-form">
+        <h1>{{ page_title|default('Artikel bearbeiten') }}</h1>
+        <form method="POST" action="{{ url_for('item_edit', id=item._id) }}" enctype="multipart/form-data">
+            <input type="hidden" name="item_id" value="{{ item._id }}">
+
+            {% if show_library_features %}
+            <!-- ================= LIBRARY SPECIFIC FIELDS ================= -->
+            <div class="form-group">
+                <label for="isbn">ISBN / Barcode:</label>
+                <div class="isbn-input-group">
+                    <input type="text" id="isbn" name="isbn" value="{{ item.ISBN|default('') }}" placeholder="ISBN oder Barcode eingeben...">
+                    <button type="button" id="scan-isbn-btn" class="fetch-isbn-button">Barcode scannen</button>
+                    <button type="button" class="fetch-isbn-button" onclick="fetchBookInfo('edit')">Informationen abrufen</button>
+                </div>
+                <div id="isbn-scanner" style="width:100%; max-width:520px; display:none; margin-top:10px;"></div>
+                <small id="isbn-scan-status" style="display:block; color:#666; margin-top:6px;"></small>
+                <div id="book-info-container"></div>
+            </div>
+
+            <div class="filter-inputs" style="margin-bottom: 20px;">
+                <h3>Medientyp</h3>
+                <div class="form-group">
+                    <select name="item_type_input" id="item_type_input">
+                        <option value="Buch" {% if item.ItemType == 'Buch' %}selected{% endif %}>Buch</option>
+                        <option value="Schulbuch" {% if item.ItemType == 'Schulbuch' %}selected{% endif %}>Schulbuch</option>
+                        <option value="CD" {% if item.ItemType == 'CD' %}selected{% endif %}>CD</option>
+                        <option value="DVD" {% if item.ItemType == 'DVD' %}selected{% endif %}>DVD</option>
+                        <option value="Sonstiges" {% if item.ItemType == 'Sonstiges' %}selected{% endif %}>Sonstiges</option>
+                    </select>
+                </div>
+                <h3>Bibliotheks-Kategorie:</h3>
+                <div class="form-group">
+                    <input type="text" name="library_category" id="library_category" value="{{ item.library_category|default('') }}" placeholder="z.B. Belletristik, Sachbücher, etc.">
+                </div>
+            </div>
+            {% endif %}
+
+            <!-- ================= COMMON CORE FIELDS ================= -->
+            <div class="form-group">
+                <label for="name">Name / Titel:</label>
+                <input type="text" id="name" name="name" value="{{ item.Name|default('') }}" required>
+            </div>
+
+            <div class="form-group">
+                <label for="ort">Ort / Standort:</label>
+                <select id="ort" name="ort" data-selected="{{ item.Ort|default('') }}" required>
+                    <option value="">-- Bitte Ort auswählen --</option>
+                    {% if item.Ort %}
+                    <option value="{{ item.Ort }}" selected>{{ item.Ort }}</option>
+                    {% endif %}
+                </select>
+                <button type="button" class="add-new-btn" id="add-new-location-btn">Neuen Ort hinzufügen</button>
+                <div id="new-location-container" class="edit-new-location-container">
+                    <input type="text" id="new-location-input" placeholder="Neuen Ort eingeben">
+                    <button type="button" onclick="addNewLocation()">Hinzufügen</button>
+                    <button type="button" onclick="cancelAddLocation()">Abbrechen</button>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label for="beschreibung">Beschreibung:</label>
+                <textarea id="beschreibung" name="beschreibung" required>{{ item.Beschreibung|default('') }}</textarea>
+            </div>
+
+            <div class="form-group" id="primary_code_group">
+                <label for="code_4">Basis-Code (Haupt-Barcode)</label>
+                <div style="display: flex; gap: 10px;">
+                    <input type="text" id="code_4" name="code_4" class="form-control" value="{{ item.Code_4|default('') }}" required>
+                    <button type="button" id="scan-code4-btn" class="fetch-isbn-button">Barcode scannen</button>
+                </div>
+                <div id="code4-scanner" style="display:none; margin-top: 10px;"></div>
+                <small id="code4-scan-status" class="form-text text-muted"></small>
+            </div>
+
+            <div class="form-group" id="individual_codes_group">
+                <label for="individual_codes">Weitere Einzelcodes der Gruppe (je Zeile ein Code)</label>
+                <textarea id="individual_codes" name="individual_codes" rows="4" class="form-control" placeholder="z.B.&#10;ABC-001&#10;ABC-002">{{ item.IndividualCodes|default('') }}</textarea>
+                <small style="display:block; color:#666; margin-top: 5px;">Der Basis-Code steht oben. Alle weiteren Gruppenmitglieder werden hier untereinander aufgeführt.</small>
+            </div>
+
+            {% if not show_library_features %}
+            <!-- ================= SYSTEM FILTERS 1-3 (INVENTORY / OTHER ITEMS ONLY) ================= -->
+            <div class="filter-inputs">
+                <h3>Unterrichtsfach (Filter 1):</h3>
+                <div class="multi-filter">
+                    {% for idx in range(4) %}
+                    <div class="form-group">
+                        <label for="filter1-{{ idx + 1 }}">Wert {{ idx + 1 }}:</label>
+                        <select id="filter1-{{ idx + 1 }}" name="filter" class="filter-dropdown-select" data-selected="{{ item.Filter[idx] if item.Filter and item.Filter|length > idx else '' }}">
+                            <option value="">-- Optional --</option>
+                        </select>
+                    </div>
+                    {% endfor %}
+                </div>
+
+                <h3>Jahrgangsstufe (Filter 2):</h3>
+                <div class="multi-filter">
+                    {% for idx in range(4) %}
+                    <div class="form-group">
+                        <label for="filter2-{{ idx + 1 }}">Wert {{ idx + 1 }}:</label>
+                        <select id="filter2-{{ idx + 1 }}" name="filter2" class="filter-dropdown-select" data-selected="{{ item.Filter2[idx] if item.Filter2 and item.Filter2|length > idx else '' }}">
+                            <option value="">-- Optional --</option>
+                        </select>
+                    </div>
+                    {% endfor %}
+                </div>
+
+                <h3>Schlagwort (Filter 3):</h3>
+                <div class="multi-filter">
+                    {% for idx in range(4) %}
+                    <div class="form-group">
+                        <label for="filter3-{{ idx + 1 }}">Wert {{ idx + 1 }}:</label>
+                        <input type="text" id="filter3-{{ idx + 1 }}" name="filter3" value="{{ item.Filter3[idx] if item.Filter3 and item.Filter3|length > idx else '' }}">
+                    </div>
+                    {% endfor %}
+                </div>
+            </div>
+            {% endif %}
+
+            <!-- ================= DATES & FINANCIALS ================= -->
+            <div class="form-group">
+                <label for="anschaffungsjahr">Anschaffungsjahr:</label>
+                <input type="date" id="anschaffungsjahr" name="anschaffungsjahr" value="{{ item.Anschaffungsjahr|default('') }}">
+            </div>
+            <div class="form-group">
+                <label for="anschaffungskosten">Anschaffungskosten (€):</label>
+                <input type="text" id="anschaffungskosten" name="anschaffungskosten" value="{{ item.Anschaffungskosten|default('') }}">
+            </div>
+
+            {% if not show_library_features %}
+            <!-- ================= INVENTORY IMAGE MANAGEMENT ================= -->
+            <div class="form-group">
+                <label>Bestehende Bilder behalten:</label>
+                {% if item.Images and item.Images|length > 0 %}
+                <div class="existing-images-grid">
+                    {% for img in item.Images %}
+                    <div class="existing-image-card">
+                        <img src="{{ url_for('uploaded_file', filename=img) }}" alt="Bild">
+                        <label>
+                            <input type="checkbox" name="existing_images" value="{{ img }}" checked>
+                            Behalten
+                        </label>
+                    </div>
+                    {% endfor %}
+                </div>
+                {% else %}
+                <p style="color:#777; font-size:0.9em;">Keine Bilder vorhanden.</p>
+                {% endif %}
+
+                <label for="images" style="margin-top:15px;">Neue Bilder/Videos hinzufügen:</label>
+                <input type="file" id="images" name="images" accept=".jpg, .jpeg, .png, .gif, .mp4, .mov, .avi, .mkv, .webm" multiple>
+            </div>
+            {% endif %}
+
+            <div class="form-group">
+                <label for="reservierbar" style="display:inline-block; width:auto; margin-right:10px;">Reservierbar:</label>
+                <input type="checkbox" id="reservierbar" name="reservierbar" style="width:auto;" {% if item.Reservierbar %}checked{% endif %}>
+            </div>
+
+            <button type="submit" class="submit-button">Änderungen speichern</button>
+        </form>
+    </div>
+</div>
+
+<script src="https://cdn.jsdelivr.net/npm/@ericblade/quagga2/dist/quagga.js"></script>
+<script>
+    let scannerRunning = false;
+    let activeScannerCallback = null;
+    let code4LastScanned = '';
+    let code4LastScannedAt = 0;
+
+    function loadAndSelectFilterValues(filterNumber) {
+        fetch(`/get_predefined_filter_values/${filterNumber}`)
+            .then(res => res.json())
+            .then(data => {
+                for (let i = 1; i <= 4; i++) {
+                    const select = document.getElementById(`filter${filterNumber}-${i}`);
+                    if (!select) continue;
+
+                    const selectedValue = select.getAttribute('data-selected') || '';
+
+                    data.values.forEach(val => {
+                        if (!val || String(val).trim() === '') return;
+                        const opt = document.createElement('option');
+                        opt.value = val;
+                        opt.textContent = val;
+                        select.appendChild(opt);
+                    });
+
+                    if (selectedValue && !Array.from(select.options).some(o => o.value === selectedValue)) {
+                        const customOpt = document.createElement('option');
+                        customOpt.value = selectedValue;
+                        customOpt.textContent = selectedValue;
+                        select.appendChild(customOpt);
+                    }
+
+                    select.value = selectedValue;
+                }
+            })
+            .catch(err => console.error(`Error loading Filter ${filterNumber}:`, err));
+    }
+
+    function loadLocationOptions() {
+        fetch('/get_predefined_locations')
+            .then(res => res.json())
+            .then(data => {
+                const select = document.getElementById('ort');
+                if (!select) return;
+                const currentVal = select.getAttribute('data-selected') || select.value;
+
+                data.locations.forEach(loc => {
+                    if (!Array.from(select.options).some(o => o.value === loc)) {
+                        const opt = document.createElement('option');
+                        opt.value = loc;
+                        opt.textContent = loc;
+                        select.appendChild(opt);
+                    }
+                });
+
+                select.value = currentVal;
+            })
+            .catch(err => console.error('Error loading locations:', err));
+    }
+
+    function addNewLocation() {
+        const input = document.getElementById('new-location-input');
+        const val = input.value.trim();
+        if (!val) return;
+        const select = document.getElementById('ort');
+        const opt = document.createElement('option');
+        opt.value = val;
+        opt.textContent = val;
+        opt.selected = true;
+        select.appendChild(opt);
+        document.getElementById('new-location-container').style.display = 'none';
+        input.value = '';
+    }
+
+    function cancelAddLocation() {
+        document.getElementById('new-location-container').style.display = 'none';
+        document.getElementById('new-location-input').value = '';
+    }
+
+    function runEngineInitialization(targetSelector, activeCallback, completionMsg, errorStatusSetter) {
+        if (scannerRunning) { Quagga.stop(); scannerRunning = false; }
+        activeScannerCallback = activeCallback;
+
+        Quagga.init({
+            inputStream: { name: "Live", type: "LiveStream", target: document.querySelector(targetSelector), constraints: { width: 640, height: 480, facingMode: "environment" } },
+            decoder: { readers: ["code_128_reader", "ean_reader", "code_39_reader", "upc_reader"] }
+        }, function(err) {
+            if (err) { errorStatusSetter("Kamera-Fehler.", true); return; }
+            Quagga.start(); scannerRunning = true; errorStatusSetter(completionMsg, false);
+        });
+    }
+
+    function killScannerHardware() {
+        if (!scannerRunning) return;
+        Quagga.stop(); scannerRunning = false; activeScannerCallback = null;
+    }
+
+    Quagga.onDetected(function(data) {
+        if (!data || !data.codeResult || !data.codeResult.code) return;
+        if (typeof activeScannerCallback === "function") activeScannerCallback(String(data.codeResult.code).trim());
+    });
+
+    function startCode4Scanner() {
+        const scannerBox = document.getElementById('code4-scanner');
+        const scanBtn = document.getElementById('scan-code4-btn');
+        const baseField = document.getElementById('code_4');
+        const indArea = document.getElementById('individual_codes');
+
+        if (scannerBox.style.display !== 'none') {
+            killScannerHardware(); scannerBox.style.display = 'none'; scanBtn.textContent = 'Barcode scannen'; return;
+        }
+
+        scannerBox.style.display = 'block'; scanBtn.textContent = 'Scanner stoppen';
+        runEngineInitialization('#code4-scanner', function(decodedText) {
+            const now = Date.now();
+            if (decodedText === code4LastScanned && (now - code4LastScannedAt) < 1500) return;
+            code4LastScanned = decodedText; code4LastScannedAt = now;
+
+            killScannerHardware(); scannerBox.style.display = 'none'; scanBtn.textContent = 'Barcode scannen';
+
+            if (!baseField.value.trim()) {
+                baseField.value = decodedText;
+            } else {
+                let codes = indArea.value.split('\n').map(c => c.trim()).filter(c => c);
+                if (!codes.includes(decodedText) && baseField.value.trim() !== decodedText) {
+                    codes.push(decodedText);
+                    indArea.value = codes.join('\n');
+                }
+            }
+        }, 'Scanner läuft...', msg => { document.getElementById('code4-scan-status').textContent = msg; });
+    }
+
+    document.addEventListener('DOMContentLoaded', function() {
+        loadLocationOptions();
+
+        // Load Filter options if elements exist on page
+        if (document.getElementById('filter1-1')) {
+            loadAndSelectFilterValues(1);
+            loadAndSelectFilterValues(2);
+        }
+
+        const scanCodeBtn = document.getElementById('scan-code4-btn');
+        if (scanCodeBtn) scanCodeBtn.addEventListener('click', startCode4Scanner);
+
+        const addLocBtn = document.getElementById('add-new-location-btn');
+        if (addLocBtn) addLocBtn.addEventListener('click', () => {
+            const c = document.getElementById('new-location-container');
+            c.style.display = c.style.display === 'none' ? 'block' : 'none';
+        });
+    });
+</script>
+{% endblock %}

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,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;
@@ -1068,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');
@@ -1110,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") {
@@ -1137,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();
@@ -1158,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';
@@ -1188,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();
     }
@@ -1221,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();
     }
@@ -1292,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) {
@@ -1302,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) {
@@ -1335,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
@@ -1365,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);
             });
         }
@@ -1401,13 +1402,16 @@
 
         const editForm = document.getElementById('editLibraryForm');
         if (editForm) {
-            editForm.addEventListener('submit', async function(e) {
+            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 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,
@@ -1419,11 +1423,11 @@
                     reservierbar: currentItem.Reservierbar !== false,
                 };
 
-                const codeInputs = Array.from(document.querySelectorAll('#editLibraryCodesContainer input[data-item-id]'));
                 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 = {
@@ -1495,7 +1499,6 @@
 
     async function fetchLibraryGroupMembers(seriesGroupId) {
         if (!seriesGroupId) return [];
-
         try {
             const response = await fetch(`/api/library_group/${encodeURIComponent(seriesGroupId)}`);
             if (!response.ok) {
@@ -1554,105 +1557,16 @@
                 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>
+            <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 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

@@ -1951,11 +1951,6 @@
         display: none;
     }
 
-    /* Edit new location container */
-    .edit-new-location-container {
-        display: none;
-        margin-top: 10px;
-    }
 
     /* Modal dialog styling */
     .modal-dialog-white {
@@ -1969,11 +1964,6 @@
         margin-top: 10px;
     }
 
-    /* Element text colors for better visibility */
-    .edit-button, .duplicate-button, .generate-qr-button {
-        color: var(--ui-title) !important;
-    }
-    
     /* Standardized button styles across the application */
     .search-button, .scan-button, .filter-toggle, .clear-filter, 
     .add-new-btn, .popup-close-button, .prev-image-button, .next-image-button,
@@ -2474,187 +2464,6 @@ document.addEventListener('DOMContentLoaded', ()=>{
             </div>
         </div>
     </div>
-
-    <!-- Add the edit modal form -->
-    {% if current_permissions.actions.get('can_edit', False) %}
-    <div id="edit-modal" class="item-modal">
-        <div class="modal-content">
-            <span class="close-modal" onclick="closeEditModal()">&times;</span>
-            <h2>Objekt bearbeiten</h2>
-            <form id="edit-item-form" method="POST" enctype="multipart/form-data">
-                <input type="hidden" id="edit-item-id" name="id">
-                <div class="form-row">
-                    <div class="form-group">
-                        <label for="edit-name">Name:</label>
-                        <input type="text" id="edit-name" name="name" required>
-                    </div>
-                    <div class="form-group">
-                        <label for="edit-location">Ort:</label>
-                        <select id="edit-location" name="ort" required>
-                            <option value="">-- Bitte Ort auswählen --</option>
-                            <!-- Options will be loaded by JavaScript -->
-                        </select>
-                        <button type="button" class="add-new-btn" id="edit-add-new-location-btn">
-                            Neuen Ort hinzufügen
-                        </button>
-                        <div id="edit-new-location-container" class="edit-new-location-container">
-                            <input type="text" id="edit-new-location-input" placeholder="Neuen Ort eingeben">
-                            <button type="button" onclick="addNewLocation('edit')">Hinzufügen</button>
-                            <button type="button" onclick="cancelAddLocation('edit')">Abbrechen</button>
-                        </div>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label for="edit-description">Beschreibung:</label>
-                    <textarea id="edit-description" name="beschreibung" required></textarea>
-                </div>
-                
-                <!-- Updated filter inputs for edit form with dropdowns -->
-                <div class="filter-inputs">
-                    <h3>Unterrichtsfach:</h3>
-                    <div class="multi-filter">
-                        <div class="form-group">
-                            <label for="edit-filter1-1">Wert 1:</label>
-                            <select id="edit-filter1-1" name="filter" class="filter-dropdown-select">
-                                <option value="">-- Bitte auswählen --</option>
-                                <!-- Options will be loaded by JavaScript -->
-                            </select>
-                        </div>
-                        <div class="form-group">
-                            <label for="edit-filter1-2">Wert 2:</label>
-                            <select id="edit-filter1-2" name="filter" class="filter-dropdown-select">
-                                <option value="">-- Optional --</option>
-                                <!-- Options will be loaded by JavaScript -->
-                            </select>
-                        </div>
-                        <div class="form-group">
-                            <label for="edit-filter1-3">Wert 3:</label>
-                            <select id="edit-filter1-3" name="filter" class="filter-dropdown-select">
-                                <option value="">-- Optional --</option>
-                                <!-- Options will be loaded by JavaScript -->
-                            </select>
-                        </div>
-                        <div class="form-group">
-                            <label for="edit-filter1-4">Wert 4:</label>
-                            <select id="edit-filter1-4" name="filter" class="filter-dropdown-select">
-                                <option value="">-- Optional --</option>
-                                <!-- Options will be loaded by JavaScript -->
-                            </select>
-                        </div>
-                    </div>
-                    
-                    <h3>Jahrgangsstufe:</h3>
-                    <div class="multi-filter">
-                        <div class="form-group">
-                            <label for="edit-filter2-1">Wert 1:</label>
-                            <select id="edit-filter2-1" name="filter2" class="filter-dropdown-select">
-                                <option value="">-- Bitte auswählen --</option>
-                                <!-- Options will be loaded by JavaScript -->
-                            </select>
-                        </div>
-                        <div class="form-group">
-                            <label for="edit-filter2-2">Wert 2:</label>
-                            <select id="edit-filter2-2" name="filter2" class="filter-dropdown-select">
-                                <option value="">-- Optional --</option>
-                                <!-- Options will be loaded by JavaScript -->
-                            </select>
-                        </div>
-                        <div class="form-group">
-                            <label for="edit-filter2-3">Wert 3:</label>
-                            <select id="edit-filter2-3" name="filter2" class="filter-dropdown-select">
-                                <option value="">-- Optional --</option>
-                                <!-- Options will be loaded by JavaScript -->
-                            </select>
-                        </div>
-                        <div class="form-group">
-                            <label for="edit-filter2-4">Wert 4:</label>
-                            <select id="edit-filter2-4" name="filter2" class="filter-dropdown-select">
-                                <option value="">-- Optional --</option>
-                                <!-- Options will be loaded by JavaScript -->
-                            </select>
-                        </div>
-                    </div>
-                    
-                    <h3>Schlagwort:</h3>
-                    <div class="multi-filter">
-                        <div class="form-group">
-                            <label for="edit-filter3-1">Wert 1:</label>
-                            <input type="text" id="edit-filter3-1" name="filter3">
-                        </div>
-                        <div class="form-group">
-                            <label for="edit-filter3-2">Wert 2:</label>
-                            <input type="text" id="edit-filter3-2" name="filter3">
-                        </div>
-                        <div class="form-group">
-                            <label for="edit-filter3-3">Wert 3:</label>
-                            <input type="text" id="edit-filter3-3" name="filter3">
-                        </div>
-                        <div class="form-group">
-                            <label for="edit-filter3-4">Wert 4:</label>
-                            <input type="text" id="edit-filter3-4" name="filter3">
-                        </div>
-                    </div>
-                </div>
-                
-                <div class="form-group">
-                    <label for="edit-year">Anschaffungsjahr:</label>
-                    <input type="date" id="edit-year" name="anschaffungsjahr">
-                </div>
-                <div class="form-group">
-                    <label for="edit-cost">Anschaffungskosten (€):</label>
-                    <input id="edit-cost" name="anschaffungskosten">
-                </div>
-                <div class="form-group">
-                    <label for="edit-code4">Code:</label>
-                    <div style="display:flex; gap:8px; align-items:center; flex-wrap:wrap;">
-                        <input id="edit-code4" name="code_4">
-                        <button type="button" class="fetch-isbn-button" id="scan-edit-code-btn">Barcode scannen</button>
-                    </div>
-                </div>
-                
-                <div class="form-group">
-                    <label for="edit-reservierbar" style="display:inline-block; width:auto; margin-right:10px;">Reservierbar:</label>
-                    <input type="checkbox" id="edit-reservierbar" name="reservierbar" style="width:auto;">
-                    <small style="display:block; color:#666;">Wenn deaktiviert, kann der Artikel nicht im Voraus reserviert werden.</small>
-                </div>
-
-                <!-- New section for managing images -->
-                <div class="form-group">
-                    <label>Vorhandene Bilder:</label>
-                    <div id="edit-existing-images" class="existing-images-container">
-                        <!-- Existing images will be added here dynamically -->
-                    </div>
-                </div>
-                
-                <div class="form-group">
-                    <label for="edit-new-images">
-                        <span>Neue Bilder/Videos hinzufügen:</span>
-                        <span>(Bilder/Videos werden vom Original übernommen)</span>
-                    </label>
-                    <input type="file" id="edit-new-images" name="new_images" accept=".jpg, .jpeg, .png, .gif, .mp4, .mov, .avi, .mkv, .webm, .flv, .m4v, .3gp" multiple>
-                    <div class="allowed-formats">Erlaubte Formate: JPG, JPEG, PNG, GIF, MP4, MOV, AVI, MKV, WEBM, FLV, M4V, 3GP</div>
-                    <!-- Add image preview container -->
-                    <div class="image-preview-container" id="edit-image-preview-container"></div>
-                </div>
-                
-                <div class="form-group">
-                    <label for="edit-isbn">ISBN:</label>
-                    <div class="isbn-input-group">
-                        <input type="text" id="edit-isbn" name="isbn" placeholder="ISBN eingeben...">
-                        <button type="button" class="fetch-isbn-button" id="scan-edit-isbn-btn">ISBN scannen</button>
-                        <button type="button" class="fetch-isbn-button" onclick="fetchBookInfo('edit')">Buchinformationen abrufen</button>
-                    </div>
-                    <div id="edit-book-info-container" class="book-info-container"></div>
-                </div>
-                
-                <div class="form-actions">
-                    <button type="submit" class="save-button">Speichern</button>
-                    <button type="button" class="cancel-button" onclick="closeEditModal()">Abbrechen</button>
-                </div>
-            </form>
-        </div>
-    </div>
-    {% endif %}
 </div>
 
 <!-- Schedule Appointment Modal -->
@@ -2889,58 +2698,6 @@ document.addEventListener('DOMContentLoaded', ()=>{
         }
     });
 
-    function scanIntoEditCode() {
-        const qrReader = document.getElementById('qr-reader');
-        const editCodeInput = document.getElementById('edit-code4');
-        const scanEditBtn = document.getElementById('scan-edit-code-btn');
-        if (!qrReader || !editCodeInput || !scanEditBtn) {
-            return;
-        }
-
-        // Toggle close if it's already running
-        if (isScanning && qrReader.style.display !== 'none') {
-            stopScanner();
-            scanEditBtn.textContent = 'Barcode scannen';
-            return;
-        }
-
-        scanEditBtn.textContent = 'Scanner schließen';
-
-        // Start scanner with custom logic mapping to the Code input field
-        startScanner(function(decodedText) {
-            editCodeInput.value = decodedText;
-            validateCodeField(editCodeInput, document.getElementById('edit-item-id')?.value || null);
-            scanEditBtn.textContent = 'Barcode scannen';
-        });
-    }
-
-    function scanIntoEditIsbn() {
-        const qrReader = document.getElementById('qr-reader');
-        const editIsbnInput = document.getElementById('edit-isbn');
-        const scanIsbnBtn = document.getElementById('scan-edit-isbn-btn');
-        if (!qrReader || !editIsbnInput || !scanIsbnBtn) {
-            return;
-        }
-
-        // Toggle close if it's already running
-        if (isScanning && qrReader.style.display !== 'none') {
-            stopScanner();
-            scanIsbnBtn.textContent = 'ISBN scannen';
-            return;
-        }
-
-        scanIsbnBtn.textContent = 'Scanner schließen';
-
-        // Start scanner with custom logic mapping to the ISBN input field
-        startScanner(function(decodedText) {
-            editIsbnInput.value = decodedText;
-            scanIsbnBtn.textContent = 'ISBN scannen';
-            if (typeof fetchBookInfo === 'function') {
-                fetchBookInfo('edit');
-            }
-        });
-    }
-
     function rebuildFilter3Options() {
         if (!allItems) return;
         
@@ -3324,21 +3081,11 @@ document.addEventListener('DOMContentLoaded', ()=>{
         loadPredefinedFilterValues(1);
         loadPredefinedFilterValues(2);
         loadPredefinedFilterValues(3);
-        
-        // Set up edit form submission
-        setupEditFormSubmission();
+
         
         // Set up schedule form submission
         setupScheduleFormSubmission();
-        
-        // Set up add new location buttons
-        const editAddLocationBtn = document.getElementById('edit-add-new-location-btn');
-        if (editAddLocationBtn) {
-            editAddLocationBtn.addEventListener('click', function() {
-                const container = document.getElementById('edit-new-location-container');
-                container.style.display = container.style.display === 'none' ? 'block' : 'none';
-            });
-        }
+
         
         // Find and attach event listener to all logout links
         const logoutLinks = document.querySelectorAll('a[href*="logout"]');
@@ -3391,35 +3138,11 @@ document.addEventListener('DOMContentLoaded', ()=>{
         // Close modals when clicking outside
         window.onclick = function(event) {
             const itemModal = document.getElementById('item-modal');
-            const editModal = document.getElementById('edit-modal');
             
             if (event.target === itemModal) {
                 itemModal.style.display = 'none';
             }
-            if (event.target === editModal) {
-                editModal.style.display = 'none';
-            }
         };
-
-        // Set up code validation for edit form
-        const editCodeField = document.getElementById('edit-code4');
-        if (editCodeField) {
-            editCodeField.addEventListener('blur', function() {
-                const itemIdField = document.getElementById('edit-item-id');
-                const excludeId = itemIdField ? itemIdField.value : null;
-                validateCodeField(this, excludeId);
-            });
-        }
-
-        const scanEditCodeBtn = document.getElementById('scan-edit-code-btn');
-        if (scanEditCodeBtn) {
-            scanEditCodeBtn.addEventListener('click', scanIntoEditCode);
-        }
-
-        const scanEditIsbnBtn = document.getElementById('scan-edit-isbn-btn');
-        if (scanEditIsbnBtn) {
-            scanEditIsbnBtn.addEventListener('click', scanIntoEditIsbn);
-        }
     });
 
     // Function to load items from server
@@ -4171,162 +3894,6 @@ document.addEventListener('DOMContentLoaded', ()=>{
             });
     }
 
-    function openEditModalForSelectedUnit(defaultItemId, selectId) {
-        let targetItemId = defaultItemId;
-
-        try {
-            const selectedUnit = selectId ? document.getElementById(selectId) : null;
-            if (selectedUnit && selectedUnit.value) {
-                targetItemId = selectedUnit.value;
-            }
-        } catch (e) {
-            // Keep default item id as fallback.
-        }
-
-        openEditModalFromServer(targetItemId);
-    }
-
-    function closeEditModal() {
-        const editModal = document.getElementById('edit-modal');
-        if (editModal) {
-            editModal.style.display = 'none';
-        }
-    }
-
-    function openEditModalFromServer(itemId) {
-        const editModal = document.getElementById('edit-modal');
-        if (!editModal) {
-            console.error('Edit modal nicht gefunden');
-            return;
-        }
-
-        console.log('DEBUG: openEditModal called with itemId:', itemId);
-
-        // Fetch the item data from the backend
-        fetch(`/get_item/${itemId}`)
-            .then(response => {
-                console.log('DEBUG: Response status:', response.status);
-                if (!response.ok) throw new Error(`HTTP ${response.status}`);
-                return response.json();
-            })
-            .then(data => {
-                console.log('DEBUG: Fetched data:', data);
-                // Backend returns the item directly or wrapped in error/success
-                const item = data.error ? null : (data.item || data);
-                
-                console.log('DEBUG: Parsed item:', item);
-                
-                if (!item || !item._id) {
-                    console.error('DEBUG: Item not found or invalid');
-                    alert('Item nicht gefunden');
-                    return;
-                }
-
-                // Fill in the form fields with the item data
-                document.getElementById('edit-item-id').value = item._id || '';
-                document.getElementById('edit-name').value = item.Name || '';
-                document.getElementById('edit-location').value = item.Ort || '';
-                document.getElementById('edit-description').value = item.Beschreibung || '';
-                document.getElementById('edit-year').value = item.Anschaffungsjahr || '';
-                document.getElementById('edit-cost').value = item.Anschaffungskosten || '';
-                document.getElementById('edit-code4').value = item.Code_4 || '';
-                document.getElementById('edit-isbn').value = item.ISBN || '';
-                document.getElementById('edit-reservierbar').checked = item.Reservierbar !== false;
-
-                // Fill in filter 1 (Unterrichtsfach)
-                const filter1Array = Array.isArray(item.Filter) ? item.Filter : (item.Filter ? [item.Filter] : []);
-                document.getElementById('edit-filter1-1').value = filter1Array[0] || '';
-                document.getElementById('edit-filter1-2').value = filter1Array[1] || '';
-                document.getElementById('edit-filter1-3').value = filter1Array[2] || '';
-                document.getElementById('edit-filter1-4').value = filter1Array[3] || '';
-
-                // Fill in filter 2 (Jahrgangsstufe)
-                const filter2Array = Array.isArray(item.Filter2) ? item.Filter2 : (item.Filter2 ? [item.Filter2] : []);
-                document.getElementById('edit-filter2-1').value = filter2Array[0] || '';
-                document.getElementById('edit-filter2-2').value = filter2Array[1] || '';
-                document.getElementById('edit-filter2-3').value = filter2Array[2] || '';
-                document.getElementById('edit-filter2-4').value = filter2Array[3] || '';
-
-                // 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] || '';
-                document.getElementById('edit-filter3-3').value = filter3Array[2] || '';
-                document.getElementById('edit-filter3-4').value = filter3Array[3] || '';
-
-                // Display existing images
-                const existingImagesContainer = document.getElementById('edit-existing-images');
-                const editForm = document.getElementById('edit-item-form');
-                existingImagesContainer.innerHTML = '';
-                if (editForm) {
-                    editForm.querySelectorAll('input[name="existing_images"], input[name="removed_images"]').forEach(input => input.remove());
-                }
-                if (item.Images && Array.isArray(item.Images)) {
-                    item.Images.forEach((image, index) => {
-                        const isVideo = isVideoFile(image);
-                        const imageDiv = document.createElement('div');
-                        imageDiv.className = 'existing-image-item';
-                        imageDiv.style.marginBottom = '10px';
-
-                        const thumbnailInfo = item.ThumbnailInfo && item.ThumbnailInfo[index];
-                        const imageSrc = thumbnailInfo && thumbnailInfo.has_preview ? 
-                            thumbnailInfo.preview_url : 
-                            (image.startsWith('/uploads/') || image.startsWith('http') ? 
-                                image : 
-                                `{{ url_for('uploaded_file', filename='') }}${image}`);
-
-                        const row = document.createElement('div');
-                        row.style.display = 'flex';
-                        row.style.gap = '8px';
-                        row.style.alignItems = 'center';
-
-                        if (isVideo) {
-                            const video = document.createElement('video');
-                            video.src = imageSrc;
-                            video.style.maxWidth = '100px';
-                            video.style.maxHeight = '100px';
-                            video.style.objectFit = 'contain';
-                            video.controls = true;
-                            row.appendChild(video);
-                        } else {
-                            const img = document.createElement('img');
-                            img.src = imageSrc;
-                            img.style.maxWidth = '100px';
-                            img.style.maxHeight = '100px';
-                            img.style.objectFit = 'contain';
-                            img.alt = `Existierendes Bild ${index + 1}`;
-                            row.appendChild(img);
-                        }
-
-                        const deleteButton = document.createElement('button');
-                        deleteButton.type = 'button';
-                        deleteButton.className = 'delete-image-button';
-                        deleteButton.textContent = 'Löschen';
-                        deleteButton.addEventListener('click', () => removeExistingImage(image, deleteButton));
-                        row.appendChild(deleteButton);
-
-                        imageDiv.appendChild(row);
-                        existingImagesContainer.appendChild(imageDiv);
-
-                        if (editForm) {
-                            const hiddenInput = document.createElement('input');
-                            hiddenInput.type = 'hidden';
-                            hiddenInput.name = 'existing_images';
-                            hiddenInput.value = image;
-                            editForm.appendChild(hiddenInput);
-                        }
-                    });
-                }
-
-                // Display the modal
-                editModal.style.display = 'block';
-            })
-            .catch(error => {
-                console.error('Fehler beim Laden des Items:', error);
-                alert('Fehler beim Laden des Items');
-            });
-    }
-
     function escapeHtml(value) {
         return String(value ?? '').replace(/[&<>'"]/g, (char) => {
             const map = {
@@ -4686,7 +4253,9 @@ document.addEventListener('DOMContentLoaded', ()=>{
                 <button type="button" class="details-button" onclick="document.getElementById('item-modal').style.display='none';">Schließen</button>
             </div>
         `;
-        
+
+
+
         modal.style.display = 'block';
         
         const closeButton = modal.querySelector('.close-modal');
@@ -4923,6 +4492,13 @@ document.addEventListener('DOMContentLoaded', ()=>{
         });
     }
 
+    function openEditModalForSelectedUnit(itemId, selectId) {
+    const select = document.getElementById(selectId);
+    const targetId = (select && select.value) ? select.value : itemId;
+    // Leitet auf die Bearbeiten-Seite weiter und übergibt die aktuelle URL für den Redirect nach dem Speichern
+    window.location.href = `/item_edit/${targetId}`;
+    }
+
     function changeModalImage(direction) {
         const currentIndex = window.currentModalImageIndex;
         const total = window.totalModalImages;
@@ -5349,8 +4925,6 @@ document.addEventListener('DOMContentLoaded', ()=>{
         });
     }
 
-    // Load location options for edit modal
-    // Edit-related functions moved to edit_item_functions.html
 
     // Schedule modal functions
     function openScheduleModal(itemId) {
@@ -5470,50 +5044,6 @@ document.addEventListener('DOMContentLoaded', ()=>{
         }
     }
 
-    // Setup edit form submission
-    function setupEditFormSubmission() {
-        const editForm = document.getElementById('edit-item-form');
-        if (editForm) {
-            editForm.addEventListener('submit', function(e) {
-                e.preventDefault();
-                
-                const itemId = document.getElementById('edit-item-id').value;
-                const formData = new FormData(this);
-                
-                fetch(`/edit_item/${itemId}`, {
-                    method: 'POST',
-                    body: formData
-                })
-                .then(response => {
-                    if (response.ok) {
-                        closeEditModal();
-                        // Reload items to show updated information
-                        loadItems();
-                        // Show success message
-                        const successMsg = document.createElement('div');
-                        successMsg.className = 'alert alert-success';
-                        successMsg.textContent = 'Item wurde erfolgreich aktualisiert!';
-                        successMsg.style.position = 'fixed';
-                        successMsg.style.top = '20px';
-                        successMsg.style.right = '20px';
-                        successMsg.style.zIndex = '9999';
-                        document.body.appendChild(successMsg);
-                        setTimeout(() => {
-                            if (successMsg.parentNode) {
-                                successMsg.parentNode.removeChild(successMsg);
-                            }
-                        }, 3000);
-                    } else {
-                        alert('Fehler beim Aktualisieren des Items');
-                    }
-                })
-                .catch(error => {
-                    console.error('Error updating item:', error);
-                    alert('Fehler beim Aktualisieren des Items');
-                });
-            });
-        }
-    }
 
     // Duplication function
     function duplicateItem(itemId) {
@@ -5632,10 +5162,62 @@ document.addEventListener('DOMContentLoaded', ()=>{
         futureAppointments.sort((a, b) => new Date(a.date) - new Date(b.date));
         return futureAppointments[0];
     }
-</script>
 
-<!-- Include edit item functions -->
-{% include "edit_item_functions.html" %}
+    // 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 reset item functions -->
 {% include "reset_item_functions.html" %}
@@ -5864,16 +5446,4 @@ document.addEventListener('DOMContentLoaded', ()=>{
     }
 }
 </style>
-
-{% if open_item %}
-<script>
-    document.addEventListener("DOMContentLoaded", function() {
-        if (typeof openEditModalFromServer === 'function') {
-            setTimeout(function() {
-                openEditModalFromServer('{{ open_item }}');
-            }, 500);
-        }
-    });
-</script>
-{% endif %}
 {% endblock %}