slight css fix for the accesability of the script

Web/app.py

@@ -42,6 +42,7 @@ import Web.modules.database.termine as termin
 import Web.modules.log.audit_log as al
 import push_notifications as pn
 import Web.modules.inventarsystem.pdf_export as pdf_export 
+import Web.modules.inventarsystem.excel_export as excel_export
 import datetime
 from apscheduler.schedulers.background import BackgroundScheduler
 from bson.objectid import ObjectId
@@ -288,7 +289,7 @@ SCHEDULER_INTERVAL = cfg.SCHEDULER_INTERVAL_MIN
 SSL_CERT = cfg.SSL_CERT
 SSL_KEY = cfg.SSL_KEY
 
-LIBRARY_ITEM_TYPES = ['book', 'cd', 'dvd', 'media', 'schulbuch']
+LIBRARY_ITEM_TYPES = ('book', 'cd', 'dvd', 'other', 'schoolbook', 'Buch', 'Schulbuch', 'schulbuch')
 INVOICE_CURRENCY = 'EUR'
 
 NOTIFICATION_STATUS_CACHE_TTL = max(3, int(os.getenv('INVENTAR_NOTIFICATION_STATUS_CACHE_TTL', '8')))
@@ -2476,6 +2477,7 @@ def _upload_excel_items(scope='inventory'):
                 parent_item_id=parent_item_id,
                 isbn=row['isbn'],
                 item_type=row['item_type'],
+                is_library=False
             )
             if not item_id:
                 import_errors.append((row['row_number'], 'Fehler beim Anlegen des Artikels'))
@@ -2979,33 +2981,50 @@ def library_export_excel(scope='all'):
     username = session['username']
     is_admin_user = us.check_admin(username)
     
-    import Web.modules.inventarsystem.excel_export as excel_export
-    client = MongoClient(MONGODB_HOST, MONGODB_PORT)
-    db = client[cfg.MONGODB_DB]
-    items_collection = db['items']
-    
-    query = {'ItemType': {'$in': LIBRARY_ITEM_TYPES}, 'Deleted': {'$ne': True}}
+    # Base query
+    query = {
+        'ItemType': {'$in': LIBRARY_ITEM_TYPES}, 
+        'Deleted': {'$ne': True}
+    }
     
+    # Scope modifications
     if scope == 'borrowed_by_me':
         query['User'] = username
         query['Verfuegbar'] = False
         filename = f"Bibliothek_Ausgeliehen_{username}.xlsx"
+        
     elif scope == 'all_borrowed':
         if not is_admin_user:
+            # Consider adding a flash message here before redirecting
             return redirect('/library')
         query['Verfuegbar'] = False
         filename = "Bibliothek_Alle_Ausleihen.xlsx"
+        
     elif scope == 'schulbuecher':
+        # Overwrites the base $in query, which is fine
         query['ItemType'] = 'schulbuch'
         filename = "Schulbuecher_Bestand.xlsx"
+        
+    elif scope == 'all_books':
+        # FIX: Keep the library item types restriction, but exclude 'general'
+        query['ItemType'] = {'$in': [t for t in LIBRARY_ITEM_TYPES if t != 'general']}
+        filename = "Bibliothek_Buecher.xlsx"
+        
     else:
-        # 'all'
+        # 'all' scope
         filename = "Bibliothek_Gesamtbestand.xlsx"
         
+    # Database interaction
+    client = MongoClient(MONGODB_HOST, MONGODB_PORT)
+    db = client[cfg.MONGODB_DB]
+    items_collection = db['items']
+    
     items = list(items_collection.find(query))
     client.close()
     
+    # Generate and send file
     excel_file = excel_export.generate_library_excel(items)
+    
     return send_file(
         excel_file,
         mimetype='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
@@ -3193,7 +3212,7 @@ def api_library_items():
         ausleihungen_db = db['ausleihungen']
 
         query = {
-            'ItemType': {'$in': ['book', 'cd', 'dvd', 'media']},
+            'ItemType': {'$in': ['book', 'cd', 'dvd', 'other', 'schoolbook', 'schulbuch', 'Buch', 'Schulbuch']},
             'IsGroupedSubItem': {'$ne': True},
             'Deleted': {'$ne': True}
         }
@@ -5115,6 +5134,8 @@ def upload_item():
     if 'username' not in session:
         return jsonify({'success': False, 'message': 'Nicht angemeldet'}), 401
         
+    item_is_library = False
+
     # Check if user may insert items
     username = session['username']
     permissions = _get_current_user_permissions() or us.build_default_permission_payload('standard_user')
@@ -5159,6 +5180,9 @@ def upload_item():
         item_type_input = sanitize_form_value(request.form.get('item_type_input', ''))
         library_category = sanitize_form_value(request.form.get('library_category', ''))
         
+        if library_caregory != '':
+            item_is_library = True
+
         try:
             item_count = int(item_count_raw) if item_count_raw else 1
         except (TypeError, ValueError):
@@ -5227,7 +5251,7 @@ def upload_item():
             return redirect(url_for(success_redirect_endpoint))
 
     item_isbn = ''
-    item_type = 'general'
+    item_type = 'other'
     if cfg.MODULES.is_enabled('library') and isbn_raw:
         normalized_isbn = normalize_and_validate_isbn(isbn_raw)
         if normalized_isbn:
@@ -5235,8 +5259,7 @@ def upload_item():
             item_type = 'book'
         else:
             item_isbn = isbn_raw
-            if upload_mode == 'library':
-                item_type = 'book'
+
         if item_type_input != "":
             item_type = item_type_input
 
@@ -5253,7 +5276,6 @@ def upload_item():
                 return jsonify({'success': False, 'message': error_msg}), 400
             flash(error_msg, 'error')
             return redirect(url_for('library_admin'))
-        item_type = 'book'
 
     # Only check for images if not duplicating and no duplicate images provided and no book cover
     # For library mode, skip this check as images come only from ISBN fetch
@@ -6047,7 +6069,8 @@ def upload_item():
             parent_item_id=parent_item_id,
             isbn=item_isbn,
             item_type=item_type,
-            library_category=library_category
+            library_category=library_category,
+            is_library=item_is_library
         )
         if not item_id:
             break

Web/modules/database/items.py

@@ -24,7 +24,7 @@ import Web.modules.database.settings as cfg
 from Web.modules.database.settings import MongoClient
 
 
-LIBRARY_ITEM_TYPES = ('book', 'cd', 'dvd', 'media', 'schulbuch')
+LIBRARY_ITEM_TYPES = ('book', 'cd', 'dvd', 'other', 'schoolbook', 'Buch', 'Schulbuch', 'schulbuch')
 
 
 def _non_library_query(extra_query=None):
@@ -49,7 +49,7 @@ def add_item(name, ort, beschreibung, images=None, filter=None, filter2=None, fi
              ansch_jahr=None, ansch_kost=None, code_4=None, reservierbar=True,
              series_group_id=None, series_count=1, series_position=1,
              is_grouped_sub_item=False, parent_item_id=None,
-             isbn=None, item_type='general', library_category=None):
+             isbn=None, item_type='general', library_category=None, is_library=False):
     """
     Add a new item to the inventory.
     
@@ -102,6 +102,7 @@ def add_item(name, ort, beschreibung, images=None, filter=None, filter2=None, fi
             'ISBN': isbn,
             'library_category': library_category,
             'ItemType': item_type,
+            'is_library': is_library, 
             'SeriesGroupId': series_group_id,
             'SeriesCount': series_count,
             'SeriesPosition': series_position,

Web/modules/inventarsystem/excel_export.py

@@ -37,20 +37,23 @@ def generate_library_excel(items):
             item.get("ReturnDate", ""),
             item.get("Anschaffungskosten", "")
         ]
-        ws.append(row)
         
-    for col in ws.columns:
-        max_length = 0
-        column = col[0].column_letter 
-        for cell in col:
-            try:
-                if len(str(cell.value)) > max_length:
-                    max_length = len(str(cell.value))
-            except:
-                pass
-        ws.column_dimensions[column].width = min(max_length + 2, 50)
+        # FIX: Clean the row data INSIDE the loop for every single item
+        clean_row = []
+        for value in row:
+            if isinstance(value, list):
+                # Converts ['A', 'B'] to "A, B" and an empty list [] to an empty string ""
+                clean_row.append(", ".join(map(str, value)) if value else "")
+            elif isinstance(value, dict):
+                # Just in case there is an embedded MongoDB sub-document
+                clean_row.append(str(value))
+            else:
+                clean_row.append(value)
+        
+        # Append the safe, flattened row to the worksheet
+        ws.append(clean_row)
 
     excel_buffer = io.BytesIO()
     wb.save(excel_buffer)
     excel_buffer.seek(0)
-    return excel_buffer
+    return excel_buffer

Web/templates/library_table.html

@@ -4,6 +4,58 @@
 
 {% block content %}
 <style>
+    /* 1. The Dark Background Overlay */
+    .modal {
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100vw;
+        height: 100vh;
+        background-color: rgba(0, 0, 0, 0.6);
+        /* Ensure display is controlled by JS, but set up for centering */
+        align-items: center; 
+        justify-content: center;
+        z-index: 1000;
+    }
+    
+    /* 2. The White Modal Box */
+    .modal-content {
+        background-color: #fff;
+        padding: 20px;
+        width: 80%;
+        max-width: 600px;
+        border-radius: 8px;
+        box-shadow: 0 4px 15px rgba(0, 0, 0, 0.2);
+        
+        /* These three lines are the magic for a fixed header + scrolling body */
+        display: flex;
+        flex-direction: column;
+        max-height: 85vh; /* Prevents the box from being taller than the screen */
+    }
+    
+    /* 3. The Close Button */
+    .close {
+        align-self: flex-end; /* Pushes the 'x' to the right side */
+        color: #aaa;
+        font-size: 28px;
+        font-weight: bold;
+        cursor: pointer;
+        line-height: 1;
+        margin-bottom: 10px;
+    }
+    
+    .close:hover,
+    .close:focus {
+        color: #000;
+        text-decoration: none;
+    }
+    
+    /* 4. The Scrollable Content Area */
+    #detailContent {
+        overflow-y: auto; /* Adds the scrollbar ONLY if the text is too long */
+        padding-right: 10px; /* Optional: adds a little breathing room for the scrollbar */
+    }
+
     /* Library table-only view styles */
     .library-table-container {
         max-width: 1400px;
@@ -475,7 +527,7 @@
                 <select id="filterType">
                     <option value="">-- Alle Typen --</option>
                     <option value="book">Buch</option>
-                    <option value="schulbuch">Schulbuch</option>
+                    <option value="schoolbook">Schulbuch</option>
                     <option value="cd">CD</option>
                     <option value="dvd">DVD</option>
                     <option value="other">Sonstige</option>
@@ -503,6 +555,10 @@
                 <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path><polyline points="14 2 14 8 20 8"></polyline><line x1="8" y1="13" x2="16" y2="13"></line><line x1="8" y1="17" x2="16" y2="17"></line><polyline points="10 9 9 9 8 9"></polyline></svg>
                 Alle ausgeliehen Excel
             </button>
+            <button class="button" style="background: #10b981; color: white; display: flex; align-items: center; gap: 0.5rem;" onclick="window.location.href='/library/export/all_books'">
+                <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path><polyline points="14 2 14 8 20 8"></polyline><line x1="8" y1="13" x2="16" y2="13"></line><line x1="8" y1="17" x2="16" y2="17"></line><polyline points="10 9 9 9 8 9"></polyline></svg>
+                Alle Bücher Excel
+            </button>
         </div>
     </div>
 
@@ -544,7 +600,6 @@
     </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>
     // =========================================================================
@@ -1033,7 +1088,7 @@
     }
 
     function getItemTypeLabel(type) {
-        const labels = { 'book': 'Buch', 'cd': 'CD', 'dvd': 'DVD', 'other': 'Sonstige' };
+        const labels = { 'book': 'Buch', 'cd': 'CD', 'dvd': 'DVD', 'other': 'Sonstige', 'schoolbook': 'Schulbuch' };
         return labels[type] || type;
     }
 
@@ -1192,56 +1247,51 @@
         }
     });
 
-    function openEditLibraryItem(itemId) {
+    window.openEditLibraryItem = function(itemId) {
         const item = libraryItems.find(i => i._id === itemId);
-        
-        if (!item) {
-            alert('Fehler: Das Medium konnte nicht gefunden werden.');
-            return;
-        }
+        if (!item) return;
 
         // 1. Felder befüllen
-        document.getElementById('editLibraryItemId').value = item._id || '';
-        document.getElementById('editLibraryName').value = item.Name || '';
-        document.getElementById('editLibraryType').value = item.ItemType || 'book';
+        document.getElementById('editLibraryItemId').value = item._id;
+        document.getElementById('editLibraryName').value = item.Name;
+        document.getElementById('editLibraryType').value = item.ItemType;
         document.getElementById('editLibraryIsbn').value = item.ISBN || '';
-        document.getElementById('editLibraryCode4').value = item.Code_4 || item.Code4 || '';
-        document.getElementById('editLibraryLocation').value = item.Ort || ''; 
-        document.getElementById('editLibraryDescription').value = item.Beschreibung || '';
+        document.getElementById('editLibraryCode4').value = item.Code_4 || '';
+        document.getElementById('editLibraryLocation').value = item.Ort;
+        document.getElementById('editLibraryDescription').value = item.Beschreibung;
 
-        // 2. Gruppen-Logik (Codes anzeigen)
+        // 2. Gruppen-Logik
         const warningDiv = document.getElementById('editLibraryGroupWarning');
         const codesContainer = document.getElementById('editLibraryAllCodes');
 
         if (item.SeriesGroupId) {
-            // DEBUG: Schau in der Konsole, wie viele Items gefunden werden
-            console.log("Suche Items mit SeriesGroupId:", item.SeriesGroupId);
-                
-            const groupMembers = libraryItems.filter(i => {
-                // Debug: Prüfen, ob die IDs matchen
-                const match = i.SeriesGroupId === item.SeriesGroupId;
-                if(match) console.log("Gefundenes Item:", i.Code_4);
-                return match;
-            });
-        
-            console.log("Anzahl gefundener Gruppenmitglieder:", groupMembers.length);
-        
-            // Sortierung und Extraktion
-            const codeList = groupMembers
-                .sort((a, b) => (a.SeriesPosition || 0) - (b.SeriesPosition || 0))
-                .map(member => member.Code_4 || "---")
-                .join(', ');
-        
-            document.getElementById('editLibraryGroupCount').textContent = groupMembers.length;
-            document.getElementById('editLibraryAllCodes').textContent = codeList;
-            
+            // Filtern aus dem aktuell geladenen Array
+            let groupMembers = libraryItems.filter(i => i.SeriesGroupId === item.SeriesGroupId);
+
+            // SCHLÜSSEL: Wenn die Anzahl der gefundenen Elemente nicht mit SeriesCount übereinstimmt,
+            // haben wir die Gruppe noch nicht vollständig geladen.
+            if (groupMembers.length < (item.SeriesCount || 0)) {
+                console.warn("Gruppe noch nicht vollständig geladen. Anzeige ggf. unvollständig.");
+                // Optional: Zeige einen Ladehinweis im Modal
+                codesContainer.textContent = "Lade restliche Gruppenmitglieder...";
+            } else {
+                // Daten sind vollständig -> Anzeigen
+                const codeList = groupMembers
+                    .sort((a, b) => (a.SeriesPosition || 0) - (b.SeriesPosition || 0))
+                    .map(m => m.Code_4 || "---")
+                    .join(', ');
+
+                codesContainer.textContent = codeList;
+            }
+
+            document.getElementById('editLibraryGroupCount').textContent = groupMembers.length + " / " + (item.SeriesCount || "?");
             warningDiv.style.display = 'block';
         } else {
             warningDiv.style.display = 'none';
         }
 
-        document.getElementById('editLibraryModal').style.display = 'flex'; 
-    }
+        document.getElementById('editLibraryModal').style.display = 'flex';
+    };
 
     function closeEditLibraryModal() {
         document.getElementById('editLibraryModal').style.display = 'none';
@@ -1252,7 +1302,6 @@
      */
     document.addEventListener('DOMContentLoaded', function() {
         const editForm = document.getElementById('editLibraryForm');
-
         if (editForm) {
             editForm.addEventListener('submit', async function(e) {
                 e.preventDefault();
@@ -1262,17 +1311,15 @@
 
                 if (!currentItem) return;
 
-                // 1. Payload für die /update_group Route zusammenstellen
-                // Wir sammeln alle Gruppenmitglieder, um die individuellen Codes zu senden
+                // 1. Alle Mitglieder der Gruppe finden, um die Code-Liste aufzubauen
                 const groupMembers = libraryItems.filter(i => i.SeriesGroupId === currentItem.SeriesGroupId);
-                const individualItems = groupMembers.map(member => {
-                    return {
-                        id: member._id,
-                        // Wenn es das aktive Item ist, nimm den neuen Wert aus dem Input
-                        code_4: (member._id === itemId) ? document.getElementById('editLibraryCode4').value : member.Code_4
-                    };
-                });
+                const individualUpdates = groupMembers.map(member => ({
+                    id: member._id,
+                    // Wenn dies das bearbeitete Item ist, nimm den neuen Code, sonst den alten
+                    code_4: (member._id === itemId) ? document.getElementById('editLibraryCode4').value : member.Code_4
+                }));
 
+                // 2. Payload für das Backend bauen
                 const payload = {
                     series_group_id: currentItem.SeriesGroupId,
                     name: document.getElementById('editLibraryName').value,
@@ -1280,10 +1327,10 @@
                     beschreibung: document.getElementById('editLibraryDescription').value,
                     isbn: document.getElementById('editLibraryIsbn').value,
                     item_type: document.getElementById('editLibraryType').value,
-                    items: individualItems
+                    items: individualUpdates
                 };
 
-                // 2. Request an Backend
+                // 3. Request an die Gruppen-Update Route
                 try {
                     const response = await fetch('/update_group', {
                         method: 'POST',
@@ -1292,34 +1339,20 @@
                     });
 
                     const result = await response.json();
-
                     if (result.success) {
-                        // 3. UI-Synchronisierung (lokal im Browser)
-                        libraryItems.forEach(item => {
-                            if (item.SeriesGroupId === currentItem.SeriesGroupId) {
-                                item.Name = payload.name;
-                                item.Ort = payload.ort;
-                                item.Beschreibung = payload.beschreibung;
-                                item.ISBN = payload.isbn;
-                                item.ItemType = payload.item_type;
-
-                                // Nur den Code des aktiven Items lokal updaten
-                                if (item._id === itemId) item.Code_4 = document.getElementById('editLibraryCode4').value;
-                            }
-                        });
-
+                        alert('Gruppe erfolgreich synchronisiert!');
                         closeEditLibraryModal();
-                        // Falls du eine Funktion zum Neuzeichnen der Tabelle hast, rufe sie hier auf:
-                        // renderTable(); 
-                        alert("Erfolgreich synchronisiert.");
+                        await loadLibraryItems(); // Daten neu laden
+                        // renderTable(); // Ggf. Tabelle neu rendern
                     } else {
                         alert('Fehler: ' + result.message);
                     }
                 } catch (error) {
-                    console.error('Fetch error:', error);
-                    alert('Netzwerkfehler beim Speichern.');
+                    console.error('Update failed:', error);
+                    alert('Netzwerkfehler.');
                 }
             });
+
         }
     });
 </script>
@@ -1358,10 +1391,10 @@
                     <label for="editLibraryType">Medientyp</label>
                     <select id="editLibraryType" style="width: 100%;">
                         <option value="book">Buch</option>
-                        <option value="schulbuch">Schulbuch</option>
+                        <option value="schoolbook">Schulbuch</option>
                         <option value="cd">CD</option>
                         <option value="dvd">DVD</option>
-                        <option value="media">Sonstige Medien</option>
+                        <option value="other">Sonstige Medien</option>
                     </select>
                 </div>
                 <div>

update.sh

@@ -621,6 +621,9 @@ EOF
     cleanup_old_dist_artifacts
     cleanup_docker_dangling_images
     log_message "Update completed successfully to release $latest_tag"
+
+    sudo ./opt/Inventarsystem/restart.sh
+    echo "Restart of the Server Completet"
 }
 
 main "$@"