chore: bump version to v0.8.31

.github/workflows/release-docker.yml

@@ -15,6 +15,15 @@ on:
           - patch
           - minor
           - major
+          - development
+      push_dev:
+        description: "If true, push the :dev image to GHCR for development releases"
+        required: false
+        default: "false"
+        type: choice
+        options:
+          - "true"
+          - "false"
 
 permissions:
   contents: write
@@ -39,12 +48,13 @@ jobs:
           EVENT_NAME: ${{ github.event_name }}
           REF_NAME: ${{ github.ref_name }}
           BUMP_TYPE: ${{ github.event.inputs.bump || 'patch' }}
+          PUSH_DEV: ${{ github.event.inputs.push_dev || 'false' }}
         run: |
           if [ "$EVENT_NAME" = "push" ] && [ -n "$REF_NAME" ]; then
             TAG="$REF_NAME"
           else
-            # Fetch latest release tag via GitHub API (fall back to v0.8.31)
-            latest_tag="v0.8.31"
+            # Fetch latest release tag via GitHub API (fall back to v3.0.0)
+            latest_tag="v3.0.0"
             if meta_json=$(curl -fsSL -H "Authorization: Bearer $GH_TOKEN" -H "Accept: application/vnd.github+json" "https://api.github.com/repos/$REPO/releases/latest" 2>/dev/null); then
               tag_name=$(printf "%s" "$meta_json" | sed -n 's/.*"tag_name"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p' | head -n1)
               if [ -n "$tag_name" ]; then
@@ -57,7 +67,7 @@ jobs:
               minor=${BASH_REMATCH[2]}
               patch=${BASH_REMATCH[3]}
             else
-              major=0; minor=8; patch=31
+              major=3; minor=0; patch=0
             fi
 
             # Bump strategy: major / minor / patch
@@ -68,28 +78,30 @@ jobs:
             else
               patch=$((patch + 1))
             fi
-            
-            # Zusammenbau des Tags für den manuellen Run
-            TAG="v${major}.${minor}.${patch}"
+
+            if [ "${BUMP_TYPE:-}" = "development" ]; then
+              TAG="v${major}.${minor}.${patch}-dev"
+            else
+              TAG="v${major}.${minor}.${patch}"
+            fi
           fi
 
-          # Validierung des erzeugten oder übergebenen Tags
           if ! echo "$TAG" | grep -Eq '^v[0-9]+\.[0-9]+\.[0-9]+(-dev(\.[0-9]+)?)?$'; then
-            echo "Error: tag '$TAG' is not valid semver (vX.Y.Z)"
+            echo "Error: tag '$TAG' is not valid semver (vX.Y.Z or vX.Y.Z-dev)"
             exit 1
           fi
 
           git fetch --tags --force
           LATEST_TAG="$(git tag -l 'v*' | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -n1)"
           if [ -z "$LATEST_TAG" ]; then
-            LATEST_TAG="v0.8.31"
+            LATEST_TAG="v3.0.0"
           fi
 
           TAG_MAJOR="${TAG#v}"
           TAG_MAJOR="${TAG_MAJOR%%.*}"
           LATEST_MAJOR="$(echo "$LATEST_TAG" | grep -Eo '^v[0-9]+' | tr -d 'v')"
           if [ -z "$LATEST_MAJOR" ]; then
-            LATEST_MAJOR="0"
+            LATEST_MAJOR="3"
           fi
 
           # If not explicitly bumping major, disallow changing major version
@@ -111,6 +123,33 @@ jobs:
           IMAGE="ghcr.io/aiirondev/legendary-octo-garbanzo:${TAG}"
           echo "tag=$TAG" >> "$GITHUB_OUTPUT"
           echo "image=$IMAGE" >> "$GITHUB_OUTPUT"
+          if [ "${BUMP_TYPE:-}" = "development" ]; then
+            echo "is_development=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "is_development=false" >> "$GITHUB_OUTPUT"
+          fi
+          if [ "${BUMP_TYPE:-}" = "development" ] && [ "${PUSH_DEV:-}" = "true" ]; then
+            echo "push_dev=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "push_dev=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Update .release-version file
+        run: |
+          echo "${{ steps.meta.outputs.tag }}" > .release-version
+          cat .release-version
+
+      - name: Create and push tag for manual releases
+        if: github.event_name == 'workflow_dispatch'
+        run: |
+          TAG="${{ steps.meta.outputs.tag }}"
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add .release-version
+          git commit -m "chore: bump version to $TAG" || true
+          git tag "$TAG"
+          git push origin "$TAG"
+          git push origin HEAD:${{ github.ref_name }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -123,16 +162,26 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push release image
+        if: steps.meta.outputs.is_development != 'true'
         uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile
           push: true
-          load: true # Lädt das Image in den lokalen Docker-Daemon für den 'docker save' Schritt
           tags: |
             ${{ steps.meta.outputs.image }}
             ghcr.io/aiirondev/legendary-octo-garbanzo:latest
 
+      - name: Build and push development image (:dev)
+        if: steps.meta.outputs.is_development == 'true' && steps.meta.outputs.push_dev == 'true'
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: |
+            ghcr.io/aiirondev/legendary-octo-garbanzo:dev
+
       - name: Build local image tar for offline deploy
         run: |
           set -euo pipefail
@@ -155,17 +204,30 @@ jobs:
           docker build -t "$IMG" .
           docker save "$IMG" | gzip > "inventarsystem-image-${TAG}.tar.gz"
 
+      # development tar omitted: dev releases will be versioned (vX.Y.Z-dev) and handled by update.sh using the tag
+
+      - name: Commit .release-version for tag pushes
+        if: github.event_name == 'push'
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          if ! git diff --quiet .release-version; then
+            git add .release-version
+            git commit -m "chore: update version to ${{ steps.meta.outputs.tag }}"
+            git push origin HEAD:${{ github.ref_name }}
+          fi
+
       - name: Create release-only docker bundle
         run: |
           mkdir -p release-bundle
           cat > release-bundle/docker-compose.yml <<EOF
           services:
             app:
-              image: \${INVENTAR_APP_IMAGE:-ghcr.io/aiirondev/legendary-octo-garbanzo:${{ steps.meta.outputs.tag }}}
+              image: ${INVENTAR_APP_IMAGE:-ghcr.io/aiirondev/legendary-octo-garbanzo:${{ steps.meta.outputs.tag }}}
               container_name: inventarsystem-app
               restart: unless-stopped
               ports:
-                - "\${INVENTAR_HTTP_PORT:-10000}:8000"
+                - "${INVENTAR_HTTP_PORT:-10000}:8000"
               depends_on:
                 - mongodb
                 - redis
@@ -238,6 +300,17 @@ jobs:
             fi
           done
 
+          cat > release-bundle/DEVELOPMENT.md <<EOF
+          This is a development prerelease bundle for tag: ${{ steps.meta.outputs.tag }}
+
+          This prerelease is intentionally separate from normal releases and will not be used by default.
+
+          To install this prerelease on a target host run:
+
+            ./update.sh ${{ steps.meta.outputs.tag }}
+
+          EOF
+
           # Make any shipped scripts executable
           find release-bundle -maxdepth 1 -type f -name '*.sh' -exec chmod +x {} \; || true
           tar -czf inventarsystem-docker-bundle.tar.gz -C release-bundle .
@@ -246,8 +319,10 @@ jobs:
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ steps.meta.outputs.tag }}
+          prerelease: ${{ steps.meta.outputs.is_development }}
           files: |
             inventarsystem-docker-bundle.tar.gz
             inventarsystem-image-${{ steps.meta.outputs.tag }}.tar.gz
+            inventarsystem-image-dev.tar.gz
           fail_on_unmatched_files: false
-          generate_release_notes: true
+          generate_release_notes: true

.release-version

@@ -1 +1 @@
-v0.8.31.1
+v0.8.31

Web/app.py

@@ -1268,8 +1268,7 @@ def inject_version():
         'inventory_module_enabled': cfg.MODULES.is_enabled('inventory'),
         'terminplan_module_enabled': cfg.MODULES.is_enabled('terminplan'),
         'library_module_enabled': cfg.MODULES.is_enabled('library'),
-        'student_cards_module_enabled': cfg.MODULES.is_enabled('student_cards'),#
-        'mail_module_enabled': cfg.MODULES.is_enabled('mail'),
+        'student_cards_module_enabled': cfg.MODULES.is_enabled('student_cards'),
         'is_admin': is_admin,
         'unread_notification_count': unread_notification_count,
         'current_permissions': current_permissions,
@@ -2886,7 +2885,6 @@ def home():
             username=session['username'],
             library_module_enabled=cfg.MODULES.is_enabled('library'),
             student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
-            mail_module_enabled=cfg.MODULES.is_enabled('mail'),
             student_default_borrow_days=cfg.STUDENT_DEFAULT_BORROW_DAYS,
             student_max_borrow_days=cfg.STUDENT_MAX_BORROW_DAYS,
             open_item=request.args.get('open_item')
@@ -2929,7 +2927,6 @@ def home_admin():
         username=session['username'],
         library_module_enabled=cfg.MODULES.is_enabled('library'),
         student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
-        mail_module_enabled=cfg.MODULES.is_enabled('mail'),
         student_default_borrow_days=cfg.STUDENT_DEFAULT_BORROW_DAYS,
         student_max_borrow_days=cfg.STUDENT_MAX_BORROW_DAYS,
         school_info=_get_school_info_for_export(),
@@ -2950,7 +2947,6 @@ def tutorial_page():
         is_admin=us.check_admin(session['username']),
         library_module_enabled=cfg.MODULES.is_enabled('library'),
         student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
-        mail_module_enabled=cfg.MODULES.is_enabled('mail'),
         student_default_borrow_days=cfg.STUDENT_DEFAULT_BORROW_DAYS,
         student_max_borrow_days=cfg.STUDENT_MAX_BORROW_DAYS
     )
@@ -3488,6 +3484,66 @@ def api_library_scan_action():
             client.close()
 
 
+@app.route('/api/scan_upload', methods=['POST'])
+def api_scan_upload():
+    """
+    Server-side barcode/QR decoding endpoint.
+    Accepts image upload and returns detected barcodes (fallback for client-side scanner).
+    """
+    if 'username' not in session:
+        return jsonify({'ok': False, 'message': 'Nicht angemeldet.'}), 401
+
+    try:
+        from pyzbar.pyzbar import decode
+        from PIL import Image
+        import io
+    except ImportError:
+        return jsonify({'ok': False, 'message': 'pyzbar library not installed on server.'}), 500
+
+    if 'image' not in request.files:
+        return jsonify({'ok': False, 'message': 'Keine Bilddatei bereitgestellt.'}), 400
+
+    file = request.files['image']
+    if file.filename == '':
+        return jsonify({'ok': False, 'message': 'Datei ist leer.'}), 400
+
+    try:
+        # Decode image
+        image = Image.open(io.BytesIO(file.read()))
+        image = image.convert('RGB')
+
+        # Detect barcodes using pyzbar
+        results = decode(image)
+
+        if not results:
+            return jsonify({'ok': False, 'message': 'Kein Barcode im Bild erkannt.'}), 400
+
+        # Return all detected barcodes, sorted by confidence (quality)
+        barcodes = [
+            {
+                'type': result.type,
+                'value': result.data.decode('utf-8'),
+                'rect': {
+                    'x': result.rect.left,
+                    'y': result.rect.top,
+                    'width': result.rect.width,
+                    'height': result.rect.height,
+                }
+            }
+            for result in results
+        ]
+
+        return jsonify({
+            'ok': True,
+            'barcodes': barcodes,
+            'message': f'{len(barcodes)} Barcode(s) erkannt.'
+        }), 200
+
+    except Exception as e:
+        app.logger.error(f"Error decoding barcode image: {e}")
+        return jsonify({'ok': False, 'message': f'Fehler beim Dekodieren: {str(e)}'}), 500
+
+
 @app.route('/api/item_detail/<item_id>')
 def api_item_detail(item_id):
     """
@@ -5211,87 +5267,55 @@ def upload_item():
             flash(error_msg, 'error')
             return redirect(url_for(success_redirect_endpoint))
 
-    # -------------------------------------------------------------------
-    # 1. PARSE AND UNIFY CODES
-    # -------------------------------------------------------------------
-    # Assuming `code_4` might come in as a single string or a list depending on your form setup
-    primary_code_raw = request.form.get('code_4', '').strip()
-    individual_codes_raw = request.form.get('individual_codes', '').strip()
-    
-    all_item_codes = []
-    
-    if primary_code_raw:
-        all_item_codes.append(primary_code_raw)
-        
-    if individual_codes_raw:
-        # Split textarea by newlines, clean whitespace, and ignore empty lines
-        extra_codes = [c.strip() for c in individual_codes_raw.replace('\r', '').split('\n') if c.strip()]
-        
-        # Add to master list, ensuring no duplicates within the submitted list itself
-        for c in extra_codes:
-            if c not in all_item_codes:
-                all_item_codes.append(c)
-
-    # -------------------------------------------------------------------
-    # 2. OVERRIDE ITEM COUNT
-    # -------------------------------------------------------------------
-    # If the user scanned/generated codes, the amount of codes IS the item count.
-    # Otherwise, fallback to a manual item_count field if it exists.
-    if len(all_item_codes) > 0:
-        item_count = len(all_item_codes)
-    else:
-        try:
-            item_count = int(request.form.get('item_count', 1))
-        except ValueError:
-            item_count = 1
-
-    # -------------------------------------------------------------------
-    # 3. IMAGE VALIDATION
-    # -------------------------------------------------------------------
-    if upload_mode != 'library' and not is_duplicating and not images and not duplicate_images and not book_cover_image:
-        error_msg = 'Bitte laden Sie mindestens ein Bild hoch'
-        if is_mobile:
-            return jsonify({'success': False, 'message': error_msg}), 400
+    # Check if base code is unique for single-item uploads
+    if code_4 and item_count == 1 and not it.is_code_unique(code_4[0]):
+        existing_item = it._get_items_collection().find_one({"code_4": code_4[0]})
+        if existing_item:
+            error_msg = 'Der Code wird bereits verwendet. Umleitung zum Eintrag.'
+            if is_mobile:
+                return jsonify({
+                    'success': False, 
+                    'message': error_msg,
+                    'existing_item_id': str(existing_item['_id']),
+                    'redirect_to_item': True
+                }), 400
+            
+            flash(error_msg, 'info')
+            return redirect(url_for(success_redirect_endpoint, open_item=str(existing_item['_id'])))
         else:
-            flash(error_msg, 'error')
-            return redirect(url_for(success_redirect_endpoint))
-
-    # -------------------------------------------------------------------
-    # 4. UNIFIED DB UNIQUENESS VALIDATION
-    # -------------------------------------------------------------------
-    # Validate every code in our master list against the database
-    for code in all_item_codes:
-        if not it.is_code_unique(code):
-            
-            # Special case: If they only uploaded ONE item, redirect them to that existing item
-            if item_count == 1:
-                existing_item = it._get_items_collection().find_one({"code_4": code})
-                if existing_item:
-                    error_msg = 'Der Code wird bereits verwendet. Umleitung zum Eintrag.'
-                    if is_mobile:
-                        return jsonify({
-                            'success': False, 
-                            'message': error_msg,
-                            'existing_item_id': str(existing_item['_id']),
-                            'redirect_to_item': True
-                        }), 400
-                    
-                    flash(error_msg, 'info')
-                    return redirect(url_for(success_redirect_endpoint, open_item=str(existing_item['_id'])))
-            
-            # If multiple items are being uploaded, just throw a standard error
-            error_msg = f'Der Code "{code}" wird bereits von einem anderen Artikel verwendet. Bitte überprüfen Sie Ihre Eingaben.'
+            error_msg = 'Der Code wird bereits verwendet. Bitte wählen Sie einen anderen Code.'
             if is_mobile:
                 return jsonify({'success': False, 'message': error_msg}), 400
             else:
                 flash(error_msg, 'error')
                 return redirect(url_for(success_redirect_endpoint))
 
-    # -------------------------------------------------------------------
-    # 5. BATCH CODE GENERATOR (Remains mostly unchanged)
-    # -------------------------------------------------------------------
+    # Validate optional per-item codes
+    if individual_codes:
+        if len(individual_codes) > item_count:
+            error_msg = f'Zu viele Einzelcodes angegeben ({len(individual_codes)}), erlaubt sind maximal {item_count}.'
+            if is_mobile:
+                return jsonify({'success': False, 'message': error_msg}), 400
+            flash(error_msg, 'error')
+            return redirect(url_for(success_redirect_endpoint))
+
+        if len(set(individual_codes)) != len(individual_codes):
+            error_msg = 'Doppelte Einzelcodes erkannt. Bitte alle Codes eindeutig eintragen.'
+            if is_mobile:
+                return jsonify({'success': False, 'message': error_msg}), 400
+            flash(error_msg, 'error')
+            return redirect(url_for(success_redirect_endpoint))
+
+        for specific_code in individual_codes:
+            if not it.is_code_unique(specific_code):
+                error_msg = f'Der Einzelcode "{specific_code}" wird bereits verwendet.'
+                if is_mobile:
+                    return jsonify({'success': False, 'message': error_msg}), 400
+                flash(error_msg, 'error')
+                return redirect(url_for(success_redirect_endpoint))
+
     def generate_unique_batch_code(base_code, position):
-        """Generate a unique code for every item in a batch if no specific code is provided."""
+        """Generate a unique code for every item in a batch."""
         if not base_code:
             return None
 
@@ -7984,8 +8008,7 @@ def admin_borrowings():
         'admin_borrowings.html',
         entries=entries,
         library_module_enabled=cfg.MODULES.is_enabled('library'),
-        student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
-        mail_module_enabled=cfg.MODULES.is_enabled('mail')
+        student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards')
     )
 
 """-----------------------------------------------------------Audit Routes-------------------------------------------------------"""
@@ -8048,7 +8071,6 @@ def admin_audit_dashboard():
             audit_rows=audit_rows,
             library_module_enabled=cfg.MODULES.is_enabled('library'),
             student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
-            mail_module_enabled=cfg.MODULES.is_enabled('mail'),
         )
     except Exception as exc:
         app.logger.error(f"Error loading audit dashboard: {exc}")
@@ -8864,7 +8886,6 @@ def library_item_invoices(item_id):
             invoices=entries,
             library_module_enabled=cfg.MODULES.is_enabled('library'),
             student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
-            mail_module_enabled=cfg.MODULES.is_enabled('mail')
         )
     except Exception as e:
         app.logger.error(f"Error loading invoice history for item {item_id}: {e}")
@@ -9415,137 +9436,17 @@ def search_word(word):
     except Exception as e:
         return jsonify({"success": False, "response": str(e)})
 
-def _fetch_from_google_books(clean_isbn):
-    """Source 1: Google Books API (Free, No Key required for basic use)"""
-    try:
-        url = f"https://www.googleapis.com/books/v1/volumes?q=isbn:{clean_isbn}"
-        response = requests.get(url, timeout=5)
-        if response.status_code != 200:
-            return None
-        
-        data = response.json()
-        if data.get('totalItems', 0) > 0 and data.get('items'):
-            book_info = data['items'][0].get('volumeInfo', {})
-            sale_info = data['items'][0].get('saleInfo', {})
-
-            price = None
-            retail_price = sale_info.get('retailPrice', {})
-            list_price = sale_info.get('listPrice', {})
-            if retail_price and 'amount' in retail_price:
-                price = f"{retail_price['amount']} {retail_price.get('currencyCode', '€')}"
-            elif list_price and 'amount' in list_price:
-                price = f"{list_price['amount']} {list_price.get('currencyCode', '€')}"
-
-            thumbnail = book_info.get('imageLinks', {}).get('thumbnail', '')
-            if thumbnail:
-                thumbnail = thumbnail.replace('http:', 'https:')
-
-            return {
-                "title": book_info.get('title', 'Unknown Title'),
-                "authors": ', '.join(book_info.get('authors', ['Unknown Author'])),
-                "publisher": book_info.get('publisher', 'Unknown Publisher'),
-                "publishedDate": book_info.get('publishedDate', 'Unknown Date'),
-                "description": book_info.get('description', 'Keine Beschreibung verfügbar'),
-                "pageCount": book_info.get('pageCount', 'Unknown'),
-                "price": price,
-                "thumbnail": thumbnail,
-                "source": "google-books"
-            }
-    except Exception as e:
-        print(f"Google Books error: {e}")
-    return None
-
-
-def _fetch_from_lobid_germany(clean_isbn):
-    """
-    Source 2: Lobid.org (hbz Network)
-    The ultimate free, keyless fallback for German Schoolbooks and DACH literature.
-    """
-    try:
-        url = f"https://lobid.org/resources?q=isbn:{clean_isbn}&format=json"
-        response = requests.get(url, timeout=5)
-        if response.status_code != 200:
-            return None
-            
-        data = response.json()
-        if 'member' in data and len(data['member']) > 0:
-            book = data['member'][0]
-            
-            # Extract Authors (Lobid uses a nested contribution array)
-            authors = []
-            for contrib in book.get('contribution', []):
-                if 'agent' in contrib and 'label' in contrib['agent']:
-                    authors.append(contrib['agent']['label'])
-            
-            # Extract Publishers
-            publishers = []
-            for pub in book.get('publication', []):
-                if 'publishedBy' in pub:
-                    # sometimes publishedBy is a list, sometimes a string
-                    pub_data = pub['publishedBy']
-                    if isinstance(pub_data, list):
-                        publishers.extend(pub_data)
-                    else:
-                        publishers.append(pub_data)
-            
-            # Extract Date
-            pub_date = 'Unknown Date'
-            if book.get('publication'):
-                pub_date = book['publication'][0].get('startDate', 'Unknown Date')
-                
-            # Extract Pages
-            pages = book.get('extent', ['Unknown'])[0] if 'extent' in book else 'Unknown'
-            
-            return {
-                "title": book.get('title', 'Unknown Title'),
-                "authors": ', '.join(authors) if authors else 'Unknown Author',
-                "publisher": ', '.join(publishers) if publishers else 'Unknown Publisher',
-                "publishedDate": str(pub_date),
-                "description": 'Keine Beschreibung verfügbar (Schulbuch / Fachliteratur)',
-                "pageCount": pages,
-                "price": None,
-                "thumbnail": "", # Lobid rarely has covers, we will fallback to OpenLibrary cover below
-                "source": "lobid-germany"
-            }
-    except Exception as e:
-        print(f"Lobid error: {e}")
-    return None
-
-
-def _fetch_from_open_library(clean_isbn):
-    """Source 3: Open Library Search API (Free, No Key required)"""
-    try:
-        url = f"https://openlibrary.org/search.json?isbn={clean_isbn}"
-        response = requests.get(url, timeout=5)
-        if response.status_code != 200:
-            return None
-            
-        data = response.json()
-        if data.get('numFound', 0) > 0 and data.get('docs'):
-            book_info = data['docs'][0]
-            
-            return {
-                "title": book_info.get('title', 'Unknown Title'),
-                "authors": ', '.join(book_info.get('author_name', ['Unknown Author'])),
-                "publisher": ', '.join(book_info.get('publisher', ['Unknown Publisher'])),
-                "publishedDate": str(book_info.get('publish_date', ['Unknown Date'])[0]),
-                "description": 'Keine Beschreibung verfügbar',
-                "pageCount": book_info.get('number_of_pages_median', 'Unknown'),
-                "price": None,
-                "thumbnail": f"https://covers.openlibrary.org/b/isbn/{clean_isbn}-L.jpg",
-                "source": "openlibrary"
-            }
-    except Exception as e:
-        print(f"OpenLibrary Search error: {e}")
-    return None
-
 @app.route('/fetch_book_info/<isbn>')
 def fetch_book_info(isbn):
     """
-    API endpoint to fetch book information by ISBN using multiple open sources.
-    Optimized for global literature AND German educational books.
+    API endpoint to fetch book information by ISBN using Google Books API
+    
+    Args:
+        isbn (str): ISBN to look up
+        
+    Returns:
+        dict: Book information or error message
     """
-    # Authorization Checks
     if 'username' not in session or not us.check_admin(session['username']):
         return jsonify({"error": "Not authorized"}), 403
 
@@ -9553,33 +9454,79 @@ def fetch_book_info(isbn):
         return jsonify({"error": "Bibliotheks-Modul ist deaktiviert."}), 403
 
     try:
-        # Validation
         clean_isbn = normalize_and_validate_isbn(isbn)
         if not clean_isbn:
             return jsonify({"error": "Ungültige ISBN. Bitte ISBN-10 oder ISBN-13 verwenden."}), 400
 
-        # Define the Provider Chain (Order matters: General -> German/School -> Global Fallback)
-        providers = [
-            _fetch_from_google_books,
-            _fetch_from_lobid_germany,
-            _fetch_from_open_library
-        ]
+        # First source: Google Books
+        response = requests.get(
+            f"https://www.googleapis.com/books/v1/volumes?q=isbn:{clean_isbn}",
+            timeout=10
+        )
 
-        # Iterate through providers until a book is found
-        for provider in providers:
-            book_data = provider(clean_isbn)
-            
-            if book_data:
-                # Add the ISBN back into the response payload
-                book_data["isbn"] = clean_isbn
-                
-                # If a provider found the book but had no cover, assign a default OpenLibrary cover fallback
-                if not book_data.get("thumbnail"):
-                    book_data["thumbnail"] = f"https://covers.openlibrary.org/b/isbn/{clean_isbn}-L.jpg"
-                    
-                return jsonify(book_data)
+        if response.status_code == 200:
+            data = response.json()
+            if data.get('totalItems', 0) > 0 and data.get('items'):
+                book_info = data['items'][0].get('volumeInfo', {})
+                sale_info = data['items'][0].get('saleInfo', {})
+
+                price = None
+                retail_price = sale_info.get('retailPrice', {})
+                list_price = sale_info.get('listPrice', {})
+                if retail_price and 'amount' in retail_price:
+                    price = f"{retail_price['amount']} {retail_price.get('currencyCode', '€')}"
+                elif list_price and 'amount' in list_price:
+                    price = f"{list_price['amount']} {list_price.get('currencyCode', '€')}"
+
+                thumbnail = book_info.get('imageLinks', {}).get('thumbnail', '')
+                if thumbnail:
+                    thumbnail = thumbnail.replace('http:', 'https:')
+
+                return jsonify({
+                    "title": book_info.get('title', 'Unknown Title'),
+                    "authors": ', '.join(book_info.get('authors', ['Unknown Author'])),
+                    "publisher": book_info.get('publisher', 'Unknown Publisher'),
+                    "publishedDate": book_info.get('publishedDate', 'Unknown Date'),
+                    "description": book_info.get('description', 'No description available'),
+                    "pageCount": book_info.get('pageCount', 'Unknown'),
+                    "price": price,
+                    "thumbnail": thumbnail,
+                    "isbn": clean_isbn,
+                    "source": "google-books"
+                })
+
+        # Fallback: OpenLibrary
+        ol_response = requests.get(
+            f"https://openlibrary.org/isbn/{clean_isbn}.json",
+            timeout=10
+        )
+        if ol_response.status_code == 200:
+            ol_data = ol_response.json()
+            author_names = []
+            for author_ref in ol_data.get('authors', []):
+                key = author_ref.get('key')
+                if not key:
+                    continue
+                try:
+                    author_resp = requests.get(f"https://openlibrary.org{key}.json", timeout=8)
+                    if author_resp.status_code == 200:
+                        author_names.append(author_resp.json().get('name'))
+                except Exception:
+                    continue
+
+            return jsonify({
+                "title": ol_data.get('title', 'Unknown Title'),
+                "authors": ', '.join([a for a in author_names if a]) if author_names else 'Unknown Author',
+                "publisher": ', '.join(ol_data.get('publishers', [])) if ol_data.get('publishers') else 'Unknown Publisher',
+                "publishedDate": ol_data.get('publish_date', 'Unknown Date'),
+                "description": (ol_data.get('description', {}).get('value') if isinstance(ol_data.get('description'), dict) else ol_data.get('description')) or 'No description available',
+                "pageCount": ol_data.get('number_of_pages', 'Unknown'),
+                "price": None,
+                "thumbnail": f"https://covers.openlibrary.org/b/isbn/{clean_isbn}-L.jpg",
+                "isbn": clean_isbn,
+                "source": "openlibrary"
+            })
 
-        # If all providers fail
         return jsonify({"error": f"Kein Buch zu dieser ISBN gefunden: {clean_isbn}"}), 404
         
     except Exception as e:
@@ -10199,7 +10146,6 @@ def admin_damaged_items():
             damaged_items=damaged_rows,
             library_module_enabled=cfg.MODULES.is_enabled('library'),
             student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
-            mail_module_enabled=cfg.MODULES.is_enabled('mail')
         )
     except Exception as exc:
         app.logger.error(f"Error loading damaged-items admin view: {exc}")

Web/modules/emailservice/email.py

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

Web/modules/terminplaner/backend_server.py

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

Web/modules/terminplaner/blueprint.py

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

Web/requirements.txt

@@ -15,3 +15,4 @@ openpyxl
 cryptography>=42.0.0
 pywebpush
 py-vapid>=1.9.0
+pyzbar

Web/static/js/scanner.js

@@ -0,0 +1,328 @@
+/**
+ * Hybrid Barcode Scanner
+ * Supports: Real-time camera scanning (ZXing.js), image upload fallback (server-side pyzbar),
+ *           and USB/keyboard scanner emulation.
+ */
+
+class HybridScanner {
+  constructor(options = {}) {
+    this.options = {
+      videoId: options.videoId || 'scanner-video',
+      canvasId: options.canvasId || 'scanner-canvas',
+      formats: options.formats || ['QR_CODE', 'CODE_128', 'EAN_13', 'ISBN', 'CODE_39', 'UPC_A'],
+      fps: options.fps || 10,
+      onSuccess: options.onSuccess || (() => {}),
+      onError: options.onError || (() => {}),
+      facingMode: options.facingMode || 'environment', // 'environment' for rear, 'user' for front
+    };
+
+    this.state = {
+      isRunning: false,
+      stream: null,
+      reader: null,
+      canvas: null,
+      videoElement: null,
+      zxingReady: false,
+      lastScanTime: 0,
+      scanDebounceMs: 300, // Prevent rapid duplicate scans
+    };
+
+    this.keyboardInputBuffer = '';
+    this.keyboardInputTimeout = null;
+  }
+
+  /**
+   * Initialize ZXing library from CDN
+   */
+  async initZXing() {
+    if (this.state.zxingReady) {
+      return true;
+    }
+
+    return new Promise((resolve) => {
+      // Load ZXing library from CDN
+      if (typeof ZXing !== 'undefined') {
+        this.state.zxingReady = true;
+        resolve(true);
+        return;
+      }
+
+      // Use fallback URL for better mobile compatibility
+      let scriptUrl = 'https://unpkg.com/@zxing/library@latest/umd/index.min.js';
+      
+      // Check if already loading
+      const existingScript = document.querySelector(`script[src="${scriptUrl}"]`);
+      if (existingScript) {
+        existingScript.addEventListener('load', () => {
+          this.state.zxingReady = typeof ZXing !== 'undefined';
+          resolve(this.state.zxingReady);
+        }, { once: true });
+        existingScript.addEventListener('error', () => {
+          console.error('Failed to load ZXing library');
+          resolve(false);
+        }, { once: true });
+        return;
+      }
+
+      const script = document.createElement('script');
+      script.src = scriptUrl;
+      script.async = true;
+      script.onload = () => {
+        this.state.zxingReady = typeof ZXing !== 'undefined';
+        resolve(this.state.zxingReady);
+      };
+      script.onerror = () => {
+        console.error('Failed to load ZXing library');
+        resolve(false);
+      };
+      document.head.appendChild(script);
+    });
+  }
+
+  /**
+   * Start real-time barcode scanning via camera
+   */
+  async start() {
+    if (this.state.isRunning) {
+      return;
+    }
+
+    try {
+      // Ensure ZXing is loaded
+      const zxingReady = await this.initZXing();
+      if (!zxingReady) {
+        this.options.onError('ZXing library failed to load. Please use image upload fallback.');
+        return;
+      }
+
+      // Get DOM elements
+      this.state.videoElement = document.getElementById(this.options.videoId);
+      this.state.canvas = document.getElementById(this.options.canvasId);
+
+      if (!this.state.videoElement || !this.state.canvas) {
+        this.options.onError('Scanner video or canvas element not found.');
+        return;
+      }
+
+      // Request camera access
+      const stream = await navigator.mediaDevices.getUserMedia({
+        video: {
+          facingMode: this.options.facingMode,
+          width: { ideal: 1280 },
+          height: { ideal: 720 },
+        },
+        audio: false,
+      });
+
+      this.state.stream = stream;
+      this.state.videoElement.srcObject = stream;
+      
+      // Make video element visible (ensure it's not hidden by display: none)
+      this.state.videoElement.style.display = 'block';
+
+      // Initialize ZXing reader
+      const hints = new Map();
+      hints.set(ZXing.DecodeHintType.POSSIBLE_FORMATS, this.options.formats);
+      hints.set(ZXing.DecodeHintType.TRY_HARDER, true);
+      this.state.reader = new ZXing.BrowserMultiFormatReader(hints);
+
+      this.state.isRunning = true;
+
+      // Start scanning loop
+      this.scanLoop();
+
+      // Setup keyboard input fallback for USB scanners
+      this.setupKeyboardInput();
+    } catch (err) {
+      this.options.onError(`Camera error: ${err.message || err}`);
+    }
+  }
+
+  /**
+   * Stop barcode scanning
+   */
+  stop() {
+    if (!this.state.isRunning) {
+      return;
+    }
+
+    this.state.isRunning = false;
+
+    if (this.state.stream) {
+      this.state.stream.getTracks().forEach((track) => track.stop());
+      this.state.stream = null;
+    }
+
+    if (this.state.videoElement) {
+      this.state.videoElement.srcObject = null;
+      this.state.videoElement.style.display = 'none';
+    }
+
+    this.removeKeyboardInput();
+  }
+
+  /**
+   * Main scanning loop for real-time frame processing
+   */
+  scanLoop() {
+    if (!this.state.isRunning) {
+      return;
+    }
+
+    const canvas = this.state.canvas;
+    const video = this.state.videoElement;
+
+    if (!video || !canvas) {
+      setTimeout(() => this.scanLoop(), 100);
+      return;
+    }
+
+    if (video.readyState === video.HAVE_ENOUGH_DATA) {
+      try {
+        canvas.width = video.videoWidth;
+        canvas.height = video.videoHeight;
+        
+        if (canvas.width === 0 || canvas.height === 0) {
+          setTimeout(() => this.scanLoop(), 100);
+          return;
+        }
+
+        const context = canvas.getContext('2d');
+
+        if (context) {
+          context.drawImage(video, 0, 0);
+
+          try {
+            const luminanceSource = new ZXing.HTMLCanvasElementLuminanceSource(canvas);
+            const binaryBitmap = new ZXing.BinaryBitmap(new ZXing.HybridBinarizer(luminanceSource));
+
+            try {
+              const result = this.state.reader.decodeFromBitmap(binaryBitmap);
+              this.handleScanResult(result.text);
+            } catch (e) {
+              // No barcode found in frame; continue scanning
+            }
+          } catch (err) {
+            // Silently ignore canvas errors
+          }
+        }
+      } catch (err) {
+        console.warn('Scan loop error:', err);
+      }
+    }
+
+    // Throttle scan loop based on FPS setting
+    setTimeout(() => this.scanLoop(), 1000 / this.options.fps);
+  }
+
+  /**
+   * Handle successful barcode scan with debouncing
+   */
+  handleScanResult(scannedText) {
+    const now = Date.now();
+    if (now - this.state.lastScanTime < this.state.scanDebounceMs) {
+      return; // Ignore rapid duplicates
+    }
+
+    this.state.lastScanTime = now;
+    this.options.onSuccess(scannedText.trim());
+  }
+
+  /**
+   * Setup keyboard input listener for USB scanner emulation
+   * Most USB scanners emulate keyboard input (barcode followed by Enter)
+   */
+  setupKeyboardInput() {
+    this.keyboardListener = (event) => {
+      // Allow only alphanumeric, dash, colon (common in barcodes)
+      if (/^[a-zA-Z0-9:_\-]$/.test(event.key)) {
+        event.preventDefault();
+        this.keyboardInputBuffer += event.key;
+
+        // Reset timeout for multi-part barcodes
+        if (this.keyboardInputTimeout) {
+          clearTimeout(this.keyboardInputTimeout);
+        }
+      } else if (event.key === 'Enter') {
+        event.preventDefault();
+        if (this.keyboardInputBuffer.length > 0) {
+          this.handleScanResult(this.keyboardInputBuffer);
+          this.keyboardInputBuffer = '';
+        }
+      } else if (event.key === 'Escape') {
+        this.keyboardInputBuffer = '';
+        this.stop();
+      }
+
+      // Auto-trigger if buffer looks complete (common barcode lengths)
+      if ([8, 12, 13, 17].includes(this.keyboardInputBuffer.length)) {
+        this.keyboardInputTimeout = setTimeout(() => {
+          if (this.keyboardInputBuffer.length > 0) {
+            this.handleScanResult(this.keyboardInputBuffer);
+            this.keyboardInputBuffer = '';
+          }
+        }, 200);
+      }
+    };
+
+    document.addEventListener('keydown', this.keyboardListener);
+  }
+
+  /**
+   * Remove keyboard input listener
+   */
+  removeKeyboardInput() {
+    if (this.keyboardListener) {
+      document.removeEventListener('keydown', this.keyboardListener);
+      this.keyboardListener = null;
+    }
+    this.keyboardInputBuffer = '';
+  }
+
+  /**
+   * Upload image for server-side decoding (fallback)
+   * Requires /api/scan_upload endpoint
+   */
+  static async uploadImageForDecoding(file, onSuccess, onError) {
+    try {
+      const formData = new FormData();
+      formData.append('image', file);
+
+      const response = await fetch('/api/scan_upload', {
+        method: 'POST',
+        body: formData,
+      });
+
+      const data = await response.json();
+
+      if (data.ok && data.barcodes && data.barcodes.length > 0) {
+        // Return first detected barcode (highest confidence)
+        onSuccess(data.barcodes[0].value);
+      } else {
+        onError(data.message || 'No barcode detected in image.');
+      }
+    } catch (err) {
+      onError(`Upload error: ${err.message}`);
+    }
+  }
+
+  /**
+   * Toggle camera (front/rear on mobile)
+   */
+  toggleCamera() {
+    if (this.options.facingMode === 'environment') {
+      this.options.facingMode = 'user';
+    } else {
+      this.options.facingMode = 'environment';
+    }
+
+    // Restart scanning with new camera
+    this.stop();
+    this.start();
+  }
+}
+
+// Export for use in templates
+if (typeof window !== 'undefined') {
+  window.HybridScanner = HybridScanner;
+}

Web/templates/base.html

@@ -1295,6 +1295,11 @@
                         </li>
                         {% endif %}
                         {% if 'username' in session %}
+                        {% if current_permissions.pages.get('my_borrowed_items', True) %}
+                        <li class="nav-item">
+                            <a class="nav-link quick-link-pill {% if current_path == url_for('my_borrowed_items') %}nav-active{% endif %}" href="{{ url_for('my_borrowed_items') }}" data-tutorial-tip="Hier sehen Sie Ihre bibliotheksbezogenen Ausleihen.">Meine Medien</a>
+                        </li>
+                        {% endif %}
                         {% if current_permissions.pages.get('tutorial_page', True) %}
                         <li class="nav-item">
                             <a class="nav-link quick-link-pill {% if current_path == url_for('tutorial_page') %}nav-active{% endif %}" href="{{ url_for('tutorial_page') }}" data-tutorial-tip="Nutzen Sie das Tutorial, um die Bibliotheksfunktionen kennenzulernen.">Tutorial</a>

Web/templates/library.html

@@ -10,6 +10,24 @@
             <h1>📚 Bibliothek</h1>
             <p class="subtitle">Bücher, CDs und weitere Medien</p>
         </div>
+        
+        <div class="header-controls">
+            <!-- Favorites Toggle -->
+            <div class="view-switch">
+                <button id="favoriteToggle" class="toggle-btn" aria-label="Favoriten anzeigen/verbergen">
+                    <span class="toggle-icon">⭐</span>
+                    <span class="toggle-label">Favoriten</span>
+                </button>
+            </div>
+
+            <!-- View Mode Toggle -->
+            <div class="view-switch">
+                <button id="viewModeToggle" class="toggle-btn" aria-label="Ansichtsmodus wechseln">
+                    <span class="toggle-icon">ㄷ</span>
+                    <span class="toggle-label">Tabelle</span>
+                </button>
+            </div>
+        </div>
     </div>
 
     <!-- Search & Filter Section -->
@@ -49,8 +67,22 @@
 
     <!-- Scanner Panel -->
     <div id="qrContainer" class="qr-container" style="display: none;">
-        <div id="qr-reader" style="width: auto; height: 300px;"></div>
-        <span id="qr-result" style="display: none;"></span>
+        <div class="scanner-header">
+            <h3>Barcode/QR-Code Scanner</h3>
+            <div class="scanner-controls">
+                <button type="button" id="cameraToggle" class="scanner-button" title="Kamera wechseln">📷 Kamera</button>
+                <label for="uploadScanImage" class="scanner-button" title="Bild hochladen zum Dekodieren">📤 Upload</label>
+                <input type="file" id="uploadScanImage" accept="image/*" style="display: none;">
+            </div>
+        </div>
+        <div class="scanner-video-wrapper">
+            <video id="qr-reader" playsinline style="width: 100%; max-width: 100%; height: auto; aspect-ratio: 4/3; object-fit: cover; border-radius: 8px;"></video>
+            <canvas id="scanner-canvas" style="display: none;"></canvas>
+        </div>
+        <div id="scanMessage" class="scanner-message" style="margin-top: 10px; text-align: center; font-weight: bold; color: #666;"></div>
+        <p style="font-size: 0.85em; color: #999; margin-top: 10px; margin-bottom: 0; text-align: center;">
+            💡 Hinweis: Scan-Ergebnis wird automatisch in das Feld oben übernommen. USB-Scanner werden als Tastatureingabe erkannt.
+        </p>
     </div>
 
     <!-- Table Header (only in table mode) -->
@@ -187,7 +219,9 @@
         </form>
     </div>
 </div>
-<script src="https://cdn.jsdelivr.net/npm/@ericblade/quagga2/dist/quagga.js"></script>
+
+<script src="https://unpkg.com/@zxing/library@latest/umd/index.min.js"></script>
+<script src="/static/js/scanner.js"></script>
 <script>
 // View mode persistence
 const LIBRARY_VIEW_MODE_KEY = 'inventarLibraryViewMode';
@@ -606,80 +640,103 @@ document.getElementById('clearFiltersBtn').addEventListener('click', function()
     closeAllFilters();
 });
 
-// Scanner toggle
-// Scanner state tracking
-let isScanning = false; 
+// Favorites toggle
+document.getElementById('favoriteToggle').addEventListener('click', function() {
+    this.classList.toggle('open');
+    // TODO: Implement favorites filtering
+});
+
+// Scanner instance (hybrid: real-time + upload + keyboard)
+let scanner = null;
 
 document.getElementById('scannerBtn').addEventListener('click', function(e) {
     e.stopPropagation();
     const container = document.getElementById('qrContainer');
     const isOpen = container.style.display !== 'none';
-    const btn = this;
     
     if (isOpen) {
-        // Close the scanner
         container.style.display = 'none';
-        Quagga.stop();
-        isScanning = false;
-        
-        btn.classList.remove('open');
-        btn.setAttribute('aria-expanded', 'false');
+        if (scanner) {
+            scanner.stop();
+            scanner = null;
+        }
+        this.classList.remove('open');
+        this.setAttribute('aria-expanded', 'false');
     } else {
-        // Open the scanner
         container.style.display = 'block';
-        btn.classList.add('open');
-        btn.setAttribute('aria-expanded', 'true');
+        this.classList.add('open');
+        this.setAttribute('aria-expanded', 'true');
         
-        Quagga.init({
-            inputStream: {
-                name: "Live",
-                type: "LiveStream",
-                // Targets the element where the video stream will inject
-                target: document.querySelector('#qr-reader'), 
-                constraints: {
-                    width: 640,
-                    height: 480,
-                    facingMode: "environment" // Forces back camera
-                },
-            },
-            decoder: {
-                // Optimized for 1D barcodes (e.g., student IDs, member cards)
-                readers: ["code_128_reader", "ean_reader", "code_39_reader", "upc_reader"]
-            } 
-        }, function(err) {
-            if (err) {
-                console.error("Initialization error:", err);
-                alert("Kamera konnte nicht gestartet werden.");
-                return;
-            }
-            Quagga.start();
-            isScanning = true;
-        });
+        if (!scanner) {
+            initScanner();
+        }
     }
 });
 
-// Single Quagga event listener for successful scans
-Quagga.onDetected(function(data) {
-    const decodedText = data.codeResult.code;
-    const studentId = String(decodedText || '').trim();
-    
-    // Stop scanning immediately to prevent multiple triggers
-    Quagga.stop();
-    isScanning = false;
-    
-    // Reset UI states to closed
-    const container = document.getElementById('qrContainer');
-    const btn = document.getElementById('scannerBtn');
-    if (container) container.style.display = 'none';
-    if (btn) {
-        btn.classList.remove('open');
-        btn.setAttribute('aria-expanded', 'false');
+function initScanner() {
+    scanner = new HybridScanner({
+        videoId: 'qr-reader',
+        canvasId: 'scanner-canvas',
+        formats: ['QR_CODE', 'CODE_128', 'EAN_13', 'ISBN', 'CODE_39', 'UPC_A', 'EAN_8'],
+        fps: 10,
+        facingMode: 'environment',
+        onSuccess: function(decodedText) {
+            const studentId = decodedText.trim();
+            document.getElementById('studentIdInput').value = studentId;
+            document.getElementById('scanMessage').textContent = '✓ Erkannt: ' + studentId;
+            document.getElementById('scanMessage').style.color = '#4CAF50';
+        },
+        onError: function(error) {
+            document.getElementById('scanMessage').textContent = '✗ ' + error;
+            document.getElementById('scanMessage').style.color = '#f44336';
+        }
+    });
+
+    scanner.start();
+}
+
+// Camera toggle
+document.getElementById('cameraToggle')?.addEventListener('click', function() {
+    if (scanner) {
+        scanner.toggleCamera();
+        this.textContent = scanner.options.facingMode === 'user' ? '📷 Rückkamera' : '🤳 Frontkamera';
     }
-    
-    // Route the scanned data to your input
+});
+
+// Image upload fallback
+document.getElementById('uploadScanImage')?.addEventListener('change', function(e) {
+    const file = e.target.files[0];
+    if (file) {
+        const messageEl = document.getElementById('scanMessage');
+        messageEl.textContent = 'Wird dekodiert...';
+        messageEl.style.color = '#2196F3';
+        
+        HybridScanner.uploadImageForDecoding(
+            file,
+            (decodedText) => {
+                document.getElementById('studentIdInput').value = decodedText;
+                messageEl.textContent = '✓ Erkannt (Upload): ' + decodedText;
+                messageEl.style.color = '#4CAF50';
+                e.target.value = ''; // Reset file input
+            },
+            (error) => {
+                messageEl.textContent = '✗ ' + error;
+                messageEl.style.color = '#f44336';
+                e.target.value = '';
+            }
+        );
+    }
+});
+
+function onScanSuccess(decodedText, decodedResult) {
+    const studentId = decodedText.trim();
     document.getElementById('studentIdInput').value = studentId;
     alert('Ausweis gescannt: ' + studentId);
-});
+}
+
+function onScanError(error) {
+    // Silently ignore scan errors
+}
 </script>
 
 <style>
@@ -740,6 +797,9 @@ Quagga.onDetected(function(data) {
         overflow-x: auto;
         -webkit-overflow-scrolling: touch;
         width: 100%;
+        box-sizing: border-box;
+        margin: 0 -12px;
+        padding: 0 12px;
     }
     .library-table-wrapper .table-row {
         min-width: 720px; /* allow table to have intrinsic width and be scrolled */
@@ -748,5 +808,129 @@ Quagga.onDetected(function(data) {
         display: block; /* keep rows stacked but allow horizontal scroll */
     }
 }
+
+/* Hybrid Scanner Styles */
+.qr-container {
+    background: #f5f5f5;
+    border: 1px solid #ddd;
+    border-radius: 8px;
+    padding: 12px;
+    margin: 12px 0;
+    overflow-x: hidden;
+    width: 100%;
+    box-sizing: border-box;
+}
+
+.scanner-header {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    margin-bottom: 12px;
+    flex-wrap: wrap;
+    gap: 8px;
+    width: 100%;
+    box-sizing: border-box;
+}
+
+.scanner-header h3 {
+    margin: 0;
+    color: #333;
+    font-size: 1em;
+    flex: 0 0 auto;
+    white-space: nowrap;
+}
+
+.scanner-controls {
+    display: flex;
+    gap: 6px;
+    flex-wrap: wrap;
+    flex: 1 1 auto;
+    min-width: 0;
+}
+
+.scanner-button {
+    background: #2196F3;
+    color: white;
+    border: none;
+    padding: 6px 10px;
+    border-radius: 4px;
+    cursor: pointer;
+    font-size: 0.85em;
+    white-space: nowrap;
+    flex: 0 1 auto;
+    transition: background-color 0.2s;
+}
+
+.scanner-button:hover {
+    background: #1976D2;
+}
+
+.scanner-button:active {
+    background: #1565C0;
+}
+
+.scanner-video-wrapper {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin: 12px 0;
+    width: 100%;
+    box-sizing: border-box;
+    overflow: hidden;
+}
+
+#qr-reader {
+    width: 100%;
+    max-width: 100%;
+    height: auto;
+    border: 2px solid #2196F3;
+    border-radius: 8px;
+    display: block;
+}
+
+.scanner-message {
+    min-height: 20px;
+    font-size: 0.9em;
+    text-align: center;
+    word-wrap: break-word;
+}
+
+@media (max-width: 600px) {
+    .qr-container {
+        padding: 10px;
+        margin: 10px 0;
+    }
+
+    .scanner-header {
+        flex-direction: column;
+        align-items: stretch;
+        gap: 8px;
+    }
+
+    .scanner-header h3 {
+        width: 100%;
+        font-size: 0.95em;
+    }
+
+    .scanner-controls {
+        width: 100%;
+        justify-content: space-between;
+    }
+
+    .scanner-button {
+        flex: 1 1 auto;
+        padding: 8px 6px;
+        font-size: 0.8em;
+    }
+
+    #qr-reader {
+        max-width: 100%;
+        border-radius: 6px;
+    }
+
+    .scanner-message {
+        font-size: 0.85em;
+    }
+}
 </style>
 {% endblock %}

Web/templates/library_table.html

@@ -431,7 +431,7 @@
             type="text" 
             id="librarySearch" 
             class="library-search-input" 
-            placeholder="Nach Titel, ISBN suchen..."
+            placeholder="Nach Titel, Autor, ISBN suchen..."
         >
         <button 
             id="filterToggleBtn" 
@@ -445,7 +445,7 @@
     <!-- Customizable Filter Panel -->
 
     <!-- Student card / quick scan workflow -->
-   <div class="library-scan-panel">
+    <div class="library-scan-panel">
         <div class="library-scan-controls">
             <select id="scanModeSelect" aria-label="Scan-Modus">
                 <option value="card_only">Nur Ausweis erfassen</option>
@@ -458,14 +458,19 @@
         <div id="scanStatus" class="library-scan-status">
             Hinweis: Im Schnellmodus zuerst den Schülerausweis scannen, danach den Buch-/Mediencode.
         </div>
-        <div id="scanReaderWrap" class="library-scan-reader-wrap" style="display: none;">
+        <div id="scanReaderWrap" class="library-scan-reader-wrap">
             <div id="libraryQrReader" class="library-scan-reader">
-                <div id="library-scanner-container"></div>
+                <video id="libraryQrReaderVideo" playsinline style="width: 100%; border-radius: 8px;"></video>
+                <canvas id="libraryQrReaderCanvas" style="display: none;"></canvas>
             </div>
         </div>
     </div>
     <div id="filterPanel" class="library-filter-panel">
         <div class="filter-row">
+            <div class="filter-item">
+                <label for="filterAuthor">Autor/Künstler:</label>
+                <input type="text" id="filterAuthor" placeholder="z.B. Goethe">
+            </div>
             <div class="filter-item">
                 <label for="filterISBN">ISBN:</label>
                 <input type="text" id="filterISBN" placeholder="z.B. 978-3...">
@@ -512,6 +517,7 @@
             <thead>
                 <tr>
                     <th style="width: 24%;">Titel</th>
+                    <th style="width: 14%;">Autor/Künstler</th>
                     <th style="width: 12%;">ISBN/Code</th>
                     <th style="width: 8%;">Typ</th>
                     <th style="width: 8%;">Anzahl</th>
@@ -544,17 +550,16 @@
     </div>
 </div>
 
-<script src="https://cdn.jsdelivr.net/npm/@ericblade/quagga2/dist/quagga.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/@ericblade/quagga2/dist/quagga.js"></script>
+<script src="https://unpkg.com/@zxing/library@latest/umd/index.min.js"></script>
+<script src="/static/js/scanner.js"></script>
 <script>
-    // =========================================================================
-    // 1. GLOBAL STATE DEFINITIONS
-    // =========================================================================
+    // State
     let libraryItems = [];
     let filteredItems = [];
     let visibleItems = [];
     let currentSearchTerm = '';
     let activeFilters = {
+        author: '',
         isbn: '',
         type: '',
         status: ''
@@ -570,20 +575,13 @@
     const RENDER_BATCH_COUNT = 120;
     let renderedCount = INITIAL_RENDER_COUNT;
     let filterPanelOpen = false;
-    
-    // Scanner Related State Variables
     let scannerInstance = null;
-    let scannerRunning = false; 
-    let activeScannerCallback = null; 
+    let scannerRunning = false;
     let activeStudentCardId = '';
     let lastScanValue = '';
     let lastScanAt = 0;
-    
     const canEditLibraryItems = (document.getElementById('libraryTableContainer')?.dataset.canEdit === '1');
 
-    // =========================================================================
-    // 2. DATA LOADING & FILTERING ENGINE
-    // =========================================================================
     async function fetchLibraryPage(offset, limit) {
         const response = await fetch(`/api/library_items?offset=${offset}&limit=${limit}`);
         if (!response.ok) {
@@ -592,6 +590,7 @@
         return response.json();
     }
 
+    // Load items progressively: first page immediately, rest in background
     async function loadLibraryItems() {
         if (pagingState.loading) return;
         pagingState.loading = true;
@@ -630,6 +629,7 @@
                 pagingState.total = page.total || pagingState.total;
                 pagingState.hasMore = Boolean(page.has_more);
 
+                // Keep the current view reactive while avoiding a full rerender burst.
                 applyFiltersAndSearch(false);
 
                 if ('requestIdleCallback' in window) {
@@ -645,16 +645,18 @@
     }
 
     function filterItems(items) {
+        const author = activeFilters.author;
         const isbn = activeFilters.isbn;
         const type = activeFilters.type;
         const status = activeFilters.status;
 
         return items.filter(item => {
+            const authorMatch = !author || (item.Autor || item.Author || '').toLowerCase().includes(author);
             const isbnMatch = !isbn || (item.ISBN || item.Code_4 || item.Code4 || '').toLowerCase().includes(isbn);
             const typeMatch = !type || (item.ItemType || 'book') === type;
             const statusKey = item.LibraryDisplayStatus || (item.Verfuegbar === false ? 'borrowed' : 'available');
             const statusMatch = !status || statusKey === status;
-            return isbnMatch && typeMatch && statusMatch;
+            return authorMatch && isbnMatch && typeMatch && statusMatch;
         });
     }
 
@@ -662,6 +664,7 @@
         if (!currentSearchTerm) return items;
         return items.filter(item =>
             (item.Name || '').toLowerCase().includes(currentSearchTerm) ||
+            (item.Autor || item.Author || '').toLowerCase().includes(currentSearchTerm) ||
             (item.ISBN || item.Code_4 || item.Code4 || '').toLowerCase().includes(currentSearchTerm)
         );
     }
@@ -678,6 +681,7 @@
         renderItems();
     }
 
+    // Display current view with incremental rendering
     function renderItems() {
         const tbody = document.getElementById('itemsTableBody');
         const emptyState = document.getElementById('emptyState');
@@ -695,33 +699,37 @@
         emptyState.style.display = 'none';
         const rowsToRender = visibleItems.slice(0, renderedCount);
 
-        tbody.innerHTML = rowsToRender.map(item => {
-            const statusKey = item.LibraryDisplayStatus || (item.Verfuegbar === false ? 'borrowed' : 'available');
-            const statusClass = statusKey === 'damaged' ? 'status-damaged' : (statusKey === 'borrowed' ? 'status-borrowed' : 'status-available');
-            const statusText = statusKey === 'damaged' ? 'Defekt/Zerstört' : (statusKey === 'borrowed' ? 'Ausgeliehen' : 'Verfügbar');
-            const actionLabel = statusKey === 'available' ? 'Ausleihen' : (statusKey === 'borrowed' ? 'Reservieren' : 'Nicht ausleihbar');
-            const actionDisabled = statusKey === 'damaged' ? 'disabled' : '';
-            return `
-        <tr>
-            <td class="table-title">${escapeHtml(item.Name || 'Untitled')}</td>
-            <td>${escapeHtml(item.ISBN || item.Code_4 || item.Code4 || '-')}</td>
-            <td>${getItemTypeLabel(item.ItemType || 'book')}</td>
-            <td style="font-weight:600; text-align:center;">${item.Quantity || item.GroupedDisplayCount || 1}</td>
-            <td>
-                <span class="table-status ${statusClass}">
-                    ${statusText}
-                </span>
-            </td>
-            <td class="table-actions">
-                <button class="button" onclick="showItemDetail('${item._id}')">Details</button>
-                <button class="button" style="background: #28a745; color: white;" onclick="borrowItem('${item._id}')" ${actionDisabled}>
-                    ${actionLabel}
-                </button>
-                ${canEditLibraryItems ? `<button class="button" style="background:#0ea5e9;color:#fff;" onclick="openEditLibraryItem('${item._id}')">Bearbeiten</button>` : ''}
-                ${canEditLibraryItems ? `<button class="button" style="background:#dc2626;color:#fff; margin-left:6px;" onclick="confirmDeleteLibraryItem('${item._id}')">Löschen</button>` : ''}
-            </td>
-        </tr>`;
-        }).join('');
+        tbody.innerHTML = rowsToRender.map(item => `
+            ${(() => {
+                const statusKey = item.LibraryDisplayStatus || (item.Verfuegbar === false ? 'borrowed' : 'available');
+                const statusClass = statusKey === 'damaged' ? 'status-damaged' : (statusKey === 'borrowed' ? 'status-borrowed' : 'status-available');
+                const statusText = statusKey === 'damaged' ? 'Defekt/Zerstört' : (statusKey === 'borrowed' ? 'Ausgeliehen' : 'Verfügbar');
+                const actionLabel = statusKey === 'available' ? 'Ausleihen' : (statusKey === 'borrowed' ? 'Reservieren' : 'Nicht ausleihbar');
+                const actionDisabled = statusKey === 'damaged' ? 'disabled' : '';
+                return `
+            <tr>
+                <td class="table-title">${escapeHtml(item.Name || 'Untitled')}</td>
+                <td>${escapeHtml(item.Autor || item.Author || '-')}</td>
+                <td>${escapeHtml(item.ISBN || item.Code_4 || item.Code4 || '-')}</td>
+                <td>${getItemTypeLabel(item.ItemType || 'book')}</td>
+                <td style="font-weight:600; text-align:center;">${item.Quantity || item.GroupedDisplayCount || 1}</td>
+                <td>
+                    <span class="table-status ${statusClass}">
+                        ${statusText}
+                    </span>
+                </td>
+                <td class="table-actions">
+                    <button class="button" onclick="showItemDetail('${item._id}')">Details</button>
+                    <button class="button" style="background: #28a745; color: white;" onclick="borrowItem('${item._id}')" ${actionDisabled}>
+                        ${actionLabel}
+                    </button>
+                    ${canEditLibraryItems ? `<button class="button" style="background:#0ea5e9;color:#fff;" onclick="openEditLibraryItem('${item._id}')">Bearbeiten</button>` : ''}
+                    ${canEditLibraryItems ? `<button class="button" style="background:#dc2626;color:#fff; margin-left:6px;" onclick="confirmDeleteLibraryItem('${item._id}')">Löschen</button>` : ''}
+                </td>
+            </tr>
+                `;
+            })()}
+        `).join('');
 
         const canLoadMoreRows = renderedCount < visibleItems.length;
         if (canLoadMoreRows) {
@@ -736,6 +744,13 @@
         }
     }
 
+    // Confirm and call library item delete endpoint
+    function confirmDeleteLibraryItem(itemId) {
+        if (!itemId) return;
+        if (!confirm('Dieses Bibliotheksmedium revisionssicher löschen? Diese Aktion deaktiviert alle zugehörigen Exemplare und archiviert Medien.')) return;
+        deleteLibraryItem(itemId);
+    }
+
     async function deleteLibraryItem(itemId) {
         if (!itemId) return;
         document.body.style.cursor = 'wait';
@@ -759,6 +774,7 @@
                 }
                 loadLibraryItems();
             } else {
+                // Server redirected to HTML (flash messages). Reload to show state.
                 location.reload();
             }
         } catch (e) {
@@ -769,269 +785,46 @@
         }
     }
 
-    function confirmDeleteLibraryItem(itemId) {
-        if (!itemId) return;
-        if (!confirm('Dieses Bibliotheksmedium revisionssicher löschen? Diese Aktion deaktiviert alle zugehörigen Exemplare und archiviert Medien.')) return;
-        deleteLibraryItem(itemId);
-    }
-
-    // =========================================================================
-    // 3. CORE SCANNER ROUTING ENGINE (QUAGGA2)
-    // =========================================================================
-    function startScanner(targetCallback) {
-        const readerWrap = document.getElementById('scanReaderWrap');
-        const toggleBtn = document.getElementById('toggleScannerBtn');
-        
-        activeScannerCallback = targetCallback;
-
-        if (readerWrap) readerWrap.style.display = 'block';
-        setScanStatus('Initializing camera...', 'warn');
-    
-        Quagga.init({
-            inputStream: {
-                name: "Live",
-                type: "LiveStream",
-                target: document.querySelector('#library-scanner-container'), 
-                constraints: {
-                    width: 640,
-                    height: 480,
-                    facingMode: "environment" 
-                },
-            },
-            decoder: {
-                readers: [
-                    "code_128_reader", 
-                    "ean_reader", 
-                    "code_39_reader", 
-                    "upc_reader", 
-                    "codabar_reader", 
-                    "i2of5_reader"
-                ]
-            } 
-        }, function(err) {
-            if (err) {
-                console.error('Scanner start failed:', err);
-                if (readerWrap) readerWrap.style.display = 'none';
-                const detail = (err && (err.message || err.name)) ? ` (${err.message || err.name})` : '';
-                setScanStatus(`Scanner konnte nicht gestartet werden${detail}`, 'error');
-                return;
-            }
-        
-            Quagga.start();
-            scannerRunning = true;
-            
-            if (!targetCallback && toggleBtn) {
-                toggleBtn.textContent = 'Scanner stoppen';
-            }
-            setScanStatus('Scanner aktiv. Jetzt Code scannen.', 'warn');
-        });
-    }
-    
-    function stopScanner() {
-        if (!scannerRunning) return;
-        
-        const readerWrap = document.getElementById('scanReaderWrap');
-        const toggleBtn = document.getElementById('toggleScannerBtn');
-    
-        Quagga.stop();
-        scannerRunning = false;
-        activeScannerCallback = null; 
-    
-        if (readerWrap) readerWrap.style.display = 'none';
-        if (toggleBtn) toggleBtn.textContent = 'Scanner starten';
-        setScanStatus('Scanner gestoppt.', 'warn');
-    }
-    
-    Quagga.onDetected(function(data) {
-        if (!data || !data.codeResult || !data.codeResult.code) return;
-        
-        const barcode = String(data.codeResult.code || '').trim();
-        console.log("Barcode detected:", barcode);
-    
-        const currentCallback = activeScannerCallback;
-        stopScanner();
-    
-        if (typeof currentCallback === "function") {
-            currentCallback(barcode);
-        } else {
-            handleScanSuccess(barcode);
-        }
+    // Filter toggle
+    document.getElementById('filterToggleBtn').addEventListener('click', () => {
+        filterPanelOpen = !filterPanelOpen;
+        const panel = document.getElementById('filterPanel');
+        const btn = document.getElementById('filterToggleBtn');
+        panel.classList.toggle('open');
+        btn.classList.toggle('active');
     });
 
-    function handleScanSuccess(decodedText) {
-        const scannedCode = normalizeScannedCode(decodedText);
-        if (!scannedCode) return;
-    
-        const now = Date.now();
-        if (scannedCode === lastScanValue && (now - lastScanAt) < 1500) {
-            return;
-        }
-        lastScanValue = scannedCode;
-        lastScanAt = now;
-    
-        const mode = (document.getElementById('scanModeSelect') || {}).value || 'card_only';
-        if (mode === 'card_only') {
-            setActiveStudentCard(scannedCode);
-            setScanStatus(`Ausweis gesetzt: ${activeStudentCardId}`, 'ok');
-            return;
-        }
-    
-        processQuickToggleScan(scannedCode);
-    }
+    // Apply filters
+    document.getElementById('applyFilterBtn').addEventListener('click', () => {
+        activeFilters.author = document.getElementById('filterAuthor').value.toLowerCase();
+        activeFilters.isbn = document.getElementById('filterISBN').value.toLowerCase();
+        activeFilters.type = document.getElementById('filterType').value;
+        activeFilters.status = document.getElementById('filterStatus').value;
+        applyFiltersAndSearch(true);
+    });
 
-    async function processQuickToggleScan(scannedCode) {
-        if (!activeStudentCardId) {
-            setActiveStudentCard(scannedCode);
-            setScanStatus(`Ausweis gesetzt: ${activeStudentCardId}`, 'ok');
-            return;
-        }
-    
-        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');
-            } else if (result.action === 'returned') {
-                setScanStatus(`Zurückgegeben: ${result.item_name}`, 'ok');
-            } else {
-                setScanStatus(result.message || 'Aktion durchgeführt.', 'ok');
-            }
-        
-            await loadLibraryItems();
-        } catch (err) {
-            console.error('Quick scan action failed:', err);
-            setScanStatus('Fehler beim Verarbeiten des Scans.', 'error');
-        }
-    }
+    // Clear filters
+    document.getElementById('clearFilterBtn').addEventListener('click', () => {
+        document.getElementById('filterAuthor').value = '';
+        document.getElementById('filterISBN').value = '';
+        document.getElementById('filterType').value = '';
+        document.getElementById('filterStatus').value = '';
+        activeFilters = { author: '', isbn: '', type: '', status: '' };
+        applyFiltersAndSearch(true);
+    });
 
-    function scanIntoEditCode() {
-        const scanReaderWrap = document.getElementById('scanReaderWrap');
-        const editCodeInput = document.getElementById('edit-code4');
-        const scanEditBtn = document.getElementById('scan-edit-code-btn');
-        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") {
-                validateCodeField(editCodeInput, document.getElementById('edit-item-id')?.value || null);
-            }
-            scanEditBtn.textContent = 'Barcode scannen';
-        });
-    }
+    // Search input
+    document.getElementById('librarySearch').addEventListener('input', (e) => {
+        currentSearchTerm = (e.target.value || '').toLowerCase();
+        applyFiltersAndSearch(true);
+    });
 
-    // =========================================================================
-    // 4. UI INTERACTIONS & UTILITIES
-    // =========================================================================
-    function borrowItem(itemId) {
-        const selectedItem = (libraryItems || []).find(item => item._id === itemId);
-        if (selectedItem && selectedItem.LibraryDisplayStatus === 'damaged') {
-            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();
-        let borrowCount = parseInt(countPrompt || '1', 10);
-        if (!Number.isFinite(borrowCount) || borrowCount < 1) {
-            borrowCount = 1;
-        }
-        if (borrowCount > maxAvailable) {
-            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';
-            durationField.name = 'borrow_duration_days';
-            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();
-    }
-
-    function setScanStatus(message, kind = '') {
-        const el = document.getElementById('scanStatus');
-        if (!el) return;
-        el.textContent = message;
-        el.classList.remove('ok', 'warn', 'error');
-        if (kind) el.classList.add(kind);
-    }
-    
-    function setActiveStudentCard(cardId) {
-        activeStudentCardId = (cardId || '').trim().toUpperCase();
-        const input = document.getElementById('activeStudentCard');
-        if (input) input.value = activeStudentCardId;
-    }
-    
-    function normalizeScannedCode(code) {
-        return (code || '').trim();
-    }
+    document.getElementById('loadMoreBtn').addEventListener('click', () => {
+        renderedCount = Math.min(renderedCount + RENDER_BATCH_COUNT, visibleItems.length);
+        renderItems();
+    });
 
+    // Helper functions
     function getItemTypeLabel(type) {
         const labels = { 'book': 'Buch', 'cd': 'CD', 'dvd': 'DVD', 'other': 'Sonstige' };
         return labels[type] || type;
@@ -1044,6 +837,7 @@
     }
 
     function showItemDetail(itemId) {
+        // Load and show detail modal
         fetch(`/api/item_detail/${itemId}`)
             .then(r => r.text())
             .then(html => {
@@ -1057,165 +851,322 @@
         document.getElementById('detailModal').style.display = 'none';
     }
 
-// =========================================================================
-    // 5. EVENT LISTENERS INITIALIZATION & ON-LOAD INITIALIZER
-    // =========================================================================
+    function borrowItem(itemId) {
+        const selectedItem = (libraryItems || []).find(item => item._id === itemId);
+        if (selectedItem && selectedItem.LibraryDisplayStatus === 'damaged') {
+            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();
+        let borrowCount = parseInt(countPrompt || '1', 10);
+        if (!Number.isFinite(borrowCount) || borrowCount < 1) {
+            borrowCount = 1;
+        }
+        if (borrowCount > maxAvailable) {
+            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';
+            durationField.name = 'borrow_duration_days';
+            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();
+    }
+
+    function setScanStatus(message, kind = '') {
+        const el = document.getElementById('scanStatus');
+        if (!el) return;
+        el.textContent = message;
+        el.classList.remove('ok', 'warn', 'error');
+        if (kind) {
+            el.classList.add(kind);
+        }
+    }
+
+    function setActiveStudentCard(cardId) {
+        activeStudentCardId = (cardId || '').trim().toUpperCase();
+        const input = document.getElementById('activeStudentCard');
+        if (input) {
+            input.value = activeStudentCardId;
+        }
+    }
+
+    function normalizeScannedCode(code) {
+        return (code || '').trim();
+    }
+
+    async function processQuickToggleScan(scannedCode) {
+        if (!activeStudentCardId) {
+            setActiveStudentCard(scannedCode);
+            setScanStatus(`Ausweis gesetzt: ${activeStudentCardId}`, 'ok');
+            return;
+        }
+
+        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');
+            } else if (result.action === 'returned') {
+                setScanStatus(`Zurückgegeben: ${result.item_name}`, 'ok');
+            } else {
+                setScanStatus(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 handleScanSuccess(decodedText) {
+        const scannedCode = normalizeScannedCode(decodedText);
+        if (!scannedCode) return;
+
+        const now = Date.now();
+        if (scannedCode === lastScanValue && (now - lastScanAt) < 1500) {
+            return;
+        }
+        lastScanValue = scannedCode;
+        lastScanAt = now;
+
+        const mode = (document.getElementById('scanModeSelect') || {}).value || 'card_only';
+        if (mode === 'card_only') {
+            setActiveStudentCard(scannedCode);
+            setScanStatus(`Ausweis gesetzt: ${activeStudentCardId}`, 'ok');
+            return;
+        }
+
+        processQuickToggleScan(scannedCode);
+    }
+
+    function handleScanError() {
+        // Intentionally silent to avoid UI spam while camera searches codes.
+    }
+
+    async function ensureScannerLibraryLoaded() {
+        // HybridScanner is loaded globally via script tag
+        return typeof HybridScanner !== 'undefined';
+    }
+
+    async function startScanner() {
+        if (scannerRunning) return;
+
+        const scannerLoaded = await ensureScannerLibraryLoaded();
+        if (!scannerLoaded) {
+            setScanStatus('Scanner-Bibliothek konnte nicht geladen werden.', 'error');
+            return;
+        }
+
+        const readerWrap = document.getElementById('scanReaderWrap');
+        const toggleBtn = document.getElementById('toggleScannerBtn');
+        readerWrap.style.display = 'block';
+
+        try {
+            scannerInstance = scannerInstance || new HybridScanner({
+                videoId: 'libraryQrReaderVideo',
+                canvasId: 'libraryQrReaderCanvas',
+                formats: ['QR_CODE', 'EAN_13', 'EAN_8', 'CODE_128', 'CODE_39', 'UPC_A', 'UPC_E', 'ITF', 'CODABAR'],
+                fps: 10,
+                facingMode: 'environment',
+                onSuccess: handleScanSuccess,
+                onError: handleScanError
+            });
+
+            scannerInstance.start();
+            scannerRunning = true;
+            toggleBtn.textContent = 'Scanner stoppen';
+            setScanStatus('Scanner aktiv. Jetzt Code scannen.', 'warn');
+        } catch (err) {
+            console.error('Scanner start failed:', err);
+            readerWrap.style.display = 'none';
+            const detail = (err && (err.message || err.name)) ? ` (${err.message || err.name})` : '';
+            setScanStatus(`Scanner konnte nicht gestartet werden${detail}`, 'error');
+        }
+    }
+
+    async function stopScanner() {
+        if (!scannerRunning || !scannerInstance) return;
+        const readerWrap = document.getElementById('scanReaderWrap');
+        const toggleBtn = document.getElementById('toggleScannerBtn');
+        try {
+            scannerInstance.stop();
+        } catch (err) {
+            console.error('Scanner stop failed:', err);
+        }
+        scannerRunning = false;
+        scannerInstance = null;
+        readerWrap.style.display = 'none';
+        toggleBtn.textContent = 'Scanner starten';
+        setScanStatus('Scanner gestoppt.', 'warn');
+    }
+
     function wireScannerUi() {
         const toggleBtn = document.getElementById('toggleScannerBtn');
         const resetBtn = document.getElementById('resetCardBtn');
         const modeSelect = document.getElementById('scanModeSelect');
-    
+
         if (toggleBtn) {
             toggleBtn.addEventListener('click', async () => {
                 if (scannerRunning) {
                     await stopScanner();
                 } else {
-                    await startScanner(null);
+                    await startScanner();
                 }
             });
         }
-    
+
         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) {
                     setScanStatus('Schnellmodus: zuerst Schülerausweis scannen.', 'warn');
                 } else if (modeSelect.value === 'card_only') {
-                    setScanStatus('Nur Ausweis-Modus aktiv.', 'warn');
+                    setScanStatus('Modus aktiv: Nur Ausweis erfassen.', 'warn');
+                } else {
+                    setScanStatus('Schnellmodus aktiv: jetzt Mediencode scannen.', 'warn');
                 }
             });
         }
     }
 
-    // Run when DOM structure is entirely ready
-    document.addEventListener('DOMContentLoaded', () => {
-        wireScannerUi();       // Setup scanner control buttons 
-        loadLibraryItems();   // Fetch your database items right away!
+    function getLibraryItemById(itemId) {
+        return libraryItems.find(i => String(i._id) === String(itemId));
+    }
 
-        // Safely connect standard Filters and Search inputs inside DOMContentLoaded
-        const filterToggleBtn = document.getElementById('filterToggleBtn');
-        if (filterToggleBtn) {
-            filterToggleBtn.addEventListener('click', () => {
-                filterPanelOpen = !filterPanelOpen;
-                document.getElementById('filterPanel').classList.toggle('open');
-                filterToggleBtn.classList.toggle('active');
-            });
-        }
-
-        const applyFilterBtn = document.getElementById('applyFilterBtn');
-        if (applyFilterBtn) {
-            applyFilterBtn.addEventListener('click', () => {
-                activeFilters.isbn = document.getElementById('filterISBN').value.toLowerCase();
-                activeFilters.type = document.getElementById('filterType').value;
-                activeFilters.status = document.getElementById('filterStatus').value;
-                applyFiltersAndSearch(true);
-            });
-        }
-
-        const clearFilterBtn = document.getElementById('clearFilterBtn');
-        if (clearFilterBtn) {
-            clearFilterBtn.addEventListener('click', () => {
-                document.getElementById('filterISBN').value = '';
-                document.getElementById('filterType').value = '';
-                document.getElementById('filterStatus').value = '';
-                activeFilters = { isbn: '', type: '', status: '' };
-                applyFiltersAndSearch(true);
-            });
-        }
-
-        const librarySearch = document.getElementById('librarySearch');
-        if (librarySearch) {
-            librarySearch.addEventListener('input', (e) => {
-                currentSearchTerm = (e.target.value || '').toLowerCase();
-                applyFiltersAndSearch(true);
-            });
-        }
-
-        const loadMoreBtn = document.getElementById('loadMoreBtn');
-        if (loadMoreBtn) {
-            loadMoreBtn.addEventListener('click', () => {
-                renderedCount = Math.min(renderedCount + RENDER_BATCH_COUNT, visibleItems.length);
-                renderItems();
-            });
-        }
-
-        // Edit Modal Form processing
-        const editForm = document.getElementById('editLibraryForm');
-        if (editForm) {
-            editForm.addEventListener('submit', async function(e) {
-                e.preventDefault(); 
-
-                const itemId = document.getElementById('editLibraryItemId').value;
-
-                const updatedData = {
-                    name: document.getElementById('editLibraryName').value,
-                    item_type: document.getElementById('editLibraryType').value,
-                    isbn: document.getElementById('editLibraryIsbn').value,
-                    code_4: document.getElementById('editLibraryCode4').value, 
-                    ort: document.getElementById('editLibraryLocation').value,
-                    beschreibung: document.getElementById('editLibraryDescription').value
-                };
-
-                try {
-                    const response = await fetch(`/api/library_item/${itemId}/update`, {
-                        method: 'POST',
-                        headers: {
-                            'Content-Type': 'application/json',
-                            'X-CSRFToken': '{{ csrf_token }}', 
-                            'X-CSRF-Token': '{{ csrf_token }}'
-                        },
-                        body: JSON.stringify(updatedData)
-                    });
-
-                    const result = await response.json();
-
-                    if (response.ok && result.ok) {
-                        alert(result.message || 'Medium erfolgreich aktualisiert!');
-                        closeEditLibraryModal();
-
-                        pagingState.loading = false; 
-                        loadLibraryItems(); 
-                    } else {
-                        alert(result.message || 'Fehler beim Speichern der Änderungen.');
-                    }
-                } catch (error) {
-                    console.error('Update failed:', error);
-                    alert('Netzwerkfehler beim Aktualisieren des Mediums.');
-                }
-            });
-        }
-    });
-
-    // Modal Control Functions (accessible globally from table buttons)
     function openEditLibraryItem(itemId) {
-        const item = libraryItems.find(i => i._id === itemId);
-        
+        const item = getLibraryItemById(itemId);
         if (!item) {
-            alert('Fehler: Das Medium konnte nicht gefunden werden.');
+            alert('Element nicht gefunden.');
             return;
         }
 
-        // Populate the form fields - Using correct German properties from MongoDB fields
+        const modal = document.getElementById('editLibraryModal');
         document.getElementById('editLibraryItemId').value = item._id || '';
         document.getElementById('editLibraryName').value = item.Name || '';
-        document.getElementById('editLibraryType').value = item.ItemType || 'book';
-        document.getElementById('editLibraryIsbn').value = item.ISBN || '';
-        document.getElementById('editLibraryCode4').value = item.Code_4 || item.Code4 || '';
-        document.getElementById('editLibraryLocation').value = item.Ort || ''; 
+        document.getElementById('editLibraryAuthor').value = item.Autor || item.Author || '';
         document.getElementById('editLibraryDescription').value = item.Beschreibung || '';
-
-        document.getElementById('editLibraryModal').style.display = 'flex'; 
+        document.getElementById('editLibraryLocation').value = item.Ort || '';
+        document.getElementById('editLibraryIsbn').value = item.ISBN || '';
+        document.getElementById('editLibraryCode4').value = item.Code_4 || '';
+        document.getElementById('editLibraryType').value = (item.ItemType || 'book');
+        modal.style.display = 'flex';
     }
 
     function closeEditLibraryModal() {
-        document.getElementById('editLibraryModal').style.display = 'none';
+        const modal = document.getElementById('editLibraryModal');
+        modal.style.display = 'none';
     }
+
+    async function submitEditLibraryItem(event) {
+        event.preventDefault();
+        const itemId = document.getElementById('editLibraryItemId').value;
+        const payload = {
+            name: document.getElementById('editLibraryName').value,
+            autor: document.getElementById('editLibraryAuthor').value,
+            beschreibung: document.getElementById('editLibraryDescription').value,
+            ort: document.getElementById('editLibraryLocation').value,
+            isbn: document.getElementById('editLibraryIsbn').value,
+            code_4: document.getElementById('editLibraryCode4').value,
+            item_type: document.getElementById('editLibraryType').value
+        };
+
+        try {
+            const response = await fetch(`/api/library_item/${itemId}/update`, {
+                method: 'POST',
+                headers: {'Content-Type': 'application/json'},
+                body: JSON.stringify(payload)
+            });
+            const result = await response.json();
+            if (!response.ok || !result.ok) {
+                alert(result.message || 'Bearbeiten fehlgeschlagen.');
+                return;
+            }
+            closeEditLibraryModal();
+            await loadLibraryItems();
+            setScanStatus('Bibliotheksmedium aktualisiert.', 'ok');
+        } catch (err) {
+            console.error('Library edit failed:', err);
+            alert('Fehler beim Bearbeiten des Bibliotheksmediums.');
+        }
+    }
+
+    // Load on page init
+    document.addEventListener('DOMContentLoaded', () => {
+        loadLibraryItems();
+        wireScannerUi();
+        const editForm = document.getElementById('editLibraryForm');
+        if (editForm) {
+            editForm.addEventListener('submit', submitEditLibraryItem);
+        }
+    });
 </script>
 
 <div id="editLibraryModal" class="modal" style="display:none;">
@@ -1229,6 +1180,10 @@
                     <label for="editLibraryName">Titel</label>
                     <input id="editLibraryName" required>
                 </div>
+                <div>
+                    <label for="editLibraryAuthor">Autor/Künstler</label>
+                    <input id="editLibraryAuthor">
+                </div>
                 <div>
                     <label for="editLibraryType">Medientyp</label>
                     <select id="editLibraryType">
@@ -1263,4 +1218,4 @@
         </form>
     </div>
 </div>
-{% endblock %}
+{% endblock %}

Web/templates/main.html

@@ -373,7 +373,7 @@
             
             <div class="filter-group">
                 <div class="filter-header">
-                    <label>Schlagwort:</label>
+                    <label>Thema:</label>
                     <button type="button" class="filter-toggle" onclick="toggleFilterDropdown('filter3-dropdown')">▼</button>
                     <button type="button" class="clear-filter" onclick="clearFilter(3)">Clear</button>
                 </div>
@@ -413,14 +413,17 @@
         </div>
         <div class="qr-container">
             <button id="scanButton" class="scan-button" aria-controls="qr-reader" aria-expanded="false">Barcode scannen</button>
-            <div id="qr-reader"></div>
+            <div id="qr-reader" style="display: none;">
+                <video id="qr-reader-video" playsinline style="width: 100%; max-width: 500px; border-radius: 8px;"></video>
+                <canvas id="qr-reader-canvas" style="display: none;"></canvas>
+            </div>
         </div>
         <div id="table-view-header" class="table-view-header" aria-hidden="true">
             <span>Name</span>
             <span>Ort</span>
             <span>Unterrichtsfach</span>
             <span>Jahrgangsstufe</span>
-            <span>Schlagwort</span>
+            <span>Thema</span>
             <span>Barcode</span>
         </div>
         <div id="items-container" class="items-container">
@@ -525,7 +528,9 @@
     
     window.isDebug = false; // Set to true only for development environment
 </script>
-<script src="https://cdn.jsdelivr.net/npm/@ericblade/quagga2/dist/quagga.js"></script>
+
+<script src="https://unpkg.com/@zxing/library@latest/umd/index.min.js"></script>
+<script src="/static/js/scanner.js"></script>
 <script>
     // Global state
     const highlightItemId = (window.serverVars && window.serverVars.highlightItemId && window.serverVars.highlightItemId !== 'null')
@@ -534,114 +539,59 @@
     let codeSearchTerm = '';
     let descSearchIds = null; // Set of matching IDs or null when disabled
 
-    // Keep track of the scanner state globally/outer scope
-    let isScanning = false; 
-    let activeScannerCallback = null; // Tracks which function currently owns the scanner output
-
-    function startScanner(targetCallback) {
+    // QR scanner toggle setup
+    document.addEventListener('DOMContentLoaded', function() {
+        const scanButton = document.getElementById('scanButton');
         const qrReader = document.getElementById('qr-reader');
-        const statusText = document.getElementById('status');
+        let hybridScanner = null;
 
-        // Store the custom action that should happen when a barcode is found
-        activeScannerCallback = targetCallback;
+        if (!scanButton || !qrReader) return;
 
-        // Show the container
-        if (qrReader) qrReader.style.display = 'block';
-        if (statusText) statusText.innerText = "Initializing camera...";
+        const setScannerUi = (isOpen) => {
+            scanButton.classList.toggle('is-active', isOpen);
+            scanButton.setAttribute('aria-expanded', isOpen ? 'true' : 'false');
+            scanButton.textContent = isOpen ? 'Scanner schliessen' : 'Barcode scannen';
+        };
 
-        Quagga.init({
-            inputStream: {
-                name: "Live",
-                type: "LiveStream",
-                // Make sure this targets your correct HTML container element 
-                target: document.querySelector('#scanner-container'), 
-                constraints: {
-                    width: 640,
-                    height: 480,
-                    facingMode: "environment" // Force rear camera
-                },
-            },
-            decoder: {
-                // Your required formats mapped to Quagga2 reader strings
-                readers: ["code_128_reader", "ean_reader", "code_39_reader", "upc_reader"]
-            } 
-        }, function(err) {
-            if (err) {
-                console.error("Initialization error:", err);
-                if (statusText) statusText.innerText = "Camera Error";
-                return;
-            }
+        scanButton.addEventListener('click', function() {
+            if (qrReader.style.display !== 'block') {
+                qrReader.style.display = 'block';
+                
+                hybridScanner = new HybridScanner({
+                    videoId: 'qr-reader-video',
+                    canvasId: 'qr-reader-canvas',
+                    formats: ['QR_CODE', 'CODE_128', 'EAN_13', 'EAN_8', 'CODE_39'],
+                    fps: 10,
+                    facingMode: 'environment',
+                    onSuccess: function(decodedText) {
+                        hybridScanner.stop();
+                        qrReader.style.display = 'none';
+                        
+                        // Put scanned code into the search box and trigger search
+                        const searchInput = document.getElementById('code-search');
+                        if (searchInput) {
+                            searchInput.value = decodedText;
+                            searchByCode();
+                        }
 
-            Quagga.start();
-            isScanning = true;
+                        setScannerUi(false);
+                    },
+                    onError: function(error) {
+                        console.error('Scanner error:', error);
+                    }
+                });
 
-            // If we are using the main search button, manage its UI state
-            if (!targetCallback) {
+                hybridScanner.start();
                 setScannerUi(true);
-            }
-
-            if (statusText) statusText.innerText = "Scanning...";
-        });
-    }
-
-    function stopScanner() {
-        Quagga.stop();
-        isScanning = false;
-        activeScannerCallback = null; // Reset the callback routing
-
-        const qrReader = document.getElementById('qr-reader');
-        if (qrReader) qrReader.style.display = 'none';
-
-        setScannerUi(false);
-    }
-
-    function setScannerUi(isOpen) {
-        const scanBtn = document.getElementById('scanButton');
-        if (!scanBtn) return;
-
-        scanBtn.classList.toggle('is-active', isOpen);
-        scanBtn.setAttribute('aria-expanded', isOpen ? 'true' : 'false');
-        scanBtn.textContent = isOpen ? 'Scanner schliessen' : 'Barcode scannen';
-    }
-
-    // Unified global reader callback
-    Quagga.onDetected(function(data) {
-        const barcode = String(data.codeResult.code || '').trim();
-        console.log("Barcode detected:", barcode);
-
-        // Keep a local reference to the active callback before shutting down the engine
-        const currentCallback = activeScannerCallback;
-
-        // Critical: Stop scanning immediately to prevent multiple triggers
-        stopScanner();
-
-        // Route data based on who opened the scanner
-        if (typeof currentCallback === "function") {
-            // Send data directly to the specific edit field's logic
-            currentCallback(barcode);
-        } else {
-            // Fallback Default: Main search box logic
-            const resultText = document.getElementById('barcode-result');
-            if (resultText) resultText.innerText = barcode;
-
-            const searchInput = document.getElementById('code-search');
-            if (searchInput) {
-                searchInput.value = barcode;
-                if (typeof searchByCode === "function") {
-                    searchByCode();
+            } else {
+                if (hybridScanner) {
+                    hybridScanner.stop();
+                    hybridScanner = null;
                 }
+                qrReader.style.display = 'none';
+                setScannerUi(false);
             }
-        }
-    });
-
-    // Event Listener for the main standalone search button
-    document.getElementById('scanButton')?.addEventListener('click', function() {
-        if (!isScanning) {
-            // Pass null so it defaults to filling the standard search box
-            startScanner(null); 
-        } else {
-            stopScanner();
-        }
+        });
     });
 
     // Return preferred primary and fallback image URLs based on extension
@@ -1057,7 +1007,7 @@
                                 <p class="item-col-location"><strong>Ort:</strong> ${item.Ort || '-'}</p>
                                 <p class="item-col-filter1"><strong>Unterrichtsfach:</strong> ${filter1Display}${filter1More}</p>
                                 <p class="item-col-filter2"><strong>Jahrgangsstufe:</strong> ${filter2Display}${filter2More}</p>
-                                <p class="item-col-filter3"><strong>Schlagwort:</strong> ${filter3Display}${filter3More}</p>
+                                <p class="item-col-filter3"><strong>Thema:</strong> ${filter3Display}${filter3More}</p>
                                 <p class="item-col-code"><strong>Barcode:</strong> ${item.Code_4 || '-'}</p>
                                 <p class="item-col-count"><strong>Anzahl:</strong> ${groupedCount}</p>
                                 ${isGroupedItem ? `<p class="item-col-count"><strong>Verfügbar:</strong> ${availableGroupedCount}</p>` : ''}
@@ -1682,7 +1632,7 @@
                 </div>
                 
                 <div class="detail-group">
-                    <div class="detail-label">Schlagwort:</div>
+                    <div class="detail-label">Thema:</div>
                     <div class="detail-value">${filter3Array.join(', ') || '-'}</div>
                 </div>
                 

Web/templates/main_admin.html

@@ -2395,7 +2395,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
             
             <div class="filter-group">
                 <div class="filter-header">
-                    <label>Schlagwort:</label>
+                    <label>Thema:</label>
                     <button type="button" class="filter-toggle" onclick="toggleFilterDropdown('filter3-dropdown')">▼</button>
                     <button type="button" class="clear-filter" onclick="clearFilter(3)">Clear</button>
                 </div>
@@ -2436,8 +2436,8 @@ document.addEventListener('DOMContentLoaded', ()=>{
         <div class="qr-container">
             <button id="scanButton" class="scan-button" aria-controls="qr-reader" aria-expanded="false">Barcode scannen</button>
             <div id="qr-reader" style="display: none;">
-                <h3>Status: <span id="status">Bereit</span></h3>
-                <div id="scanner-container"></div>
+                <video id="qr-reader-video" playsinline style="width: 100%; max-width: 100%; height: auto; aspect-ratio: 4/3; object-fit: cover; border-radius: 8px;"></video>
+                <canvas id="qr-reader-canvas" style="display: none;"></canvas>
             </div>
         </div>
 
@@ -2446,7 +2446,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
             <span>Ort</span>
             <span>Unterrichtsfach</span>
             <span>Jahrgangsstufe</span>
-            <span>Schlagwort</span>
+            <span>Thema</span>
             <span>Barcode</span>
             <span>Anzahl</span>
         </div>
@@ -2567,7 +2567,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
                         </div>
                     </div>
                     
-                    <h3>Schlagwort:</h3>
+                    <h3>Thema:</h3>
                     <div class="multi-filter">
                         <div class="form-group">
                             <label for="edit-filter3-1">Wert 1:</label>
@@ -2732,7 +2732,8 @@ document.addEventListener('DOMContentLoaded', ()=>{
     
     window.isDebug = false; // Set to true only for development environment
 </script>
-<script src="https://cdn.jsdelivr.net/npm/@ericblade/quagga2/dist/quagga.js"></script>
+<script src="https://unpkg.com/@zxing/library@latest/umd/index.min.js"></script>
+<script src="/static/js/scanner.js"></script>
 <script>
     // Function to check if a file is a video
     function isVideoFile(filename) {
@@ -2742,6 +2743,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
     }
 
     // Initialize QR Code scanner and global variables
+    let hybridScanner = null;
     let codeSearchTerm = '';
     let descSearchIds = null; // Set of matching IDs or null when disabled
     let currentUsername = '';
@@ -2770,114 +2772,55 @@ document.addEventListener('DOMContentLoaded', ()=>{
         // No-op in production
         return;
     }
-
-    // Keep track of the scanner state globally/outer scope
-    let isScanning = false; 
-    let activeScannerCallback = null; // Tracks which function currently owns the scanner output
-
-    function startScanner(targetCallback) {
+    
+    document.getElementById('scanButton').addEventListener('click', function() {
         const qrReader = document.getElementById('qr-reader');
-        const statusText = document.getElementById('status');
-
-        // Store the custom action that should happen when a barcode is found
-        activeScannerCallback = targetCallback;
-
-        // Show the container
-        if (qrReader) qrReader.style.display = 'block';
-        if (statusText) statusText.innerText = "Initializing camera...";
-
-        Quagga.init({
-            inputStream: {
-                name: "Live",
-                type: "LiveStream",
-                // Make sure this targets your correct HTML container element 
-                target: document.querySelector('#scanner-container'), 
-                constraints: {
-                    width: 640,
-                    height: 480,
-                    facingMode: "environment" // Force rear camera
-                },
-            },
-            decoder: {
-                // Your required formats mapped to Quagga2 reader strings
-                readers: ["code_128_reader", "ean_reader", "code_39_reader", "upc_reader"]
-            } 
-        }, function(err) {
-            if (err) {
-                console.error("Initialization error:", err);
-                if (statusText) statusText.innerText = "Camera Error";
-                return;
-            }
-
-            Quagga.start();
-            isScanning = true;
-
-            // If we are using the main search button, manage its UI state
-            if (!targetCallback) {
-                setScannerUi(true);
-            }
-
-            if (statusText) statusText.innerText = "Scanning...";
-        });
-    }
-
-    function stopScanner() {
-        Quagga.stop();
-        isScanning = false;
-        activeScannerCallback = null; // Reset the callback routing
-
-        const qrReader = document.getElementById('qr-reader');
-        if (qrReader) qrReader.style.display = 'none';
-
-        setScannerUi(false);
-    }
-
-    function setScannerUi(isOpen) {
         const scanBtn = document.getElementById('scanButton');
-        if (!scanBtn) return;
 
-        scanBtn.classList.toggle('is-active', isOpen);
-        scanBtn.setAttribute('aria-expanded', isOpen ? 'true' : 'false');
-        scanBtn.textContent = isOpen ? 'Scanner schliessen' : 'Barcode scannen';
-    }
+        const setScannerUi = (isOpen) => {
+            if (!scanBtn) return;
+            scanBtn.classList.toggle('is-active', isOpen);
+            scanBtn.setAttribute('aria-expanded', isOpen ? 'true' : 'false');
+            scanBtn.textContent = isOpen ? 'Scanner schliessen' : 'Barcode scannen';
+        };
+        
+        if (qrReader.style.display === 'none') {
+            qrReader.style.display = 'block';
+            
+            hybridScanner = new HybridScanner({
+                videoId: 'qr-reader-video',
+                canvasId: 'qr-reader-canvas',
+                formats: ['QR_CODE', 'CODE_128', 'EAN_13', 'EAN_8', 'CODE_39', 'UPC_A'],
+                fps: 10,
+                facingMode: 'environment',
+                onSuccess: function(decodedText) {
+                    hybridScanner.stop();
+                    qrReader.style.display = 'none';
+                    
+                    // Put the scanned code in the search box
+                    const searchInput = document.getElementById('code-search');
+                    if (searchInput) {
+                        searchInput.value = decodedText;
+                        // Trigger search automatically
+                        searchByCode();
+                    }
 
-    // Unified global reader callback
-    Quagga.onDetected(function(data) {
-        const barcode = String(data.codeResult.code || '').trim();
-        console.log("Barcode detected:", barcode);
-
-        // Keep a local reference to the active callback before shutting down the engine
-        const currentCallback = activeScannerCallback;
-
-        // Critical: Stop scanning immediately to prevent multiple triggers
-        stopScanner();
-
-        // Route data based on who opened the scanner
-        if (typeof currentCallback === "function") {
-            // Send data directly to the specific edit field's logic
-            currentCallback(barcode);
-        } else {
-            // Fallback Default: Main search box logic
-            const resultText = document.getElementById('barcode-result');
-            if (resultText) resultText.innerText = barcode;
-
-            const searchInput = document.getElementById('code-search');
-            if (searchInput) {
-                searchInput.value = barcode;
-                if (typeof searchByCode === "function") {
-                    searchByCode();
+                    setScannerUi(false);
+                },
+                onError: function(error) {
+                    console.error('Scanner error:', error);
                 }
-            }
-        }
-    });
+            });
 
-    // Event Listener for the main standalone search button
-    document.getElementById('scanButton')?.addEventListener('click', function() {
-        if (!isScanning) {
-            // Pass null so it defaults to filling the standard search box
-            startScanner(null); 
+            hybridScanner.start();
+            setScannerUi(true);
         } else {
-            stopScanner();
+            if (hybridScanner) {
+                hybridScanner.stop();
+                hybridScanner = null;
+            }
+            qrReader.style.display = 'none';
+            setScannerUi(false);
         }
     });
 
@@ -2889,21 +2832,37 @@ document.addEventListener('DOMContentLoaded', ()=>{
             return;
         }
 
-        // Toggle close if it's already running
-        if (isScanning && qrReader.style.display !== 'none') {
-            stopScanner();
+        if (qrReader.style.display !== 'none') {
+            if (hybridScanner) {
+                hybridScanner.stop();
+                hybridScanner = null;
+            }
+            qrReader.style.display = 'none';
             scanEditBtn.textContent = 'Barcode scannen';
             return;
         }
 
+        qrReader.style.display = 'block';
         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';
+        hybridScanner = new HybridScanner({
+            videoId: 'qr-reader-video',
+            canvasId: 'qr-reader-canvas',
+            formats: ['CODE_128', 'CODE_39', 'QR_CODE'],
+            fps: 10,
+            facingMode: 'environment',
+            onSuccess: function(decodedText) {
+                hybridScanner.stop();
+                qrReader.style.display = 'none';
+                editCodeInput.value = String(decodedText || '').trim();
+                validateCodeField(editCodeInput, document.getElementById('edit-item-id')?.value || null);
+                scanEditBtn.textContent = 'Barcode scannen';
+            },
+            onError: function(error) {
+                console.error('Scanner error:', error);
+            }
         });
+        
+        hybridScanner.start();
     }
 
     function scanIntoEditIsbn() {
@@ -2914,23 +2873,39 @@ document.addEventListener('DOMContentLoaded', ()=>{
             return;
         }
 
-        // Toggle close if it's already running
-        if (isScanning && qrReader.style.display !== 'none') {
-            stopScanner();
+        if (qrReader.style.display !== 'none') {
+            if (hybridScanner) {
+                hybridScanner.stop();
+                hybridScanner = null;
+            }
+            qrReader.style.display = 'none';
             scanIsbnBtn.textContent = 'ISBN scannen';
             return;
         }
 
+        qrReader.style.display = 'block';
         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');
+        hybridScanner = new HybridScanner({
+            videoId: 'qr-reader-video',
+            canvasId: 'qr-reader-canvas',
+            formats: ['ISBN', 'EAN_13', 'EAN_8', 'QR_CODE'],
+            fps: 10,
+            facingMode: 'environment',
+            onSuccess: function(decodedText) {
+                hybridScanner.stop();
+                qrReader.style.display = 'none';
+                editIsbnInput.value = String(decodedText || '').trim();
+                scanIsbnBtn.textContent = 'ISBN scannen';
+                if (typeof fetchBookInfo === 'function') {
+                    fetchBookInfo('edit');
+                }
+            },
+            onError: function(error) {
+                console.error('Scanner error:', error);
             }
         });
+        
+        hybridScanner.start();
     }
 
     function rebuildFilter3Options() {
@@ -3686,7 +3661,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
                                 <p class="item-col-location"><strong>Ort:</strong> ${item.Ort || '-'}</p>
                                 <p class="item-col-filter1"><strong>Unterrichtsfach:</strong> ${filter1Display}${filter1More}</p>
                                 <p class="item-col-filter2"><strong>Jahrgangsstufe:</strong> ${filter2Display}${filter2More}</p>
-                                <p class="item-col-filter3"><strong>Schlagwort:</strong> ${filter3Display}${filter3More}</p>
+                                <p class="item-col-filter3"><strong>Thema:</strong> ${filter3Display}${filter3More}</p>
                                 <p class="item-col-code"><strong>Barcode:</strong> ${item.Code_4 || '-'}</p>
                                 <p class="item-col-count"><strong>Anzahl:</strong> ${groupedCount}</p>
                                 ${hasDamage ? `<div class="damage-badge">${damageCount > 0 ? `Schäden gemeldet: ${damageCount}` : 'Schäden gemeldet'}</div>` : ''}
@@ -4229,7 +4204,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
                 document.getElementById('edit-filter2-3').value = filter2Array[2] || '';
                 document.getElementById('edit-filter2-4').value = filter2Array[3] || '';
 
-                // Fill in filter 3 (Schlagwort)
+                // Fill in filter 3 (Thema)
                 const filter3Array = Array.isArray(item.Filter3) ? item.Filter3 : (item.Filter3 ? [item.Filter3] : []);
                 document.getElementById('edit-filter3-1').value = filter3Array[0] || '';
                 document.getElementById('edit-filter3-2').value = filter3Array[1] || '';
@@ -4543,7 +4518,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
                 </div>
                 
                 <div class="detail-group">
-                    <div class="detail-label">Schlagwort:</div>
+                    <div class="detail-label">Thema:</div>
                     <div class="detail-value">${filter3Array.join(', ') || '-'}</div>
                 </div>
                 

Web/templates/termin_configure.html

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

Web/templates/terminplan.html

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

Web/templates/terminplaner.html

@@ -71,7 +71,6 @@
                     <div class="border rounded-3 p-3">
                         <div class="d-flex flex-column flex-lg-row justify-content-between gap-3">
                             <div>
-                                <h3 class="h6 fw-bold mb-1">{{ event.title or "Terminplan" }}</h3>
                                 <div class="fw-semibold">{{ event.date_start }} bis {{ event.date_end }}</div>
                                 <div class="text-muted small">ID: {{ event.appointment_id }}</div>
                                 {% if event.time_span %}

Web/templates/upload_admin.html

@@ -155,27 +155,6 @@
         background-color: #1e7e34;
     }
 
-    /* Quagga Scanner Video Styles */
-    #code4-scanner video, #code4-scanner canvas,
-    #isbn-scanner video, #isbn-scanner canvas {
-        width: 100%;
-        max-width: 640px;
-        height: auto;
-        border-radius: 5px;
-        box-shadow: 0 2px 8px rgba(0,0,0,0.1);
-    }
-    
-    #code4-scanner canvas, #isbn-scanner canvas {
-        position: absolute;
-        top: 0;
-        left: 0;
-    }
-    
-    #code4-scanner, #isbn-scanner {
-        position: relative;
-        overflow: hidden;
-    }
-
     /* ISBN input group styling */
     .isbn-input-group {
         display: flex;
@@ -852,7 +831,7 @@
                             <!-- Options will be loaded by JavaScript -->
                         </select>
                     </div>
-                    <div class="formupload_admin-group">
+                    <div class="form-group">
                         <label for="filter2-4">Wert 4:</label>
                         <select id="filter2-4" name="filter2" class="filter-dropdown-select">
                             <option value="">-- Optional --</option>
@@ -861,7 +840,7 @@
                     </div>
                 </div>
                 
-                <h3>Schlagwort:</h3>
+                <h3>Thema:</h3>
                 <div class="multi-filter">
                     <div class="form-group">
                         <label for="filter3-1">Wert 1:</label>
@@ -890,41 +869,28 @@
                 <label for="anschaffungskosten">Anschaffungskosten (€)</label>
                 <input id="anschaffungskosten" name="anschaffungskosten">
             </div>
-           <div class="form-group">
-                <label for="scan_mode">Erfassungs-Modus:</label>
-                <select id="scan_mode" name="scan_mode" class="form-control" onchange="toggleScanMode()">
-                    <option value="single">Einzel-Code (Scanner stoppt nach 1 Scan)</option>
-                    <option value="continuous">Fortlaufend scannen (Mehrere Codes nacheinander)</option>
-                    <option value="range">Code-Bereich generieren (z.B. ABC-001 bis ABC-010)</option>
-                </select>
-            </div>
-
-            <div id="range_generator_group" class="form-group" style="display:none; background: #f9f9f9; padding: 15px; border-radius: 5px; border: 1px solid #ddd; margin-bottom: 15px;">
-                <label style="font-weight: bold;">Code-Bereich automatisch generieren:</label>
-                <div style="display: flex; gap: 10px; margin-bottom: 10px; align-items: center;">
-                    <input type="text" id="range_prefix" placeholder="Präfix (z.B. IT-)" class="form-control" style="flex: 2;">
-                    <input type="number" id="range_start" placeholder="Start (z.B. 1)" class="form-control" style="flex: 1;">
-                    <span style="font-weight: bold;">bis</span>
-                    <input type="text" id="range_end" placeholder="Ende (z.B. 020)" class="form-control" style="flex: 1;">
+            <div class="form-group">
+                <label for="code_4">Code</label>
+                <div style="display:flex; gap:8px; flex-wrap:wrap; align-items:center;">
+                    <input id="code_4" name="code_4">
+                    <button type="button" id="scan-code4-btn" class="fetch-isbn-button">Barcode scannen</button>
                 </div>
-                <small style="display:block; color:#666; margin-bottom: 10px;">Tipp: Die Anzahl der Ziffern im "Ende"-Feld bestimmt die führenden Nullen (z.B. Ende "050" macht aus Start "1" einen "001").</small>
-                <button type="button" class="btn btn-secondary" onclick="generateCodeRange()">Bereich generieren & einfügen</button>
-            </div>
-
-            <div class="form-group" id="primary_code_group">
-                <label for="code_4">Basis-Code</label>
-                <div style="display: flex; gap: 10px;">
-                    <input type="text" id="code_4" name="code_4" class="form-control" placeholder="Haupt-Barcode" required>
-                    <button type="button" id="scan-code4-btn" class="btn btn-primary">Barcode scannen</button>
+                <small style="display:block; color:#666;">Einzelcode manuell setzen oder per Scanner erfassen.</small>
+                <div id="code4-scanner" style="width:100%; max-width:520px; display:none; margin-top:10px;">
+                    <video id="code4-scanner-video" playsinline style="width: 100%; border-radius: 8px;"></video>
+                    <canvas id="code4-scanner-canvas" style="display: none;"></canvas>
                 </div>
-                <div id="code4-scanner" style="display:none; margin-top: 10px;"></div>
-                <small id="code4-scan-status" class="form-text text-muted"></small>
+                <small id="code4-scan-status" style="display:block; color:#666; margin-top:6px;"></small>
             </div>
-
-            <div class="form-group" id="individual_codes_group">
-                <label for="individual_codes">Weitere Einzelcodes (je Zeile ein Code)</label>
-                <textarea id="individual_codes" name="individual_codes" rows="6" placeholder="z.B.&#10;ABC-001&#10;ABC-002" class="form-control"></textarea>
-                <small style="display:block; color:#666; margin-top: 5px;">Bei Anzahl > 1 können hier individuelle Codes pro Item gesetzt werden. Der Scanner setzt immer zuerst den Basis-Code im Feld oben; weitere Einzelcodes werden hier angehängt.</small>
+            <div class="form-group">
+                <label for="item_count">Anzahl dieser Sorte</label>
+                <input type="number" id="item_count" name="item_count" min="1" max="100" value="1">
+                <small style="display:block; color:#666;">Es werden eigene Items erstellt, aber in der Übersicht als ein Artikel gebündelt angezeigt.</small>
+            </div>
+            <div class="form-group">
+                <label for="individual_codes">Einzelcodes (optional, je Zeile ein Code)</label>
+                <textarea id="individual_codes" name="individual_codes" rows="4" placeholder="z.B.\nABC-001\nABC-002"></textarea>
+                <small style="display:block; color:#666;">Bei Anzahl > 1 können hier individuelle Codes pro Item gesetzt werden. Der Scanner setzt immer zuerst den Basis-Code im Feld oben; weitere Einzelcodes können hier bei Bedarf manuell ergänzt werden.</small>
             </div>
             <!-- Image upload (hidden for library mode) -->
             <div class="form-group" {% if show_library_features %}style="display:none;"{% endif %}>
@@ -944,7 +910,10 @@
                     <button type="button" id="scan-isbn-btn" class="fetch-isbn-button">Barcode scannen</button>
                     <button type="button" class="fetch-isbn-button" onclick="fetchBookInfo('upload')">Bild abrufen</button>
                 </div>
-                <div id="isbn-scanner" style="width:100%; max-width:520px; display:none; margin-top:10px;"></div>
+                <div id="isbn-scanner" style="width:100%; max-width:520px; display:none; margin-top:10px;">
+                    <video id="isbn-scanner-video" playsinline style="width: 100%; border-radius: 8px;"></video>
+                    <canvas id="isbn-scanner-canvas" style="display: none;"></canvas>
+                </div>
                 <small id="isbn-scan-status" style="display:block; color:#666; margin-top:6px;">Scannen oder manuell eingeben. Gültige ISBNs helfen beim Abruf von Buchdaten, andere Codes werden trotzdem akzeptiert.</small>
                 <div id="book-info-container" class="book-info-container"></div>
             </div>
@@ -1007,7 +976,9 @@
         document.getElementById('csv-help-modal').style.display = 'none';
     }
 </script>
-<script src="https://cdn.jsdelivr.net/npm/@ericblade/quagga2/dist/quagga.js"></script>
+
+<script src="https://unpkg.com/@zxing/library@latest/umd/index.min.js"></script>
+<script src="/static/js/scanner.js"></script>
 <script>
     const libraryModuleEnabled = {{ 'true' if library_module_enabled else 'false' }};
 
@@ -1020,12 +991,12 @@
 
     // Global variable to store fetched book data
     let currentBookData = null;
-    
-    // Quagga2 engine state management properties
-    let scannerRunning = false;
-    let activeScannerCallback = null; // Dynamically handles routing data to the active caller field
-    var code4LastScanned = '';
-    var code4LastScannedAt = 0;
+    let code4ScannerInstance = null;
+    let code4ScannerRunning = false;
+    let code4LastScanned = '';
+    let code4LastScannedAt = 0;
+    let isbnScannerInstance = null;
+    let isbnScannerRunning = false;
 
     function setCode4ScanStatus(message, isError = false) {
         const statusEl = document.getElementById('code4-scan-status');
@@ -1078,230 +1049,71 @@
         statusEl.style.color = '#b00020';
     }
 
-    // Centered Quagga2 Engine Initialization Pattern
-    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" // Force rear camera lenses
-                },
-            },
-            decoder: {
-                readers: ["code_128_reader", "ean_reader", "code_39_reader", "upc_reader"]
-            } 
-        }, function(err) {
-            if (err) {
-                console.error("Initialization error:", err);
-                errorStatusSetter("Kamera konnte nicht gestartet werden.", true);
-                return;
-            }
-
-            Quagga.start();
-            scannerRunning = true;
-            errorStatusSetter(completionMsg, false);
-        });
-    }
-
-    function killScannerHardware() {
-        if (!scannerRunning) return;
-        Quagga.stop();
-        scannerRunning = false;
-        activeScannerCallback = null;
-    }
-
-    // Unified tracking capture listener
-    Quagga.onDetected(function(data) {
-        if (!data || !data.codeResult || !data.codeResult.code) return;
-
-        const rawBarcode = String(data.codeResult.code || '').trim();
-        const currentTargetCallback = activeScannerCallback;
-
-        if (typeof currentTargetCallback === "function") {
-            currentTargetCallback(rawBarcode);
-        }
-    });
-
-    // Globale Variablen für den Scanner-Status
-    var code4LastScanned = '';
-    var code4LastScannedAt = 0;
-
-    /**
-     * Schaltet das UI basierend auf dem ausgewählten Modus um
-     */
-    function toggleScanMode() {
-        const mode = document.getElementById('scan_mode').value;
-        const rangeGroup = document.getElementById('range_generator_group');
-        const scanButton = document.getElementById('scan-code4-btn');
-        const scannerBox = document.getElementById('code4-scanner');
-        
-        if (scannerBox && scannerBox.style.display !== 'none') {
-            if (typeof killScannerHardware === 'function') killScannerHardware();
-            scannerBox.style.display = 'none';
-            if (scanButton) scanButton.textContent = 'Barcode scannen';
-        }
-    
-        if (mode === 'range') {
-            if(rangeGroup) rangeGroup.style.display = 'block';
-            if(scanButton) scanButton.style.display = 'none'; 
-        } else {
-            if(rangeGroup) rangeGroup.style.display = 'none'; // Hier wurde der Fehler korrigiert
-            if(scanButton) scanButton.style.display = 'inline-block';
-        }
-    }
-
-    /**
-     * Generiert eine Liste von Codes basierend auf den Eingaben
-     */
-    function generateCodeRange() {
-        const prefix = document.getElementById('range_prefix').value.trim();
-        const startStr = document.getElementById('range_start').value.trim();
-        const endStr = document.getElementById('range_end').value.trim();
-
-        const start = parseInt(startStr, 10);
-        const end = parseInt(endStr, 10);
-
-        const paddingLength = endStr.length; 
-
-        if (isNaN(start) || isNaN(end) || start > end) {
-            alert("Bitte gültige Zahlen für Start und Ende eingeben. Der Startwert darf nicht größer als der Endwert sein.");
-            return;
-        }
-
-        let generatedCodes = [];
-        for (let i = start; i <= end; i++) {
-            let numStr = i.toString().padStart(paddingLength, '0');
-            generatedCodes.push(`${prefix}${numStr}`);
-        }
-
-        const codeField = document.getElementById('code_4');
-        const individualCodesArea = document.getElementById('individual_codes');
-
-        if (generatedCodes.length > 0) {
-            if (!codeField.value || confirm("Soll der aktuelle Basis-Code überschrieben werden?")) {
-                codeField.value = generatedCodes[0];
-                if (typeof validateCodeField === 'function') validateCodeField(codeField);
-                generatedCodes.shift(); 
-            }
-
-            if (generatedCodes.length > 0) {
-                let existing = individualCodesArea.value.trim();
-                individualCodesArea.value = existing ? existing + '\n' + generatedCodes.join('\n') : generatedCodes.join('\n');
-            }
-
-            alert(`Bereich erfolgreich generiert! (${end - start + 1} Codes)`);
-        }
-    }
-
-    /**
-     * Scanner-Funktion (Single & Continuous Modus)
-     */
     function startCode4Scanner() {
         const scannerBox = document.getElementById('code4-scanner');
         const scanButton = document.getElementById('scan-code4-btn');
         const codeField = document.getElementById('code_4');
-        const individualCodesArea = document.getElementById('individual_codes');
-        const scanMode = document.getElementById('scan_mode').value;
-
         if (!scannerBox || !scanButton || !codeField) return;
 
-        // Beende evtl. laufenden ISBN Scanner
-        const isbnScannerBox = document.getElementById('isbn-scanner');
-        if (isbnScannerBox && isbnScannerBox.style.display !== 'none') {
-            killScannerHardware();
-            isbnScannerBox.style.display = 'none';
+        // Stop ISBN scanner if currently running to avoid camera conflicts.
+        if (isbnScannerRunning && isbnScannerInstance) {
+            isbnScannerInstance.stop();
+            isbnScannerInstance = null;
+            const isbnScannerBox = document.getElementById('isbn-scanner');
             const isbnScanButton = document.getElementById('scan-isbn-btn');
-            if (isbnScanButton) isbnScanButton.textContent = 'Barcode scannen';
-            if (typeof setIsbnScanStatus === 'function') setIsbnScanStatus('Scanner gestoppt.');
+            if (isbnScannerBox) isbnScannerBox.style.display = 'none';
+            if (isbnScanButton) isbnScanButton.textContent = 'ISBN scannen';
+            isbnScannerRunning = false;
+            setIsbnScanStatus('Scanner gestoppt.');
         }
 
-        // Scanner ausschalten, wenn er bereits läuft
-        if (scannerBox.style.display !== 'none') {
-            killScannerHardware();
+        if (code4ScannerRunning && code4ScannerInstance) {
+            code4ScannerInstance.stop();
+            code4ScannerInstance = null;
             scannerBox.style.display = 'none';
             scanButton.textContent = 'Barcode scannen';
-            if (typeof setCode4ScanStatus === 'function') setCode4ScanStatus('Scanner gestoppt.');
+            code4ScannerRunning = false;
+            setCode4ScanStatus('Scanner gestoppt.');
             return;
         }
 
-        // Scanner starten
         scannerBox.style.display = 'block';
-        scanButton.textContent = scanMode === 'continuous' ? 'Fortlaufenden Scan stoppen' : 'Scanner stoppen';
-        if (typeof setCode4ScanStatus === 'function') setCode4ScanStatus('Scanner initialisiert. Richte die Kamera auf den Barcode...');
+        scanButton.textContent = 'Scanner stoppen';
+        code4ScannerRunning = true;
+        setCode4ScanStatus('Scanner läuft. Der Scan wird im Basis-Codefeld übernommen.');
 
-        if (typeof runEngineInitialization === 'function') {
-            runEngineInitialization(
-                '#code4-scanner', 
-                function(decodedText) {
-                    const now = Date.now();
-                    if (decodedText === code4LastScanned && (now - code4LastScannedAt) < 1500) {
-                        return;
-                    }
-                    code4LastScanned = decodedText;
-                    code4LastScannedAt = now;
-                
-                    if (scanMode === 'single') {
-                        killScannerHardware();
-                        scannerBox.style.display = 'none';
-                        scanButton.textContent = 'Barcode scannen';
-                    
-                        codeField.value = decodedText;
-                        if (typeof validateCodeField === 'function') validateCodeField(codeField);
-                        if (typeof setCode4ScanStatus === 'function') setCode4ScanStatus(`Code gesetzt: ${decodedText}`);
+        code4ScannerInstance = new HybridScanner({
+            videoId: 'code4-scanner-video',
+            canvasId: 'code4-scanner-canvas',
+            formats: ['CODE_128', 'CODE_39', 'QR_CODE'],
+            fps: 10,
+            facingMode: 'environment',
+            onSuccess: function(decodedText) {
+                const scannedCode = String(decodedText || '').trim();
+                if (!scannedCode) return;
 
-                    } else if (scanMode === 'continuous') {
-                        let currentAreaCodes = individualCodesArea.value.split('\n').map(c => c.trim()).filter(c => c !== '');
+                const now = Date.now();
+                if (scannedCode === code4LastScanned && (now - code4LastScannedAt) < 1500) {
+                    return;
+                }
+                code4LastScanned = scannedCode;
+                code4LastScannedAt = now;
 
-                        if (!codeField.value) {
-                            codeField.value = decodedText;
-                            if (typeof validateCodeField === 'function') validateCodeField(codeField);
-                            if (typeof setCode4ScanStatus === 'function') setCode4ScanStatus(`Basis-Code gesetzt: ${decodedText}`);
-                        } else if (!currentAreaCodes.includes(decodedText) && codeField.value !== decodedText) {
-                            individualCodesArea.value += (individualCodesArea.value ? '\n' : '') + decodedText;
-                            if (typeof setCode4ScanStatus === 'function') setCode4ScanStatus(`Zusatz-Code erfasst: ${decodedText}`);
+                codeField.value = scannedCode;
+                validateCodeField(codeField);
+                setCode4ScanStatus(`Code_4 gesetzt: ${scannedCode}`);
+            },
+            onError: function(error) {
+                setCode4ScanStatus(`Fehler: ${error}`, true);
+            }
+        });
 
-                            try {
-                                const audioCtx = new (window.AudioContext || window.webkitAudioContext)();
-                                const oscillator = audioCtx.createOscillator();
-                                const gainNode = audioCtx.createGain();
-                                oscillator.connect(gainNode);
-                                gainNode.connect(audioCtx.destination);
-                                oscillator.type = 'sine';
-                                oscillator.frequency.value = 800; 
-                                gainNode.gain.setValueAtTime(0.1, audioCtx.currentTime);
-                                oscillator.start();
-                                oscillator.stop(audioCtx.currentTime + 0.1);
-                            } catch (e) {
-                                console.log("Audio feedback not supported");
-                            }
-                        } else {
-                            if (typeof setCode4ScanStatus === 'function') setCode4ScanStatus(`Code ${decodedText} wurde bereits gescannt.`);
-                        }
-                    }
-                },
-                'Scanner läuft. Richte die Kamera auf den Barcode.',
-                setCode4ScanStatus
-            );
-        }
+        code4ScannerInstance.start();
     }
 
-    /**
-     * ISBN Scanner-Funktion
-     */
     function startIsbnScanner() {
         if (!libraryModuleEnabled) {
-            if (typeof setIsbnScanStatus === 'function') setIsbnScanStatus('Bibliotheks-Modul ist deaktiviert.', true);
+            setIsbnScanStatus('Bibliotheks-Modul ist deaktiviert.', true);
             return;
         }
         const scannerBox = document.getElementById('isbn-scanner');
@@ -1309,75 +1121,74 @@
         const isbnField = document.getElementById('isbn');
         if (!scannerBox || !scanButton || !isbnField) return;
 
-        const codeScannerBox = document.getElementById('code4-scanner');
-        const codeScanButton = document.getElementById('scan-code4-btn');
-        if (codeScannerBox && codeScannerBox.style.display !== 'none') {
-            killScannerHardware();
-            codeScannerBox.style.display = 'none';
-            codeScanButton.textContent = 'Barcode scannen';
-            if (typeof setCode4ScanStatus === 'function') setCode4ScanStatus('Scanner gestoppt.');
+        // Stop Code_4 scanner if currently running to avoid camera conflicts.
+        if (code4ScannerRunning && code4ScannerInstance) {
+            code4ScannerInstance.stop();
+            code4ScannerInstance = null;
+            const codeScannerBox = document.getElementById('code4-scanner');
+            const codeScanButton = document.getElementById('scan-code4-btn');
+            if (codeScannerBox) codeScannerBox.style.display = 'none';
+            if (codeScanButton) codeScanButton.textContent = 'Barcode scannen';
+            code4ScannerRunning = false;
+            setCode4ScanStatus('Scanner gestoppt.');
         }
 
-        if (scannerBox.style.display !== 'none') {
-            killScannerHardware();
+        if (isbnScannerRunning && isbnScannerInstance) {
+            isbnScannerInstance.stop();
+            isbnScannerInstance = null;
             scannerBox.style.display = 'none';
-            scanButton.textContent = 'Barcode scannen';
-            if (typeof setIsbnScanStatus === 'function') setIsbnScanStatus('Scanner gestoppt.');
+            scanButton.textContent = 'ISBN scannen';
+            isbnScannerRunning = false;
+            setIsbnScanStatus('Scanner gestoppt.');
             return;
         }
 
         scannerBox.style.display = 'block';
         scanButton.textContent = 'Scanner stoppen';
+        isbnScannerRunning = true;
+        setIsbnScanStatus('Scanner läuft. Bitte ISBN-Code erfassen.');
 
-        runEngineInitialization(
-            '#isbn-scanner',
-            function(decodedText) {
-                killScannerHardware();
-                scannerBox.style.display = 'none';
-                scanButton.textContent = 'Barcode scannen';
+        isbnScannerInstance = new HybridScanner({
+            videoId: 'isbn-scanner-video',
+            canvasId: 'isbn-scanner-canvas',
+            formats: ['ISBN', 'EAN_13', 'EAN_8', 'QR_CODE'],
+            fps: 10,
+            facingMode: 'environment',
+            onSuccess: function(decodedText) {
+            const scannedCode = String(decodedText || '').trim();
+            if (!scannedCode) return;
 
-                const normalizedIsbn = typeof normalizeIsbnClient === 'function' ? normalizeIsbnClient(decodedText) : decodedText;
-                isbnField.value = normalizedIsbn || decodedText;
-                if (typeof updateIsbnLiveValidation === 'function') updateIsbnLiveValidation();
+            const normalizedIsbn = normalizeIsbnClient(scannedCode);
+            isbnField.value = normalizedIsbn || scannedCode;
+            updateIsbnLiveValidation();
+            if (normalizedIsbn) {
+                setIsbnScanStatus(`ISBN gesetzt: ${normalizedIsbn}`);
+            } else {
+                setIsbnScanStatus('Kein gültiges ISBN-Format erkannt, der gescannte Wert bleibt aber im Feld.', true);
+            }
 
-                if (normalizedIsbn) {
-                    if (typeof setIsbnScanStatus === 'function') setIsbnScanStatus(`ISBN gesetzt: ${normalizedIsbn}`);
-                    if (typeof fetchBookInfo === 'function') fetchBookInfo('upload');
-                } else {
-                    if (typeof setIsbnScanStatus === 'function') setIsbnScanStatus('Kein gültiges ISBN-Format erkannt, der gescannte Wert bleibt aber im Feld.', true);
-                }
+            // Stop scanner after successful scan
+            if (isbnScannerInstance) {
+                isbnScannerInstance.stop();
+                isbnScannerInstance = null;
+            }
+            scannerBox.style.display = 'none';
+            scanButton.textContent = 'ISBN scannen';
+            isbnScannerRunning = false;
+
+            if (normalizedIsbn) {
+                // Automatically load book metadata after a valid ISBN scan.
+                fetchBookInfo('upload');
+            }
             },
-            'Scanner läuft. Bitte ISBN-Code erfassen.',
-            setIsbnScanStatus
-        );
+            onError: function(error) {
+                setIsbnScanStatus(`Fehler: ${error}`, true);
+            }
+        });
+
+        isbnScannerInstance.start();
     }
 
-    // --- WICHTIG: Event Listener Binden sobald DOM geladen ist ---
-    document.addEventListener('DOMContentLoaded', function() {
-        // 1. Basis-Code Scanner Button aktivieren
-        const scanCode4Btn = document.getElementById('scan-code4-btn');
-        if (scanCode4Btn) {
-            scanCode4Btn.addEventListener('click', startCode4Scanner);
-        }
-
-        // 2. ISBN Scanner Button aktivieren
-        const scanIsbnBtn = document.getElementById('scan-isbn-btn');
-        if (scanIsbnBtn) {
-            scanIsbnBtn.addEventListener('click', startIsbnScanner);
-        }
-
-        // 3. Dropdown-Modus Wechsel überwachen
-        const scanModeSelect = document.getElementById('scan_mode');
-        if (scanModeSelect) {
-            scanModeSelect.addEventListener('change', toggleScanMode);
-        }
-
-        // 4. ISBN Live-Validierung
-        const isbnInput = document.getElementById('isbn');
-        if (isbnInput && typeof updateIsbnLiveValidation === 'function') {
-            isbnInput.addEventListener('input', updateIsbnLiveValidation);
-        }
-    });
     // Load predefined filter values for dropdowns
     function loadPredefinedFilterValues(filterNumber) {
         fetch(`/get_predefined_filter_values/${filterNumber}`)
@@ -1777,7 +1588,6 @@
         }, 10000);
     }
 
-    // Exported function for use within parent layout fields
     function validateCodeField(input, excludeId = null) {
         const code = input.value.trim();
         
@@ -1903,6 +1713,16 @@
             });
         }
 
+        const scanCodeBtn = document.getElementById('scan-code4-btn');
+        if (scanCodeBtn) {
+            scanCodeBtn.addEventListener('click', startCode4Scanner);
+        }
+
+        const scanIsbnBtn = document.getElementById('scan-isbn-btn');
+        if (scanIsbnBtn) {
+            scanIsbnBtn.addEventListener('click', startIsbnScanner);
+        }
+
         const isbnField = document.getElementById('isbn');
         if (isbnField) {
             isbnField.addEventListener('input', updateIsbnLiveValidation);
@@ -1942,11 +1762,188 @@
             if (typeof duplicateData.images === 'string') {
                 try {
                     duplicateData.images = JSON.parse(duplicateData.images);
+                    console.log("Parsed images from string:", duplicateData.images);
                 } catch (e) {
-                    console.error("Error parsing duplicate images array:", e);
+                    console.warn("Failed to parse images string, using as single item:", duplicateData.images);
+                    duplicateData.images = [duplicateData.images];
                 }
             }
-            console.log("Parsed duplicate images successfully.");
+            console.log(`Final duplicateData.images (${Array.isArray(duplicateData.images) ? 'array' : typeof duplicateData.images}):`, duplicateData.images);
+        }
+    }
+    
+    // Then check for sessionStorage data (takes priority)
+    const sessionData = sessionStorage.getItem('duplicateItemData');
+    if (sessionData) {
+        try {
+            duplicateData = JSON.parse(sessionData);
+            sessionStorage.removeItem('duplicateItemData'); // Clean up
+            console.log("Session storage duplicate data:", duplicateData);
+        } catch (e) {
+            console.error('Error parsing session duplicate data:', e);
+        }
+    }
+    
+    // Function to prefill form with duplicate data
+    function prefillFormWithDuplicateData() {
+        if (!duplicateData) return;
+        
+        // Fill basic fields
+        const nameField = document.getElementById('name');
+        if (nameField && duplicateData.name) nameField.value = duplicateData.name;
+        
+        const descField = document.getElementById('beschreibung');
+        if (descField && duplicateData.description) descField.value = duplicateData.description;
+        
+        const yearField = document.getElementById('anschaffungsjahr');
+        if (yearField && duplicateData.year) yearField.value = duplicateData.year;
+        
+        const costField = document.getElementById('anschaffungskosten');
+        if (costField && duplicateData.cost) costField.value = duplicateData.cost;
+        
+        // Fill location dropdown
+        const locationField = document.getElementById('ort');
+        if (locationField && duplicateData.location) {
+            // Wait for locations to load, then set value
+            setTimeout(() => {
+                locationField.value = duplicateData.location;
+            }, 100);
+        }
+        
+        // Fill filter arrays - handle up to 4 values per filter type
+        setTimeout(() => {
+            // Filter 1 (Unterrichtsfach)
+            if (duplicateData.filter1 && Array.isArray(duplicateData.filter1)) {
+                for (let j = 1; j <= Math.min(4, duplicateData.filter1.length); j++) {
+                    const filterField = document.getElementById(`filter1-${j}`);
+                    if (filterField && duplicateData.filter1[j-1]) {
+                        filterField.value = duplicateData.filter1[j-1];
+                    }
+                }
+            }
+            
+            // Filter 2 (Jahrgangsstufe)
+            if (duplicateData.filter2 && Array.isArray(duplicateData.filter2)) {
+                for (let j = 1; j <= Math.min(4, duplicateData.filter2.length); j++) {
+                    const filterField = document.getElementById(`filter2-${j}`);
+                    if (filterField && duplicateData.filter2[j-1]) {
+                        filterField.value = duplicateData.filter2[j-1];
+                    }
+                }
+            }
+            
+            // Filter 3 (Thema) - text inputs
+            if (duplicateData.filter3 && Array.isArray(duplicateData.filter3)) {
+                for (let j = 1; j <= Math.min(4, duplicateData.filter3.length); j++) {
+                    const filterField = document.getElementById(`filter3-${j}`);
+                    if (filterField && duplicateData.filter3[j-1]) {
+                        filterField.value = duplicateData.filter3[j-1];
+                    }
+                }
+            }
+        }, 200); // Wait for filter options to load
+        
+        // Handle images - add hidden inputs for duplicate images
+        if (duplicateData.images && duplicateData.images.length > 0) {
+            console.log("Duplicate images data:", duplicateData.images);
+            const form = document.querySelector('form[action*="upload_item"]');
+            if (form) {
+                // Add hidden field to indicate duplication
+                const isDuplicatingField = document.createElement('input');
+                isDuplicatingField.type = 'hidden';
+                isDuplicatingField.name = 'is_duplicating';
+                isDuplicatingField.value = 'true';
+                form.appendChild(isDuplicatingField);
+                
+                // Add each image as a duplicate image
+                const images = duplicateData.images || [];
+                console.log(`Adding ${images.length} images as hidden fields`);
+                
+                if (Array.isArray(images)) {
+                    images.forEach((imageName, index) => {
+                        if (imageName) {
+                            console.log(`Adding duplicate image ${index}: ${imageName}`);
+                            const imageField = document.createElement('input');
+                            imageField.type = 'hidden';
+                            imageField.name = 'duplicate_images';
+                            imageField.value = imageName;
+                            form.appendChild(imageField);
+                        }
+                    });
+                } else {
+                    console.warn("Images is not an array:", images);
+                    // Try to handle as single item if it's a string
+                    if (typeof images === 'string' && images) {
+                        console.log("Adding single image:", images);
+                        const imageField = document.createElement('input');
+                        imageField.type = 'hidden';
+                        imageField.name = 'duplicate_images';
+                        imageField.value = images;
+                        form.appendChild(imageField);
+                    }
+                }
+                
+                // Show image preview
+                showDuplicateImagePreview(duplicateData.images);
+            }
+        }
+    }
+    
+    // Function to show preview of duplicate images
+    function showDuplicateImagePreview(images) {
+        const previewContainer = document.getElementById('image-preview-container');
+        if (!previewContainer) return;
+        
+        console.log("showDuplicateImagePreview called with:", images);
+        
+        // Make sure images is treated as an array
+        if (!Array.isArray(images)) {
+            if (typeof images === 'string') {
+                // Try to parse if it's a JSON string
+                try {
+                    images = JSON.parse(images);
+                } catch (e) {
+                    // If parsing fails, wrap the single string in an array
+                    images = [images];
+                }
+            } else {
+                console.error("Invalid images data:", images);
+                return;
+            }
+        }
+        
+        previewContainer.innerHTML = '';
+        console.log(`Processing ${images.length} images for preview`);
+        
+        images.forEach((imageName, index) => {
+            console.log(`Processing image ${index}:`, imageName);
+            const preview = document.createElement('div');
+            preview.className = 'image-preview-item';
+            preview.innerHTML = `
+                <img src="/uploads/${imageName}" alt="Duplicate Image ${index + 1}" class="duplicate-image-preview">
+                <div class="image-controls">
+                    <span>Von Original übernommen</span>
+                    <button type="button" onclick="removeDuplicateImage('${imageName}', this)" class="remove-duplicate-image-button">Entfernen</button>
+                </div>
+            `;
+            previewContainer.appendChild(preview);
+        });
+    }
+    
+    // Function to remove a duplicate image
+    function removeDuplicateImage(imageName, button) {
+        // Remove the hidden input
+        const hiddenInputs = document.querySelectorAll('input[name="duplicate_images"]');
+        hiddenInputs.forEach(input => {
+            if (input.value === imageName) {
+                input.remove();
+            }
+        });
+        
+        // Remove the preview
+        const previewItem = button.closest('.image-preview-item');
+        if (previewItem) {
+            previewItem.remove();
         }
     }
 </script>

manage-tenant.sh

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

tools/debug_get_appointment.py

@@ -0,0 +1,54 @@
+#!/usr/bin/env python3
+"""
+Small debug script to check tenant-aware lookup for an appointment id.
+Usage: ./tools/debug_get_appointment.py <appointment_id> [tenant]
+"""
+import sys
+from bson.objectid import ObjectId
+from Web.modules.database.settings import MongoClient, MONGODB_HOST, MONGODB_PORT, MONGODB_DB
+import Web.modules.database.termine as termine
+
+
+def main():
+    if len(sys.argv) < 2:
+        print("Usage: debug_get_appointment.py <appointment_id> [tenant]")
+        sys.exit(2)
+    aid = sys.argv[1]
+    tenant = sys.argv[2] if len(sys.argv) > 2 else None
+
+    if tenant:
+        print(f"Looking up appointment {aid} for tenant {tenant}")
+    else:
+        print(f"Looking up appointment {aid} for default tenant")
+
+    try:
+        # Use the module helper directly
+        item = termine.get_item(aid)
+        if item:
+            print('Found with termini.get_item:')
+            print(item)
+        else:
+            print('termin.get_item returned None')
+
+        # Try explicit MongoClient + tenant DB resolution
+        client = MongoClient(MONGODB_HOST, MONGODB_PORT)
+        try:
+            from Web.tenant import TenantContext, get_tenant_db
+            if tenant:
+                ctx = TenantContext()
+                ctx.tenant_id = tenant
+                db = ctx.get_database(client)
+            else:
+                db = get_tenant_db(client) if 'get_tenant_db' in dir() else client[MONGODB_DB]
+
+            doc = db['appointments'].find_one({'_id': ObjectId(aid)})
+            print('Direct DB find_one returned:')
+            print(doc)
+        finally:
+            client.close()
+    except Exception as e:
+        print('Error during debug lookup:', e)
+
+
+if __name__ == '__main__':
+    main()