Invario/Inventarsystem
3
1
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases 392 Wiki Activity

changes to the Library Item Type to reflekt the correct types

Browse Source
This commit is contained in:
AIIrondev
2026-06-30 10:04:59 +02:00
parent 0efc01a835
commit d84466a3cc
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Web/app.py
+2 -2
View File
@@ -288,7 +288,7 @@ SCHEDULER_INTERVAL = cfg.SCHEDULER_INTERVAL_MIN
SSL_CERT = cfg.SSL_CERT SSL_CERT = cfg.SSL_CERT
SSL_KEY = cfg.SSL_KEY SSL_KEY = cfg.SSL_KEY
LIBRARY_ITEM_TYPES = ['book', 'cd', 'dvd', 'media', 'schulbuch'] LIBRARY_ITEM_TYPES = ['book', 'cd', 'dvd', 'other', 'schoolbook']
INVOICE_CURRENCY = 'EUR' INVOICE_CURRENCY = 'EUR'
NOTIFICATION_STATUS_CACHE_TTL = max(3, int(os.getenv('INVENTAR_NOTIFICATION_STATUS_CACHE_TTL', '8'))) NOTIFICATION_STATUS_CACHE_TTL = max(3, int(os.getenv('INVENTAR_NOTIFICATION_STATUS_CACHE_TTL', '8')))
@@ -3193,7 +3193,7 @@ def api_library_items():
ausleihungen_db = db['ausleihungen'] ausleihungen_db = db['ausleihungen']
query = { query = {
'ItemType': {'$in': ['book', 'cd', 'dvd', 'media']}, 'ItemType': {'$in': ['book', 'cd', 'dvd', 'other', 'schoolbook']},
'IsGroupedSubItem': {'$ne': True}, 'IsGroupedSubItem': {'$ne': True},
'Deleted': {'$ne': True} 'Deleted': {'$ne': True}
} }
Web/modules/database/items.py
+1 -1
View File
@@ -24,7 +24,7 @@ import Web.modules.database.settings as cfg
from Web.modules.database.settings import MongoClient from Web.modules.database.settings import MongoClient
LIBRARY_ITEM_TYPES = ('book', 'cd', 'dvd', 'media', 'schulbuch') LIBRARY_ITEM_TYPES = ('book', 'cd', 'dvd', 'other', 'schoolbook')
def _non_library_query(extra_query=None): def _non_library_query(extra_query=None):
Web/templates/library_table.html
+4 -4
View File
@@ -475,7 +475,7 @@
<select id="filterType"> <select id="filterType">
<option value="">-- Alle Typen --</option> <option value="">-- Alle Typen --</option>
<option value="book">Buch</option> <option value="book">Buch</option>
<option value="schulbuch">Schulbuch</option> <option value="schoolbook">Schulbuch</option>
<option value="cd">CD</option> <option value="cd">CD</option>
<option value="dvd">DVD</option> <option value="dvd">DVD</option>
<option value="other">Sonstige</option> <option value="other">Sonstige</option>
@@ -1033,7 +1033,7 @@
} }
function getItemTypeLabel(type) { 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; return labels[type] || type;
} }
@@ -1336,10 +1336,10 @@
<label for="editLibraryType">Medientyp</label> <label for="editLibraryType">Medientyp</label>
<select id="editLibraryType" style="width: 100%;"> <select id="editLibraryType" style="width: 100%;">
<option value="book">Buch</option> <option value="book">Buch</option>
<option value="schulbuch">Schulbuch</option> <option value="schoolbook">Schulbuch</option>
<option value="cd">CD</option> <option value="cd">CD</option>
<option value="dvd">DVD</option> <option value="dvd">DVD</option>
<option value="media">Sonstige Medien</option> <option value="other">Sonstige Medien</option>
</select> </select>
</div> </div>
<div> <div>