Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7473334714 | |||
| d746b61a17 | |||
| 440cafb88f | |||
| 9fb56e905c | |||
| 21ad639081 | |||
| 61d726f8f4 | |||
| 2d7cec075c | |||
| fc0fdf8472 | |||
| 237c79be58 | |||
| 821636908f |
+12
-206
@@ -453,7 +453,7 @@ PERMISSION_ACTION_ENDPOINTS = {
|
|||||||
'admin_reset_user_password': 'can_manage_users',
|
'admin_reset_user_password': 'can_manage_users',
|
||||||
'admin_update_user_permissions': 'can_manage_users',
|
'admin_update_user_permissions': 'can_manage_users',
|
||||||
'admin_anonymize_names': 'can_manage_users',
|
'admin_anonymize_names': 'can_manage_users',
|
||||||
'home_admin': 'can_manage_settings',
|
'home_admin': 'can_borrow',
|
||||||
'upload_admin': 'can_insert',
|
'upload_admin': 'can_insert',
|
||||||
'library_admin': 'can_insert',
|
'library_admin': 'can_insert',
|
||||||
'admin_borrowings': 'can_manage_settings',
|
'admin_borrowings': 'can_manage_settings',
|
||||||
@@ -811,6 +811,8 @@ def _page_access_allowed(permissions, endpoint):
|
|||||||
if not permissions or not endpoint:
|
if not permissions or not endpoint:
|
||||||
return True
|
return True
|
||||||
page_permissions = permissions.get('pages', {})
|
page_permissions = permissions.get('pages', {})
|
||||||
|
if endpoint == "home_admin":
|
||||||
|
return True
|
||||||
return bool(page_permissions.get(endpoint, True))
|
return bool(page_permissions.get(endpoint, True))
|
||||||
|
|
||||||
|
|
||||||
@@ -823,14 +825,10 @@ def _action_access_allowed(permissions, action_key):
|
|||||||
|
|
||||||
def _permission_denied_fallback_endpoint(permissions, current_endpoint=None):
|
def _permission_denied_fallback_endpoint(permissions, current_endpoint=None):
|
||||||
username = session.get('username')
|
username = session.get('username')
|
||||||
is_admin_user = bool(username and us.check_admin(username))
|
|
||||||
admin_home_allowed = _page_access_allowed(permissions, 'home_admin') and _action_access_allowed(permissions, 'can_manage_settings')
|
|
||||||
|
|
||||||
for candidate in ('my_borrowed_items', 'tutorial_page', 'notifications_view', 'impressum', 'home_admin'):
|
for candidate in ('home_admin', 'my_borrowed_items', 'tutorial_page', 'notifications_view', 'impressum'):
|
||||||
if current_endpoint and candidate == current_endpoint:
|
if current_endpoint and candidate == current_endpoint:
|
||||||
continue
|
continue
|
||||||
if candidate == 'home_admin' and is_admin_user and not admin_home_allowed:
|
|
||||||
continue
|
|
||||||
if _page_access_allowed(permissions, candidate):
|
if _page_access_allowed(permissions, candidate):
|
||||||
return candidate
|
return candidate
|
||||||
return 'logout'
|
return 'logout'
|
||||||
@@ -2661,6 +2659,12 @@ def upload_student_cards_excel():
|
|||||||
"""Bulk import student cards from Excel."""
|
"""Bulk import student cards from Excel."""
|
||||||
return _upload_student_cards_excel()
|
return _upload_student_cards_excel()
|
||||||
|
|
||||||
|
@app.route('/api/is_student_card/<id>', methods=['POST'])
|
||||||
|
def is_student_card(id):
|
||||||
|
user = sanitize_form_value(id)
|
||||||
|
exists = bool(us.student_card_exists(user))
|
||||||
|
return jsonify({"is_student_card": exists})
|
||||||
|
|
||||||
"""-------------------------------------------------------------File Serving-----------------------------------------------------------------------------"""
|
"""-------------------------------------------------------------File Serving-----------------------------------------------------------------------------"""
|
||||||
|
|
||||||
|
|
||||||
@@ -3923,7 +3927,6 @@ def upload_admin():
|
|||||||
"""
|
"""
|
||||||
Upload page route for inventory items.
|
Upload page route for inventory items.
|
||||||
Accessible to users with insert permission.
|
Accessible to users with insert permission.
|
||||||
Supports duplication by passing duplicate_from parameter.
|
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
flask.Response: Rendered template or redirect
|
flask.Response: Rendered template or redirect
|
||||||
@@ -3936,54 +3939,9 @@ def upload_admin():
|
|||||||
flash('Ihnen ist es nicht gestattet auf dieser Internetanwendung, die eben besuchte Adrrese zu nutzen, versuchen sie es erneut nach dem sie sich mit einem berechtigten Nutzer angemeldet haben!', 'error')
|
flash('Ihnen ist es nicht gestattet auf dieser Internetanwendung, die eben besuchte Adrrese zu nutzen, versuchen sie es erneut nach dem sie sich mit einem berechtigten Nutzer angemeldet haben!', 'error')
|
||||||
return redirect(url_for('login'))
|
return redirect(url_for('login'))
|
||||||
|
|
||||||
# Check if this is a duplication request
|
|
||||||
duplicate_from = request.args.get('duplicate_from')
|
|
||||||
duplicate_flag = request.args.get('duplicate') # Check for sessionStorage-based duplication
|
|
||||||
duplicate_data = None
|
|
||||||
|
|
||||||
# Handle the old method (duplicate_from parameter with item ID)
|
|
||||||
if duplicate_from:
|
|
||||||
try:
|
|
||||||
original_item = it.get_item(duplicate_from)
|
|
||||||
if original_item:
|
|
||||||
duplicate_data = {
|
|
||||||
'name': original_item.get('Name', ''),
|
|
||||||
'description': original_item.get('Beschreibung', ''),
|
|
||||||
'location': original_item.get('Ort', ''),
|
|
||||||
'room': original_item.get('Raum', ''),
|
|
||||||
'category': original_item.get('Kategorie', ''),
|
|
||||||
'year': original_item.get('Anschaffungsjahr', ''),
|
|
||||||
'cost': original_item.get('Anschaffungskosten', ''),
|
|
||||||
'filter1': original_item.get('Filter1', ''),
|
|
||||||
'filter2': original_item.get('Filter2', ''),
|
|
||||||
'filter3': original_item.get('Filter3', ''),
|
|
||||||
'images': original_item.get('Images', []),
|
|
||||||
'original_id': duplicate_from
|
|
||||||
}
|
|
||||||
# Copy all filter fields (Filter1_1 through Filter3_5)
|
|
||||||
for i in range(1, 4): # Filter1, Filter2, Filter3
|
|
||||||
for j in range(1, 6): # _1 through _5
|
|
||||||
filter_key = f'Filter{i}_{j}'
|
|
||||||
if filter_key in original_item:
|
|
||||||
duplicate_data[f'filter{i}_{j}'] = original_item[filter_key]
|
|
||||||
|
|
||||||
flash('Element wird dupliziert. Bitte überprüfen Sie die Daten und passen Sie sie bei Bedarf an.', 'info')
|
|
||||||
else:
|
|
||||||
flash('Ursprungs-Element für Duplizierung nicht gefunden.', 'error')
|
|
||||||
except Exception as e:
|
|
||||||
app.logger.warning(f"Error loading item for duplication: {e}")
|
|
||||||
flash('Fehler beim Laden der Duplizierungsdaten.', 'error')
|
|
||||||
|
|
||||||
# Handle the new method (sessionStorage-based duplication)
|
|
||||||
elif duplicate_flag == 'true':
|
|
||||||
# No server-side processing needed - JavaScript will handle sessionStorage data
|
|
||||||
# Just indicate that duplication mode is active
|
|
||||||
flash('Element wird dupliziert. Die Daten werden aus dem Session-Speicher geladen.', 'info')
|
|
||||||
|
|
||||||
return render_template(
|
return render_template(
|
||||||
'upload_admin.html',
|
'upload_admin.html',
|
||||||
username=session['username'],
|
username=session['username'],
|
||||||
duplicate_data=duplicate_data,
|
|
||||||
library_module_enabled=cfg.MODULES.is_enabled('library'),
|
library_module_enabled=cfg.MODULES.is_enabled('library'),
|
||||||
student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
|
student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
|
||||||
show_library_features=False,
|
show_library_features=False,
|
||||||
@@ -4010,46 +3968,9 @@ def library_admin():
|
|||||||
flash('Bibliotheks-Modul ist deaktiviert.', 'error')
|
flash('Bibliotheks-Modul ist deaktiviert.', 'error')
|
||||||
return redirect(url_for('home_admin'))
|
return redirect(url_for('home_admin'))
|
||||||
|
|
||||||
duplicate_from = request.args.get('duplicate_from')
|
|
||||||
duplicate_flag = request.args.get('duplicate')
|
|
||||||
duplicate_data = None
|
|
||||||
|
|
||||||
if duplicate_from:
|
|
||||||
try:
|
|
||||||
original_item = it.get_item(duplicate_from)
|
|
||||||
if original_item:
|
|
||||||
duplicate_data = {
|
|
||||||
'name': original_item.get('Name', ''),
|
|
||||||
'description': original_item.get('Beschreibung', ''),
|
|
||||||
'location': original_item.get('Ort', ''),
|
|
||||||
'room': original_item.get('Raum', ''),
|
|
||||||
'category': original_item.get('Kategorie', ''),
|
|
||||||
'year': original_item.get('Anschaffungsjahr', ''),
|
|
||||||
'cost': original_item.get('Anschaffungskosten', ''),
|
|
||||||
'filter1': original_item.get('Filter1', ''),
|
|
||||||
'filter2': original_item.get('Filter2', ''),
|
|
||||||
'filter3': original_item.get('Filter3', ''),
|
|
||||||
'images': original_item.get('Images', []),
|
|
||||||
'original_id': duplicate_from
|
|
||||||
}
|
|
||||||
for i in range(1, 4):
|
|
||||||
for j in range(1, 6):
|
|
||||||
filter_key = f'Filter{i}_{j}'
|
|
||||||
if filter_key in original_item:
|
|
||||||
duplicate_data[f'filter{i}_{j}'] = original_item[filter_key]
|
|
||||||
flash('Buch wird dupliziert. Bitte überprüfen Sie die Daten und passen Sie sie bei Bedarf an.', 'info')
|
|
||||||
else:
|
|
||||||
flash('Ursprungs-Element für Duplizierung nicht gefunden.', 'error')
|
|
||||||
except Exception as e:
|
|
||||||
app.logger.warning(f"Error loading item for duplication: {e}")
|
|
||||||
flash('Fehler beim Laden der Duplizierungsdaten.', 'error')
|
|
||||||
elif duplicate_flag == 'true':
|
|
||||||
flash('Buch wird dupliziert. Die Daten werden aus dem Session-Speicher geladen.', 'info')
|
|
||||||
|
|
||||||
return render_template(
|
return render_template(
|
||||||
'upload_admin.html',
|
'upload_admin.html',
|
||||||
username=session['username'],
|
username=session['username'],
|
||||||
duplicate_data=duplicate_data,
|
|
||||||
library_module_enabled=cfg.MODULES.is_enabled('library'),
|
library_module_enabled=cfg.MODULES.is_enabled('library'),
|
||||||
student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
|
student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
|
||||||
show_library_features=True,
|
show_library_features=True,
|
||||||
@@ -4372,7 +4293,7 @@ def student_card_barcode_download():
|
|||||||
# "SCHÜLERAUSWEIS" text in header
|
# "SCHÜLERAUSWEIS" text in header
|
||||||
c.setFont("Helvetica-Bold", 9)
|
c.setFont("Helvetica-Bold", 9)
|
||||||
c.setFillColor(white)
|
c.setFillColor(white)
|
||||||
c.drawString(x_pos + 3*mm, y_pos - 6.5*mm, f"SCHÜLERAUSWEIS - {str(school_name)}")
|
c.drawString(x_pos + 3*mm, y_pos - 6.5*mm, f"BIBLIOTHEKSAUSWEIS - {str(school_name)}")
|
||||||
|
|
||||||
# Student name - large and bold
|
# Student name - large and bold
|
||||||
c.setFillColor(text_dark)
|
c.setFillColor(text_dark)
|
||||||
@@ -4548,7 +4469,7 @@ def student_card_single_barcode_download(card_id):
|
|||||||
# "SCHÜLERAUSWEIS" text in header
|
# "SCHÜLERAUSWEIS" text in header
|
||||||
c.setFont("Helvetica-Bold", 11)
|
c.setFont("Helvetica-Bold", 11)
|
||||||
c.setFillColor(white)
|
c.setFillColor(white)
|
||||||
c.drawString(x_pos + 4*mm, y_pos - 6.5*mm, f"SCHÜLERAUSWEIS - {str(school_name)}")
|
c.drawString(x_pos + 4*mm, y_pos - 6.5*mm, f"BIBLIOTHEKSAUSWEIS - {str(school_name)}")
|
||||||
|
|
||||||
# Student name - large and prominent
|
# Student name - large and prominent
|
||||||
c.setFillColor(text_dark)
|
c.setFillColor(text_dark)
|
||||||
@@ -5815,121 +5736,6 @@ def upload_item():
|
|||||||
flash(error_msg, 'error')
|
flash(error_msg, 'error')
|
||||||
return redirect(url_for(success_redirect_endpoint))
|
return redirect(url_for(success_redirect_endpoint))
|
||||||
|
|
||||||
|
|
||||||
@app.route('/duplicate_item', methods=['POST'])
|
|
||||||
def duplicate_item():
|
|
||||||
"""
|
|
||||||
Route for duplicating an existing item.
|
|
||||||
Returns JSON response with success status.
|
|
||||||
Enhanced for mobile browser compatibility.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
flask.Response: JSON response with success status and data
|
|
||||||
"""
|
|
||||||
try:
|
|
||||||
# Check authentication
|
|
||||||
if 'username' not in session:
|
|
||||||
return jsonify({'success': False, 'message': 'Nicht angemeldet'}), 401
|
|
||||||
|
|
||||||
# Check if user is admin
|
|
||||||
username = session['username']
|
|
||||||
current_permissions = us.get_effective_permissions(session['username'])
|
|
||||||
|
|
||||||
if not current_permissions['actions'].get('can_edit', False):
|
|
||||||
flash('Ihnen fehlen die nötigen Berechtigungen, um diese Aktion auszuführen.', 'error')
|
|
||||||
return redirect(url_for('home_admin'))
|
|
||||||
|
|
||||||
# Detect if request is from mobile device
|
|
||||||
is_mobile = 'Mobile' in request.headers.get('User-Agent', '')
|
|
||||||
is_ios = 'iPhone' in request.headers.get('User-Agent', '') or 'iPad' in request.headers.get('User-Agent', '')
|
|
||||||
|
|
||||||
# Log mobile duplication for debugging
|
|
||||||
if is_mobile:
|
|
||||||
app.logger.info(f"Mobile duplication from {request.headers.get('User-Agent', 'unknown')} by {encrypt_text(username)}")
|
|
||||||
|
|
||||||
# Get original item ID
|
|
||||||
original_item_id = request.form.get('original_item_id')
|
|
||||||
if not original_item_id:
|
|
||||||
return jsonify({'success': False, 'message': 'Ursprungs-Element-ID fehlt'}), 400
|
|
||||||
|
|
||||||
# Fetch original item data
|
|
||||||
original_item = it.get_item(original_item_id)
|
|
||||||
if not original_item:
|
|
||||||
return jsonify({'success': False, 'message': 'Ursprungs-Element nicht gefunden'}), 404
|
|
||||||
|
|
||||||
# Process filters as arrays (same as stored in database)
|
|
||||||
filter1_array = original_item.get('Filter', [])
|
|
||||||
filter2_array = original_item.get('Filter2', [])
|
|
||||||
filter3_array = original_item.get('Filter3', [])
|
|
||||||
|
|
||||||
# Ensure filters are arrays
|
|
||||||
if not isinstance(filter1_array, list):
|
|
||||||
filter1_array = [filter1_array] if filter1_array else []
|
|
||||||
if not isinstance(filter2_array, list):
|
|
||||||
filter2_array = [filter2_array] if filter2_array else []
|
|
||||||
if not isinstance(filter3_array, list):
|
|
||||||
filter3_array = [filter3_array] if filter3_array else []
|
|
||||||
|
|
||||||
# Verify image paths for mobile devices to avoid issues with non-existent images
|
|
||||||
images = original_item.get('Images', [])
|
|
||||||
verified_images = []
|
|
||||||
|
|
||||||
if is_mobile:
|
|
||||||
for img in images:
|
|
||||||
img_path = os.path.join(app.config['UPLOAD_FOLDER'], img)
|
|
||||||
if os.path.exists(img_path) and os.path.isfile(img_path):
|
|
||||||
verified_images.append(img)
|
|
||||||
else:
|
|
||||||
app.logger.warning(f"Image not found for duplication: {img}")
|
|
||||||
|
|
||||||
# If we lost images in verification, log it
|
|
||||||
if len(verified_images) < len(images):
|
|
||||||
app.logger.warning(f"Only {len(verified_images)} of {len(images)} images verified for mobile duplication")
|
|
||||||
else:
|
|
||||||
verified_images = images
|
|
||||||
|
|
||||||
# For iOS devices, add more diagnostics and reduce data size if needed
|
|
||||||
if is_ios:
|
|
||||||
# Check if images exist (we now use main images as thumbnails)
|
|
||||||
images_exist = []
|
|
||||||
for img in verified_images[:5]: # Only check first 5 to save time
|
|
||||||
img_path = os.path.join(app.config['UPLOAD_FOLDER'], img)
|
|
||||||
if os.path.exists(img_path):
|
|
||||||
images_exist.append(True)
|
|
||||||
else:
|
|
||||||
images_exist.append(False)
|
|
||||||
|
|
||||||
# Log detailed diagnostics
|
|
||||||
app.logger.info(f"iOS duplication details: {len(verified_images)} images, "
|
|
||||||
f"images available: {all(images_exist)}, "
|
|
||||||
f"filter sizes: {len(filter1_array)}, {len(filter2_array)}, {len(filter3_array)}")
|
|
||||||
|
|
||||||
return jsonify({
|
|
||||||
'success': True,
|
|
||||||
'message': 'Duplizierungsdaten erfolgreich vorbereitet',
|
|
||||||
'item_data': {
|
|
||||||
'name': original_item.get('Name', ''),
|
|
||||||
'description': original_item.get('Beschreibung', ''),
|
|
||||||
'location': original_item.get('Ort', ''),
|
|
||||||
'room': original_item.get('Raum', ''),
|
|
||||||
'category': original_item.get('Kategorie', ''),
|
|
||||||
'year': original_item.get('Anschaffungsjahr', ''),
|
|
||||||
'cost': original_item.get('Anschaffungskosten', ''),
|
|
||||||
'filter1': filter1_array,
|
|
||||||
'filter2': filter2_array,
|
|
||||||
'filter3': filter3_array,
|
|
||||||
'images': verified_images, # Using verified images instead of original
|
|
||||||
'isMobile': is_mobile,
|
|
||||||
'isIOS': is_ios
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error in duplicate_item: {e}")
|
|
||||||
|
|
||||||
return jsonify({'success': False, 'message': 'Serverfehler beim Duplizieren'}), 500
|
|
||||||
|
|
||||||
|
|
||||||
def _soft_delete_item_groups(db, root_item_ids, username):
|
def _soft_delete_item_groups(db, root_item_ids, username):
|
||||||
"""Soft-delete one or more item groups and their borrow records."""
|
"""Soft-delete one or more item groups and their borrow records."""
|
||||||
now = datetime.datetime.now()
|
now = datetime.datetime.now()
|
||||||
|
|||||||
@@ -211,6 +211,7 @@ PERMISSION_PRESETS = {
|
|||||||
},
|
},
|
||||||
'pages': {
|
'pages': {
|
||||||
'home': True,
|
'home': True,
|
||||||
|
'home_admin': True,
|
||||||
'tutorial_page': True,
|
'tutorial_page': True,
|
||||||
'my_borrowed_items': True,
|
'my_borrowed_items': True,
|
||||||
'notifications_view': True,
|
'notifications_view': True,
|
||||||
@@ -369,10 +370,10 @@ def update_user_permissions(username, preset_key, action_permissions=None, page_
|
|||||||
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
||||||
db = _get_tenant_db(client)
|
db = _get_tenant_db(client)
|
||||||
users = db['users']
|
users = db['users']
|
||||||
result = users.update_one({'Username': dp.encrypt_text(username)}, {'$set': update_data})
|
result = users.update_one({'Username': username}, {'$set': update_data})
|
||||||
|
|
||||||
if result.matched_count == 0:
|
if result.matched_count == 0:
|
||||||
result = users.update_one({'username': dp.encrypt_text(username)}, {'$set': update_data})
|
result = users.update_one({'username': username}, {'$set': update_data})
|
||||||
|
|
||||||
client.close()
|
client.close()
|
||||||
return result.matched_count > 0
|
return result.matched_count > 0
|
||||||
@@ -384,7 +385,7 @@ def get_favorites(username):
|
|||||||
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
||||||
db = _get_tenant_db(client)
|
db = _get_tenant_db(client)
|
||||||
users = db['users']
|
users = db['users']
|
||||||
user = users.find_one({'Username': dp.encrypt_text(username)}) or users.find_one({'username': dp.encrypt_text(username)})
|
user = users.find_one({'Username': username}) or users.find_one({'username': username})
|
||||||
client.close()
|
client.close()
|
||||||
if not user:
|
if not user:
|
||||||
return []
|
return []
|
||||||
@@ -399,7 +400,7 @@ def add_favorite(username, item_id):
|
|||||||
db = _get_tenant_db(client)
|
db = _get_tenant_db(client)
|
||||||
users = db['users']
|
users = db['users']
|
||||||
users.update_one(
|
users.update_one(
|
||||||
{'$or': [{'Username': dp.encrypt_text(username)}, {'username': dp.encrypt_text(username)}]},
|
{'$or': [{'Username': username}, {'username': username}]},
|
||||||
{'$addToSet': {'favorites': ObjectId(item_id)}}
|
{'$addToSet': {'favorites': ObjectId(item_id)}}
|
||||||
)
|
)
|
||||||
client.close()
|
client.close()
|
||||||
@@ -414,7 +415,7 @@ def remove_favorite(username, item_id):
|
|||||||
db = _get_tenant_db(client)
|
db = _get_tenant_db(client)
|
||||||
users = db['users']
|
users = db['users']
|
||||||
users.update_one(
|
users.update_one(
|
||||||
{'$or': [{'Username': dp.encrypt_text(username)}, {'username': dp.encrypt_text(username)}]},
|
{'$or': [{'Username': username}, {'username': username}]},
|
||||||
{'$pull': {'favorites': ObjectId(item_id)}}
|
{'$pull': {'favorites': ObjectId(item_id)}}
|
||||||
)
|
)
|
||||||
client.close()
|
client.close()
|
||||||
@@ -496,7 +497,7 @@ def check_nm_pwd(username, password):
|
|||||||
db = client[db_name]
|
db = client[db_name]
|
||||||
users = db['users']
|
users = db['users']
|
||||||
|
|
||||||
query = {'$or': [{'Username': dp.encrypt_text(username)}, {'username': dp.encrypt_text(username)}]}
|
query = {'$or': [{'Username': username}, {'username': username}]}
|
||||||
user_record = users.find_one(query)
|
user_record = users.find_one(query)
|
||||||
|
|
||||||
if user_record is None:
|
if user_record is None:
|
||||||
@@ -507,8 +508,6 @@ def check_nm_pwd(username, password):
|
|||||||
default_users = client[cfg.MONGODB_DB]['users']
|
default_users = client[cfg.MONGODB_DB]['users']
|
||||||
user_record_fallback = default_users.find_one(
|
user_record_fallback = default_users.find_one(
|
||||||
{'$or': [
|
{'$or': [
|
||||||
{'Username': dp.encrypt_text(username)},
|
|
||||||
{'username': dp.encrypt_text(username)},
|
|
||||||
{'Username': username},
|
{'Username': username},
|
||||||
{'username': username},
|
{'username': username},
|
||||||
]}
|
]}
|
||||||
@@ -711,9 +710,9 @@ def make_admin(username):
|
|||||||
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
||||||
db = _get_tenant_db(client)
|
db = _get_tenant_db(client)
|
||||||
users = db['users']
|
users = db['users']
|
||||||
result = users.update_one({'Username': dp.encrypt_text(username)}, {'$set': {'Admin': True}})
|
result = users.update_one({'Username': username}, {'$set': {'Admin': True}})
|
||||||
if result.matched_count == 0:
|
if result.matched_count == 0:
|
||||||
result = users.update_one({'username': dp.encrypt_text(username)}, {'$set': {'Admin': True}})
|
result = users.update_one({'username': username}, {'$set': {'Admin': True}})
|
||||||
client.close()
|
client.close()
|
||||||
return result.matched_count > 0
|
return result.matched_count > 0
|
||||||
|
|
||||||
@@ -723,9 +722,9 @@ def remove_admin(username):
|
|||||||
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
||||||
db = _get_tenant_db(client)
|
db = _get_tenant_db(client)
|
||||||
users = db['users']
|
users = db['users']
|
||||||
result = users.update_one({'Username': dp.encrypt_text(username)}, {'$set': {'Admin': False}})
|
result = users.update_one({'Username': username}, {'$set': {'Admin': False}})
|
||||||
if result.matched_count == 0:
|
if result.matched_count == 0:
|
||||||
result = users.update_one({'username': dp.encrypt_text(username)}, {'$set': {'Admin': False}})
|
result = users.update_one({'username': username}, {'$set': {'Admin': False}})
|
||||||
client.close()
|
client.close()
|
||||||
return result.matched_count > 0
|
return result.matched_count > 0
|
||||||
|
|
||||||
@@ -737,7 +736,7 @@ def get_user(username):
|
|||||||
def find_in_db(database_name):
|
def find_in_db(database_name):
|
||||||
db = client[database_name]
|
db = client[database_name]
|
||||||
users = db['users']
|
users = db['users']
|
||||||
return users.find_one({'Username': dp.encrypt_text(username)}) or users.find_one({'username': dp.encrypt_text(username)}) or users.find_one({'username': username}) or users.find_one({'Username': username})
|
return users.find_one({'Username': username}) or users.find_one({'username': username}) or users.find_one({'username': username}) or users.find_one({'Username': username})
|
||||||
|
|
||||||
tenant_db, tenant_id = _resolve_request_tenant_db()
|
tenant_db, tenant_id = _resolve_request_tenant_db()
|
||||||
if tenant_db:
|
if tenant_db:
|
||||||
@@ -773,12 +772,12 @@ def update_active_ausleihung(username, id_item, ausleihung):
|
|||||||
users = db['users']
|
users = db['users']
|
||||||
|
|
||||||
result = users.update_one(
|
result = users.update_one(
|
||||||
{'Username': dp.encrypt_text(username)},
|
{'Username': username},
|
||||||
{'$set': {'active_ausleihung': {'Item': id_item, 'Ausleihung': ausleihung}}}
|
{'$set': {'active_ausleihung': {'Item': id_item, 'Ausleihung': ausleihung}}}
|
||||||
)
|
)
|
||||||
if result.matched_count == 0:
|
if result.matched_count == 0:
|
||||||
users.update_one(
|
users.update_one(
|
||||||
{'username': dp.encrypt_text(username)},
|
{'username': username},
|
||||||
{'$set': {'active_ausleihung': {'Item': id_item, 'Ausleihung': ausleihung}}}
|
{'$set': {'active_ausleihung': {'Item': id_item, 'Ausleihung': ausleihung}}}
|
||||||
)
|
)
|
||||||
client.close()
|
client.close()
|
||||||
@@ -791,7 +790,7 @@ def get_active_ausleihung(username):
|
|||||||
db = _get_tenant_db(client)
|
db = _get_tenant_db(client)
|
||||||
users = db['users']
|
users = db['users']
|
||||||
|
|
||||||
user = users.find_one({'Username': dp.encrypt_text(username)}) or users.find_one({'username': dp.encrypt_text(username)})
|
user = users.find_one({'Username': username}) or users.find_one({'username': username})
|
||||||
client.close()
|
client.close()
|
||||||
|
|
||||||
if not user:
|
if not user:
|
||||||
@@ -806,7 +805,7 @@ def has_active_borrowing(username):
|
|||||||
db = _get_tenant_db(client)
|
db = _get_tenant_db(client)
|
||||||
users = db['users']
|
users = db['users']
|
||||||
|
|
||||||
user = users.find_one({'username': dp.encrypt_text(username)}) or users.find_one({'Username': dp.encrypt_text(username)})
|
user = users.find_one({'username': username}) or users.find_one({'Username': username})
|
||||||
client.close()
|
client.close()
|
||||||
|
|
||||||
if not user:
|
if not user:
|
||||||
@@ -823,9 +822,9 @@ def delete_user(username):
|
|||||||
db = _get_tenant_db(client)
|
db = _get_tenant_db(client)
|
||||||
users = db['users']
|
users = db['users']
|
||||||
|
|
||||||
result = users.delete_one({'username': dp.encrypt_text(username)})
|
result = users.delete_one({'username': username})
|
||||||
if result.deleted_count == 0:
|
if result.deleted_count == 0:
|
||||||
result = users.delete_one({'Username': dp.encrypt_text(username)})
|
result = users.delete_one({'Username': username})
|
||||||
|
|
||||||
client.close()
|
client.close()
|
||||||
return result.deleted_count > 0
|
return result.deleted_count > 0
|
||||||
@@ -840,9 +839,9 @@ def update_active_borrowing(username, item_id, status):
|
|||||||
|
|
||||||
update_data = {'$set': {'active_borrowing': status, 'borrowed_item': item_id if status else None}}
|
update_data = {'$set': {'active_borrowing': status, 'borrowed_item': item_id if status else None}}
|
||||||
|
|
||||||
result = users.update_one({'username': dp.encrypt_text(username)}, update_data)
|
result = users.update_one({'username': username}, update_data)
|
||||||
if result.matched_count == 0:
|
if result.matched_count == 0:
|
||||||
result = users.update_one({'Username': dp.encrypt_text(username)}, update_data)
|
result = users.update_one({'Username': username}, update_data)
|
||||||
|
|
||||||
client.close()
|
client.close()
|
||||||
return result.modified_count > 0
|
return result.modified_count > 0
|
||||||
@@ -856,7 +855,7 @@ def get_name(username):
|
|||||||
db = _get_tenant_db(client)
|
db = _get_tenant_db(client)
|
||||||
users = db['users']
|
users = db['users']
|
||||||
|
|
||||||
user = users.find_one({'Username': dp.encrypt_text(username)}) or users.find_one({'username': dp.encrypt_text(username)})
|
user = users.find_one({'Username': username}) or users.find_one({'username': username})
|
||||||
client.close()
|
client.close()
|
||||||
|
|
||||||
if not user or not user.get("name"):
|
if not user or not user.get("name"):
|
||||||
@@ -871,7 +870,7 @@ def get_last_name(username):
|
|||||||
db = _get_tenant_db(client)
|
db = _get_tenant_db(client)
|
||||||
users = db['users']
|
users = db['users']
|
||||||
|
|
||||||
user = users.find_one({'Username': dp.encrypt_text(username)}) or users.find_one({'username': dp.encrypt_text(username)})
|
user = users.find_one({'Username': username}) or users.find_one({'username': username})
|
||||||
client.close()
|
client.close()
|
||||||
|
|
||||||
if not user or not user.get("last_name"):
|
if not user or not user.get("last_name"):
|
||||||
@@ -906,12 +905,12 @@ def update_password(username, new_password):
|
|||||||
hashed_password = hashing(new_password)
|
hashed_password = hashing(new_password)
|
||||||
|
|
||||||
result = users.update_one(
|
result = users.update_one(
|
||||||
{'Username': dp.encrypt_text(username)},
|
{'Username': username},
|
||||||
{'$set': {'Password': hashed_password}}
|
{'$set': {'Password': hashed_password}}
|
||||||
)
|
)
|
||||||
if result.matched_count == 0:
|
if result.matched_count == 0:
|
||||||
result = users.update_one(
|
result = users.update_one(
|
||||||
{'username': dp.encrypt_text(username)},
|
{'username': username},
|
||||||
{'$set': {'Password': hashed_password}}
|
{'$set': {'Password': hashed_password}}
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -933,12 +932,12 @@ def update_user_name(username, name, last_name):
|
|||||||
safe_last_name = dp.encrypt_text(last_name.strip()) if last_name else ''
|
safe_last_name = dp.encrypt_text(last_name.strip()) if last_name else ''
|
||||||
|
|
||||||
result = users.update_one(
|
result = users.update_one(
|
||||||
{'Username': dp.encrypt_text(username)},
|
{'Username': username},
|
||||||
{'$set': {'name': safe_name, 'last_name': safe_last_name}}
|
{'$set': {'name': safe_name, 'last_name': safe_last_name}}
|
||||||
)
|
)
|
||||||
if result.matched_count == 0:
|
if result.matched_count == 0:
|
||||||
result = users.update_one(
|
result = users.update_one(
|
||||||
{'username': dp.encrypt_text(username)},
|
{'username': username},
|
||||||
{'$set': {'name': safe_name, 'last_name': safe_last_name}}
|
{'$set': {'name': safe_name, 'last_name': safe_last_name}}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,752 +0,0 @@
|
|||||||
{% extends "base.html" %}
|
|
||||||
|
|
||||||
{% block title %}Bibliothek - {{ APP_VERSION }}{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="content-container">
|
|
||||||
<!-- Header Section -->
|
|
||||||
<div class="header-section">
|
|
||||||
<div class="header-title-group">
|
|
||||||
<h1>📚 Bibliothek</h1>
|
|
||||||
<p class="subtitle">Bücher, CDs und weitere Medien</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Search & Filter Section -->
|
|
||||||
<div class="search-filter-section">
|
|
||||||
<input type="text" id="searchInput" placeholder="Nach Titel, Autor, ISBN suchen..." class="search-input">
|
|
||||||
|
|
||||||
<div class="filter-group" id="filterGroup">
|
|
||||||
<button class="filter-btn" id="filterBtn" aria-expanded="false" aria-label="Filter öffnen">
|
|
||||||
🔍 Filter <span class="filter-arrow">▼</span>
|
|
||||||
</button>
|
|
||||||
<div class="filter-dropdown" id="filterDropdown" style="display: none;">
|
|
||||||
<div class="filter-section">
|
|
||||||
<h4>Medientyp</h4>
|
|
||||||
<div class="filter-options">
|
|
||||||
<label><input type="checkbox" class="filter-checkbox" data-filter="type" value="book"> Buch</label>
|
|
||||||
<label><input type="checkbox" class="filter-checkbox" data-filter="type" value="cd"> CD/DVD</label>
|
|
||||||
<label><input type="checkbox" class="filter-checkbox" data-filter="type" value="other"> Sonstige</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="filter-section">
|
|
||||||
<h4>Status</h4>
|
|
||||||
<div class="filter-options">
|
|
||||||
<label><input type="checkbox" class="filter-checkbox" data-filter="status" value="available"> Verfügbar</label>
|
|
||||||
<label><input type="checkbox" class="filter-checkbox" data-filter="status" value="borrowed"> Ausgeliehen</label>
|
|
||||||
<label><input type="checkbox" class="filter-checkbox" data-filter="status" value="reserved"> Reserviert</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<button id="clearFiltersBtn" class="button">Filter zurücksetzen</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Barcode Scanner -->
|
|
||||||
<button id="scannerBtn" class="scan-button" aria-expanded="false" aria-label="Scanner öffnen">
|
|
||||||
📱 Scanner <span class="scanner-arrow">▼</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 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>
|
|
||||||
|
|
||||||
<!-- Table Header (only in table mode) -->
|
|
||||||
<div class="library-table-wrapper">
|
|
||||||
<div class="table-header" id="tableHeader" style="display: none;">
|
|
||||||
<div class="table-row">
|
|
||||||
<div class="table-cell title-cell">Titel</div>
|
|
||||||
<div class="table-cell author-cell">Autor/Künstler</div>
|
|
||||||
<div class="table-cell isbn-cell">ISBN/Code</div>
|
|
||||||
<div class="table-cell type-cell">Typ</div>
|
|
||||||
<div class="table-cell status-cell">Status</div>
|
|
||||||
<div class="table-cell actions-cell">Aktionen</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Items Container -->
|
|
||||||
<div id="itemsContainer" class="items-container">
|
|
||||||
{% if library_items %}
|
|
||||||
{% for item in library_items %}
|
|
||||||
<div class="item-card library-item" data-item-id="{{ item._id }}" data-type="{{ item.get('ItemType', 'book') }}" data-status="{{ 'borrowed' if item.get('Verfuegbar') == False else 'available' }}">
|
|
||||||
<!-- Card Mode View -->
|
|
||||||
<div class="item-content card-mode">
|
|
||||||
<div class="item-image-wrapper">
|
|
||||||
{% if item.get('Image') %}
|
|
||||||
<img src="/uploads/{{ item.Image }}" alt="{{ item.Name }}" class="item-image">
|
|
||||||
{% else %}
|
|
||||||
<div class="placeholder-image">📚</div>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="item-details">
|
|
||||||
<h3 class="item-name">{{ item.Name }}</h3>
|
|
||||||
|
|
||||||
{% if item.get('Author') %}
|
|
||||||
<p class="item-author">Von: {{ item.Author }}</p>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% if item.get('ISBN') %}
|
|
||||||
<p class="item-isbn">ISBN: {{ item.ISBN }}</p>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
<div class="item-meta">
|
|
||||||
<span class="item-type">{{ item.get('ItemType', 'Medium') }}</span>
|
|
||||||
<span class="item-status {% if item.get('Verfuegbar') == False %}borrowed{% else %}available{% endif %}">
|
|
||||||
{% if item.get('Verfuegbar') == False %}Ausgeliehen{% else %}Verfügbar{% endif %}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Table Mode View -->
|
|
||||||
<div class="item-content table-mode" style="display: none;">
|
|
||||||
<div class="table-row">
|
|
||||||
<div class="table-cell title-cell">
|
|
||||||
<span class="descriptor">Titel:</span>
|
|
||||||
<span class="value">{{ item.Name }}</span>
|
|
||||||
</div>
|
|
||||||
<div class="table-cell author-cell">
|
|
||||||
<span class="descriptor">Autor:</span>
|
|
||||||
<span class="value">{{ item.get('Author', '—') }}</span>
|
|
||||||
</div>
|
|
||||||
<div class="table-cell isbn-cell">
|
|
||||||
<span class="descriptor">ISBN:</span>
|
|
||||||
<span class="value">{{ item.get('ISBN', '—') }}</span>
|
|
||||||
</div>
|
|
||||||
<div class="table-cell type-cell">
|
|
||||||
<span class="descriptor">Typ:</span>
|
|
||||||
<span class="value">{{ item.get('ItemType', 'Medium') }}</span>
|
|
||||||
</div>
|
|
||||||
<div class="table-cell status-cell">
|
|
||||||
<span class="descriptor">Status:</span>
|
|
||||||
<span class="value {% if item.get('Verfuegbar') == False %}borrowed{% else %}available{% endif %}">
|
|
||||||
{% if item.get('Verfuegbar') == False %}Ausgeliehen{% else %}Verfügbar{% endif %}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div class="table-cell actions-cell">
|
|
||||||
<button class="action-button details-btn" data-item-id="{{ item._id }}">Details</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Action Buttons (Card Mode) -->
|
|
||||||
<div class="item-actions card-mode" style="display: flex;">
|
|
||||||
<button class="action-button details-btn" data-item-id="{{ item._id }}">Details</button>
|
|
||||||
{% if item.get('Verfuegbar') == True %}
|
|
||||||
<button class="action-button borrow-btn" data-item-id="{{ item._id }}">Ausleihen</button>
|
|
||||||
{% else %}
|
|
||||||
<button class="action-button return-btn" data-item-id="{{ item._id }}" disabled>Ausgeliehen</button>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endfor %}
|
|
||||||
{% else %}
|
|
||||||
<div class="empty-state">
|
|
||||||
<p>Keine Bibliotheks-Medien gefunden</p>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Detail Modal -->
|
|
||||||
<div id="detailModal" class="modal" style="display: none;">
|
|
||||||
<div class="modal-content">
|
|
||||||
<button class="modal-close" aria-label="Schließen">✕</button>
|
|
||||||
|
|
||||||
<div class="modal-body" id="modalBody">
|
|
||||||
<!-- Filled by JavaScript -->
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Borrow Modal -->
|
|
||||||
<div id="borrowModal" class="modal" style="display: none;">
|
|
||||||
<div class="modal-content">
|
|
||||||
<h2>Ausleihen</h2>
|
|
||||||
<form id="borrowForm">
|
|
||||||
<input type="hidden" id="borrowItemId" name="item_id">
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="studentIdInput">Schülerausweis-ID (optional):</label>
|
|
||||||
<input type="text" id="studentIdInput" name="student_id" placeholder="Ausweis scannen oder eingeben" class="form-input">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="borrowDaysInput">Ausleih-Dauer (Tage):</label>
|
|
||||||
<input type="number" id="borrowDaysInput" name="borrow_days" min="1" max="365" class="form-input" value="14">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-actions">
|
|
||||||
<button type="submit" class="button primary-button">Ausleihen</button>
|
|
||||||
<button type="button" class="button cancel-button" onclick="document.getElementById('borrowModal').style.display='none'">Abbrechen</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<script src="https://cdn.jsdelivr.net/npm/@ericblade/quagga2/dist/quagga.js"></script>
|
|
||||||
<script>
|
|
||||||
// View mode persistence
|
|
||||||
const LIBRARY_VIEW_MODE_KEY = 'inventarLibraryViewMode';
|
|
||||||
const MOBILE_LIBRARY_MAX_WIDTH = 900;
|
|
||||||
const MOBILE_LIBRARY_MIN_ITEMS = 24;
|
|
||||||
|
|
||||||
function isMobileViewport() {
|
|
||||||
return window.matchMedia(`(max-width: ${MOBILE_LIBRARY_MAX_WIDTH}px)`).matches;
|
|
||||||
}
|
|
||||||
|
|
||||||
function setViewMode(mode) {
|
|
||||||
localStorage.setItem(LIBRARY_VIEW_MODE_KEY, mode);
|
|
||||||
const container = document.getElementById('itemsContainer');
|
|
||||||
const tableHeader = document.getElementById('tableHeader');
|
|
||||||
const renderedItems = Array.from(container.querySelectorAll('.item-card'));
|
|
||||||
const virtualizationState = window.mobileLibraryVirtualizationState || null;
|
|
||||||
const detachedItems = virtualizationState && virtualizationState.active && Array.isArray(virtualizationState.items)
|
|
||||||
? virtualizationState.items.filter(item => !container.contains(item))
|
|
||||||
: [];
|
|
||||||
const items = [...renderedItems, ...detachedItems.filter(item => !container.contains(item))];
|
|
||||||
|
|
||||||
items.forEach(item => {
|
|
||||||
const cardContent = item.querySelector('.item-content.card-mode');
|
|
||||||
const cardActions = item.querySelector('.item-actions.card-mode');
|
|
||||||
const tableContent = item.querySelector('.item-content.table-mode');
|
|
||||||
|
|
||||||
if (mode === 'table') {
|
|
||||||
if (cardContent) cardContent.style.display = 'none';
|
|
||||||
if (cardActions) cardActions.style.display = 'none';
|
|
||||||
if (tableContent) tableContent.style.display = 'block';
|
|
||||||
} else {
|
|
||||||
if (cardContent) cardContent.style.display = 'flex';
|
|
||||||
if (cardActions) cardActions.style.display = 'flex';
|
|
||||||
if (tableContent) tableContent.style.display = 'none';
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
tableHeader.style.display = mode === 'table' ? 'block' : 'none';
|
|
||||||
|
|
||||||
document.getElementById('viewModeToggle').classList.toggle('open', mode === 'table');
|
|
||||||
}
|
|
||||||
|
|
||||||
function initMobileWindowedLibraryLoading() {
|
|
||||||
const container = document.getElementById('itemsContainer');
|
|
||||||
if (!container) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!window.mobileLibraryVirtualizationState) {
|
|
||||||
window.mobileLibraryVirtualizationState = {
|
|
||||||
active: false,
|
|
||||||
items: [],
|
|
||||||
topSpacer: null,
|
|
||||||
bottomSpacer: null,
|
|
||||||
averageItemHeight: Math.max(Math.round(window.innerHeight * 0.35), 230),
|
|
||||||
lastStart: -1,
|
|
||||||
lastEnd: -1,
|
|
||||||
framePending: false,
|
|
||||||
scrollListener: null,
|
|
||||||
resizeListener: null,
|
|
||||||
initialized: false
|
|
||||||
};
|
|
||||||
}
|
|
||||||
const state = window.mobileLibraryVirtualizationState;
|
|
||||||
|
|
||||||
function restoreAllImages() {
|
|
||||||
state.items.forEach(item => {
|
|
||||||
const image = item.querySelector('img.item-image');
|
|
||||||
if (!image) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const originalSrc = image.dataset.mobileSrc || '';
|
|
||||||
if (!image.getAttribute('src') && originalSrc) {
|
|
||||||
image.setAttribute('src', originalSrc);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function updateImageMemory(startIndex, endIndex) {
|
|
||||||
const imageBuffer = 4;
|
|
||||||
state.items.forEach((item, index) => {
|
|
||||||
const image = item.querySelector('img.item-image');
|
|
||||||
if (!image) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!image.dataset.mobileSrc) {
|
|
||||||
image.dataset.mobileSrc = image.getAttribute('src') || '';
|
|
||||||
}
|
|
||||||
image.loading = 'lazy';
|
|
||||||
image.decoding = 'async';
|
|
||||||
|
|
||||||
const shouldKeepLoaded = index >= startIndex - imageBuffer && index < endIndex + imageBuffer;
|
|
||||||
if (shouldKeepLoaded) {
|
|
||||||
if (!image.getAttribute('src') && image.dataset.mobileSrc) {
|
|
||||||
image.setAttribute('src', image.dataset.mobileSrc);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (image.getAttribute('src')) {
|
|
||||||
image.removeAttribute('src');
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function renderVisibleWindow() {
|
|
||||||
if (!state.active || !state.topSpacer || !state.bottomSpacer) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const viewportHeight = window.innerHeight || 800;
|
|
||||||
const scrollTop = window.scrollY || window.pageYOffset || 0;
|
|
||||||
const renderBuffer = viewportHeight * 1.5;
|
|
||||||
|
|
||||||
let startIndex = Math.max(0, Math.floor((scrollTop - renderBuffer) / state.averageItemHeight));
|
|
||||||
let endIndex = Math.min(state.items.length, Math.ceil((scrollTop + viewportHeight + renderBuffer) / state.averageItemHeight));
|
|
||||||
|
|
||||||
if (endIndex - startIndex < 14) {
|
|
||||||
endIndex = Math.min(state.items.length, startIndex + 14);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (startIndex === state.lastStart && endIndex === state.lastEnd) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
state.lastStart = startIndex;
|
|
||||||
state.lastEnd = endIndex;
|
|
||||||
|
|
||||||
while (state.topSpacer.nextSibling && state.topSpacer.nextSibling !== state.bottomSpacer) {
|
|
||||||
state.topSpacer.nextSibling.remove();
|
|
||||||
}
|
|
||||||
|
|
||||||
const fragment = document.createDocumentFragment();
|
|
||||||
for (let index = startIndex; index < endIndex; index += 1) {
|
|
||||||
fragment.appendChild(state.items[index]);
|
|
||||||
}
|
|
||||||
container.insertBefore(fragment, state.bottomSpacer);
|
|
||||||
|
|
||||||
let measuredHeightSum = 0;
|
|
||||||
let measuredCount = 0;
|
|
||||||
for (let index = startIndex; index < endIndex; index += 1) {
|
|
||||||
const height = state.items[index].getBoundingClientRect().height;
|
|
||||||
if (height > 0) {
|
|
||||||
measuredHeightSum += height;
|
|
||||||
measuredCount += 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (measuredCount > 0) {
|
|
||||||
const measuredAverage = measuredHeightSum / measuredCount;
|
|
||||||
state.averageItemHeight = Math.round((state.averageItemHeight * 3 + measuredAverage) / 4);
|
|
||||||
}
|
|
||||||
|
|
||||||
state.topSpacer.style.height = `${Math.max(0, startIndex * state.averageItemHeight)}px`;
|
|
||||||
state.bottomSpacer.style.height = `${Math.max(0, (state.items.length - endIndex) * state.averageItemHeight)}px`;
|
|
||||||
updateImageMemory(startIndex, endIndex);
|
|
||||||
}
|
|
||||||
|
|
||||||
function scheduleWindowRender() {
|
|
||||||
if (!state.active || state.framePending) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
state.framePending = true;
|
|
||||||
requestAnimationFrame(() => {
|
|
||||||
state.framePending = false;
|
|
||||||
renderVisibleWindow();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function activateVirtualization() {
|
|
||||||
if (state.active) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!Array.isArray(state.items) || state.items.length === 0) {
|
|
||||||
state.items = Array.from(container.querySelectorAll('.library-item'));
|
|
||||||
}
|
|
||||||
if (state.items.length <= MOBILE_LIBRARY_MIN_ITEMS) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
state.topSpacer = document.createElement('div');
|
|
||||||
state.topSpacer.className = 'mobile-window-spacer top';
|
|
||||||
state.bottomSpacer = document.createElement('div');
|
|
||||||
state.bottomSpacer.className = 'mobile-window-spacer bottom';
|
|
||||||
|
|
||||||
state.items.forEach(item => item.remove());
|
|
||||||
container.appendChild(state.topSpacer);
|
|
||||||
container.appendChild(state.bottomSpacer);
|
|
||||||
|
|
||||||
state.lastStart = -1;
|
|
||||||
state.lastEnd = -1;
|
|
||||||
state.framePending = false;
|
|
||||||
state.active = true;
|
|
||||||
|
|
||||||
if (!state.scrollListener) {
|
|
||||||
state.scrollListener = () => scheduleWindowRender();
|
|
||||||
window.addEventListener('scroll', state.scrollListener, { passive: true });
|
|
||||||
}
|
|
||||||
|
|
||||||
scheduleWindowRender();
|
|
||||||
}
|
|
||||||
|
|
||||||
function deactivateVirtualization() {
|
|
||||||
if (!state.active) {
|
|
||||||
if (!Array.isArray(state.items) || state.items.length === 0) {
|
|
||||||
state.items = Array.from(container.querySelectorAll('.library-item'));
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (state.scrollListener) {
|
|
||||||
window.removeEventListener('scroll', state.scrollListener);
|
|
||||||
state.scrollListener = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (state.topSpacer && state.topSpacer.parentNode === container) {
|
|
||||||
state.topSpacer.remove();
|
|
||||||
}
|
|
||||||
if (state.bottomSpacer && state.bottomSpacer.parentNode === container) {
|
|
||||||
state.bottomSpacer.remove();
|
|
||||||
}
|
|
||||||
|
|
||||||
const fragment = document.createDocumentFragment();
|
|
||||||
state.items.forEach(item => fragment.appendChild(item));
|
|
||||||
container.appendChild(fragment);
|
|
||||||
|
|
||||||
restoreAllImages();
|
|
||||||
|
|
||||||
state.topSpacer = null;
|
|
||||||
state.bottomSpacer = null;
|
|
||||||
state.lastStart = -1;
|
|
||||||
state.lastEnd = -1;
|
|
||||||
state.framePending = false;
|
|
||||||
state.active = false;
|
|
||||||
|
|
||||||
const currentMode = localStorage.getItem(LIBRARY_VIEW_MODE_KEY) || 'card';
|
|
||||||
setViewMode(currentMode);
|
|
||||||
}
|
|
||||||
|
|
||||||
function syncVirtualizationWithViewport() {
|
|
||||||
if (!Array.isArray(state.items) || state.items.length === 0) {
|
|
||||||
state.items = Array.from(container.querySelectorAll('.library-item'));
|
|
||||||
}
|
|
||||||
|
|
||||||
const shouldVirtualize = isMobileViewport() && state.items.length > MOBILE_LIBRARY_MIN_ITEMS;
|
|
||||||
if (shouldVirtualize) {
|
|
||||||
activateVirtualization();
|
|
||||||
scheduleWindowRender();
|
|
||||||
} else {
|
|
||||||
deactivateVirtualization();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!state.initialized) {
|
|
||||||
state.resizeListener = () => syncVirtualizationWithViewport();
|
|
||||||
window.addEventListener('resize', state.resizeListener, { passive: true });
|
|
||||||
state.initialized = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
syncVirtualizationWithViewport();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Initialize view mode
|
|
||||||
document.addEventListener('DOMContentLoaded', function() {
|
|
||||||
const savedMode = localStorage.getItem(LIBRARY_VIEW_MODE_KEY) || 'card';
|
|
||||||
setViewMode(savedMode);
|
|
||||||
|
|
||||||
document.getElementById('viewModeToggle').addEventListener('click', function() {
|
|
||||||
const currentMode = localStorage.getItem(LIBRARY_VIEW_MODE_KEY) || 'card';
|
|
||||||
const newMode = currentMode === 'card' ? 'table' : 'card';
|
|
||||||
setViewMode(newMode);
|
|
||||||
});
|
|
||||||
|
|
||||||
// Details button handlers
|
|
||||||
document.querySelectorAll('.details-btn').forEach(btn => {
|
|
||||||
btn.addEventListener('click', function(e) {
|
|
||||||
e.preventDefault();
|
|
||||||
const itemId = this.dataset.itemId;
|
|
||||||
fetch(`/get_item_details/${itemId}`)
|
|
||||||
.then(r => r.json())
|
|
||||||
.then(data => {
|
|
||||||
if (data.success) {
|
|
||||||
displayLibraryItemDetail(data.item);
|
|
||||||
document.getElementById('detailModal').style.display = 'flex';
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
// Borrow button handlers
|
|
||||||
document.querySelectorAll('.borrow-btn').forEach(btn => {
|
|
||||||
btn.addEventListener('click', function() {
|
|
||||||
document.getElementById('borrowItemId').value = this.dataset.itemId;
|
|
||||||
document.getElementById('borrowModal').style.display = 'flex';
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
// Borrow form submit
|
|
||||||
document.getElementById('borrowForm').addEventListener('submit', function(e) {
|
|
||||||
e.preventDefault();
|
|
||||||
const itemId = document.getElementById('borrowItemId').value;
|
|
||||||
const studentId = document.getElementById('studentIdInput').value || null;
|
|
||||||
const borrowDays = document.getElementById('borrowDaysInput').value || 14;
|
|
||||||
|
|
||||||
fetch('/borrow_item', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {'Content-Type': 'application/json'},
|
|
||||||
body: JSON.stringify({
|
|
||||||
item_id: itemId,
|
|
||||||
student_id: studentId,
|
|
||||||
borrow_days: borrowDays
|
|
||||||
})
|
|
||||||
})
|
|
||||||
.then(r => r.json())
|
|
||||||
.then(data => {
|
|
||||||
if (data.success) {
|
|
||||||
alert('Erfolgreich ausgeliehen!');
|
|
||||||
location.reload();
|
|
||||||
} else {
|
|
||||||
alert('Fehler: ' + data.message);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
// Modal close handlers
|
|
||||||
document.querySelectorAll('.modal-close').forEach(btn => {
|
|
||||||
btn.addEventListener('click', function() {
|
|
||||||
this.closest('.modal').style.display = 'none';
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
// Close modals on outside click
|
|
||||||
document.querySelectorAll('.modal').forEach(modal => {
|
|
||||||
modal.addEventListener('click', function(e) {
|
|
||||||
if (e.target === this) this.style.display = 'none';
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
initMobileWindowedLibraryLoading();
|
|
||||||
});
|
|
||||||
|
|
||||||
function displayLibraryItemDetail(item) {
|
|
||||||
const modalBody = document.getElementById('modalBody');
|
|
||||||
const returnBtn = item.Verfuegbar === false ? `<button class="action-button return-btn" onclick="returnItem('${item._id}')">Zurückgeben</button>` : '';
|
|
||||||
const borrowBtn = item.Verfuegbar === true ? `<button class="action-button borrow-btn" onclick="openBorrowModal('${item._id}')">Ausleihen</button>` : '';
|
|
||||||
|
|
||||||
modalBody.innerHTML = `
|
|
||||||
<h2>${item.Name}</h2>
|
|
||||||
<div class="detail-content">
|
|
||||||
${item.Image ? `<img src="/uploads/${item.Image}" alt="${item.Name}" style="max-width: 200px; margin-bottom: 20px;">` : ''}
|
|
||||||
<p><strong>Autor:</strong> ${item.Author || '—'}</p>
|
|
||||||
<p><strong>ISBN:</strong> ${item.ISBN || '—'}</p>
|
|
||||||
<p><strong>Typ:</strong> ${item.ItemType || 'Medium'}</p>
|
|
||||||
<p><strong>Status:</strong> ${item.Verfuegbar === false ? 'Ausgeliehen' : 'Verfügbar'}</p>
|
|
||||||
${item.User ? `<p><strong>Ausgeliehen von:</strong> ${item.User}</p>` : ''}
|
|
||||||
${item.Beschreibung ? `<p><strong>Beschreibung:</strong> ${item.Beschreibung}</p>` : ''}
|
|
||||||
<div class="modal-actions">
|
|
||||||
${borrowBtn}
|
|
||||||
${returnBtn}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function openBorrowModal(itemId) {
|
|
||||||
document.getElementById('borrowItemId').value = itemId;
|
|
||||||
document.getElementById('borrowModal').style.display = 'flex';
|
|
||||||
document.getElementById('detailModal').style.display = 'none';
|
|
||||||
}
|
|
||||||
|
|
||||||
function returnItem(itemId) {
|
|
||||||
if (confirm('Wirklich zurückgeben?')) {
|
|
||||||
fetch('/return_item', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {'Content-Type': 'application/json'},
|
|
||||||
body: JSON.stringify({item_id: itemId})
|
|
||||||
})
|
|
||||||
.then(r => r.json())
|
|
||||||
.then(data => {
|
|
||||||
if (data.success) {
|
|
||||||
alert('Erfolgreich zurückgegeben!');
|
|
||||||
location.reload();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Filter dropdown toggle with auto-close
|
|
||||||
function closeAllFilters() {
|
|
||||||
document.querySelectorAll('.filter-dropdown').forEach(d => d.style.display = 'none');
|
|
||||||
document.getElementById('filterBtn').setAttribute('aria-expanded', 'false');
|
|
||||||
document.getElementById('filterBtn').classList.remove('open');
|
|
||||||
}
|
|
||||||
|
|
||||||
document.getElementById('filterBtn').addEventListener('click', function(e) {
|
|
||||||
e.stopPropagation();
|
|
||||||
const dropdown = document.getElementById('filterDropdown');
|
|
||||||
const isOpen = dropdown.style.display !== 'none';
|
|
||||||
closeAllFilters();
|
|
||||||
if (!isOpen) {
|
|
||||||
dropdown.style.display = 'block';
|
|
||||||
this.setAttribute('aria-expanded', 'true');
|
|
||||||
this.classList.add('open');
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
document.addEventListener('click', closeAllFilters);
|
|
||||||
document.getElementById('filterDropdown').addEventListener('click', e => e.stopPropagation());
|
|
||||||
|
|
||||||
// Clear filters
|
|
||||||
document.getElementById('clearFiltersBtn').addEventListener('click', function() {
|
|
||||||
document.querySelectorAll('.filter-checkbox').forEach(c => c.checked = false);
|
|
||||||
closeAllFilters();
|
|
||||||
});
|
|
||||||
|
|
||||||
// Scanner toggle
|
|
||||||
// Scanner state tracking
|
|
||||||
let isScanning = false;
|
|
||||||
|
|
||||||
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');
|
|
||||||
} else {
|
|
||||||
// Open the scanner
|
|
||||||
container.style.display = 'block';
|
|
||||||
btn.classList.add('open');
|
|
||||||
btn.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;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// 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');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Route the scanned data to your input
|
|
||||||
document.getElementById('studentIdInput').value = studentId;
|
|
||||||
alert('Ausweis gescannt: ' + studentId);
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style>
|
|
||||||
.library-item .item-image-wrapper {
|
|
||||||
width: 120px;
|
|
||||||
height: 160px;
|
|
||||||
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
|
|
||||||
border-radius: 8px;
|
|
||||||
overflow: hidden;
|
|
||||||
flex-shrink: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.library-item .placeholder-image {
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
font-size: 48px;
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.library-item .item-author {
|
|
||||||
font-size: 0.9rem;
|
|
||||||
color: #666;
|
|
||||||
margin: 4px 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.library-item .item-isbn {
|
|
||||||
font-size: 0.85rem;
|
|
||||||
color: #999;
|
|
||||||
font-family: monospace;
|
|
||||||
margin: 4px 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.library-item .item-type {
|
|
||||||
display: inline-block;
|
|
||||||
background: #e8f0fe;
|
|
||||||
color: #1967d2;
|
|
||||||
padding: 2px 8px;
|
|
||||||
border-radius: 4px;
|
|
||||||
font-size: 0.8rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.library-item .item-status.available {
|
|
||||||
background: #e6f4ea;
|
|
||||||
color: #137333;
|
|
||||||
}
|
|
||||||
|
|
||||||
.library-item .item-status.borrowed {
|
|
||||||
background: #fce8e6;
|
|
||||||
color: #b3261e;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Mobile: allow horizontal scrolling for table-mode views */
|
|
||||||
@media (max-width: 900px) {
|
|
||||||
.library-table-wrapper {
|
|
||||||
overflow-x: auto;
|
|
||||||
-webkit-overflow-scrolling: touch;
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
.library-table-wrapper .table-row {
|
|
||||||
min-width: 720px; /* allow table to have intrinsic width and be scrolled */
|
|
||||||
}
|
|
||||||
.table-header, .item-content.table-mode {
|
|
||||||
display: block; /* keep rows stacked but allow horizontal scroll */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
{% endblock %}
|
|
||||||
+165
-209
@@ -495,12 +495,13 @@
|
|||||||
|
|
||||||
<div class="library-table-container" id="libraryTableContainer" data-can-edit="{{ 1 if current_permissions.actions.get('can_edit', False) else 0 }}">
|
<div class="library-table-container" id="libraryTableContainer" data-can-edit="{{ 1 if current_permissions.actions.get('can_edit', False) else 0 }}">
|
||||||
<!-- Header -->
|
<!-- Header -->
|
||||||
|
<!-- Search and Filter Toggle -->
|
||||||
|
<!-- Customizable Filter Panel -->
|
||||||
<div class="library-header">
|
<div class="library-header">
|
||||||
<h1>📚 Bibliothek</h1>
|
<h1>📚 Bibliothek</h1>
|
||||||
<p>Bücher, CDs, DVDs und weitere Medien</p>
|
<p>Bücher, CDs, DVDs und weitere Medien</p>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- Student card / quick scan workflow -->
|
||||||
<!-- Search and Filter Toggle -->
|
|
||||||
<div class="library-search-bar">
|
<div class="library-search-bar">
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
@@ -517,37 +518,22 @@
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Customizable Filter Panel -->
|
<div class="library-scan-controls">
|
||||||
|
<select id="scanModeSelect" aria-label="Scan-Modus">
|
||||||
<!-- Student card / quick scan workflow -->
|
<option value="card_only">Nur Ausweis erfassen</option>
|
||||||
<div class="library-scan-panel">
|
<option value="quick_toggle">Schnellmodus: Ausweis + Mediencode</option>
|
||||||
<div class="library-scan-controls">
|
<option value="continuous">Dauermodus: 1x Ausweis, dann N Medien</option>
|
||||||
<select id="scanModeSelect" aria-label="Scan-Modus">
|
<option value="return_only">Nur Rückgabe (nur Mediencode)</option>
|
||||||
<option value="card_only">Nur Ausweis erfassen</option>
|
</select>
|
||||||
<option value="quick_toggle">Schnellmodus: Ausweis + Mediencode</option>
|
<input type="text" id="activeStudentCard" placeholder="Aktiver Ausweis (gescannt)">
|
||||||
</select>
|
<input type="text" id="manualItemCode" placeholder="Manueller Mediencode (optional)" style="min-width:180px;">
|
||||||
<input type="text" id="activeStudentCard" placeholder="Aktiver Ausweis (gescannt)" >
|
<button id="resetCardBtn" class="button" type="button">Ausweis löschen</button>
|
||||||
<input type="text" id="manualItemCode" placeholder="Manueller Mediencode (optional)" style="min-width:180px;">
|
<button id="toggleScannerBtn" class="button" type="button">Scanner starten</button>
|
||||||
<button id="resetCardBtn" class="button" type="button">Ausweis löschen</button>
|
<label style="display:flex; align-items:center; gap:8px; margin-left:6px;">
|
||||||
<button id="toggleScannerBtn" class="button" type="button">Scanner starten</button>
|
<input type="checkbox" id="keyboardScannerToggle">
|
||||||
<label style="display:flex; align-items:center; gap:8px; margin-left:6px;">
|
<span style="font-size:0.9em;">Physischer Scanner</span>
|
||||||
<input type="checkbox" id="keyboardScannerToggle">
|
</label>
|
||||||
<span style="font-size:0.9em;">Physischer Scanner</span>
|
<button id="manualActionBtn" class="button" type="button" style="margin-left:6px; background:#4f46e5; color:white;">Code verarbeiten</button>
|
||||||
</label>
|
|
||||||
<label style="display:flex; align-items:center; gap:8px; margin-left:6px;">
|
|
||||||
<input type="checkbox" id="returnOnlyToggle">
|
|
||||||
<span style="font-size:0.9em;">Nur Rückgabe (nur Mediencode)</span>
|
|
||||||
</label>
|
|
||||||
<button id="manualReturnBtn" class="button" type="button" style="margin-left:6px; background:#10b981;color:white;">Rückgabe per Code</button>
|
|
||||||
</div>
|
|
||||||
<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="libraryQrReader" class="library-scan-reader">
|
|
||||||
<div id="library-scanner-container"></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div id="filterPanel" class="library-filter-panel">
|
<div id="filterPanel" class="library-filter-panel">
|
||||||
<div class="filter-row">
|
<div class="filter-row">
|
||||||
@@ -946,6 +932,32 @@
|
|||||||
setScanStatus('Scanner gestoppt.', 'warn');
|
setScanStatus('Scanner gestoppt.', 'warn');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function isStudentCardBarcode(code) {
|
||||||
|
if (!code) return false;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(`/api/is_student_card/${encodeURIComponent(code)}`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
// Falls du in Flask CSRF-Protect nutzt, muss der Token mitgesendet werden:
|
||||||
|
'X-CSRFToken': '{{ csrf_token }}',
|
||||||
|
'X-CSRF-Token': '{{ csrf_token }}'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) return false;
|
||||||
|
|
||||||
|
// Wir parsen die Antwort. Flask jsonify({"is_student_card": true/false})
|
||||||
|
const data = await response.json();
|
||||||
|
return data === true || data.is_student_card === true;
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Fehler bei der API-Prüfung des Ausweises:', error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Quagga.onDetected(function(data) {
|
Quagga.onDetected(function(data) {
|
||||||
if (!data || !data.codeResult || !data.codeResult.code) return;
|
if (!data || !data.codeResult || !data.codeResult.code) return;
|
||||||
|
|
||||||
@@ -955,13 +967,6 @@
|
|||||||
const currentCallback = activeScannerCallback;
|
const currentCallback = activeScannerCallback;
|
||||||
stopScanner();
|
stopScanner();
|
||||||
|
|
||||||
const returnOnly = (document.getElementById('returnOnlyToggle') || {}).checked;
|
|
||||||
if (returnOnly) {
|
|
||||||
// direct return flow
|
|
||||||
returnByCode(barcode);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (typeof currentCallback === "function") {
|
if (typeof currentCallback === "function") {
|
||||||
currentCallback(barcode);
|
currentCallback(barcode);
|
||||||
} else {
|
} else {
|
||||||
@@ -988,14 +993,8 @@
|
|||||||
keyboardScanBuffer = '';
|
keyboardScanBuffer = '';
|
||||||
keyboardLastKeyAt = 0;
|
keyboardLastKeyAt = 0;
|
||||||
if (!code) return;
|
if (!code) return;
|
||||||
// If return-only mode is active, attempt direct return
|
|
||||||
const returnOnly = (document.getElementById('returnOnlyToggle') || {}).checked;
|
|
||||||
if (returnOnly) {
|
|
||||||
returnByCode(code);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Process exactly like a camera scan
|
// Process exactly like a camera scan - centralized logic handles the rest!
|
||||||
handleScanSuccess(code);
|
handleScanSuccess(code);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -1014,33 +1013,123 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function handleScanSuccess(decodedText) {
|
function handleScanSuccess(decodedText) {
|
||||||
const scannedCode = normalizeScannedCode(decodedText);
|
const scannedCode = typeof normalizeScannedCode === "function" ? normalizeScannedCode(decodedText) : decodedText;
|
||||||
if (!scannedCode) return;
|
if (!scannedCode) return;
|
||||||
|
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
if (scannedCode === lastScanValue && (now - lastScanAt) < 1500) {
|
if (scannedCode === lastScanValue && (now - lastScanAt) < 1500) {
|
||||||
return;
|
return; // Verhindert doppeltes Scannen in kurzer Zeit
|
||||||
}
|
}
|
||||||
lastScanValue = scannedCode;
|
lastScanValue = scannedCode;
|
||||||
lastScanAt = now;
|
lastScanAt = now;
|
||||||
|
|
||||||
|
// Den aktuellen Modus aus dem Dropdown auslesen
|
||||||
const mode = (document.getElementById('scanModeSelect') || {}).value || 'card_only';
|
const mode = (document.getElementById('scanModeSelect') || {}).value || 'card_only';
|
||||||
|
|
||||||
|
// 1. Modus: Nur Rückgabe
|
||||||
|
if (mode === 'return_only') {
|
||||||
|
returnByCode(scannedCode);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Modus: Nur Ausweis
|
||||||
if (mode === 'card_only') {
|
if (mode === 'card_only') {
|
||||||
setActiveStudentCard(scannedCode);
|
setActiveStudentCard(scannedCode);
|
||||||
setScanStatus(`Ausweis gesetzt: ${activeStudentCardId}`, 'ok');
|
setScanStatus(`Ausweis gesetzt: ${activeStudentCardId}`, 'ok');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
processQuickToggleScan(scannedCode);
|
// 3. Modus: Schnellmodus (1x Ausweis, 1x Buch)
|
||||||
|
if (mode === 'quick_toggle') {
|
||||||
|
processQuickToggleScan(scannedCode);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 4. Modus: Dauermodus (1x Ausweis, Nx Bücher)
|
||||||
|
if (mode === 'continuous') {
|
||||||
|
processContinuousScan(scannedCode);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function processContinuousScan(scannedCode) {
|
||||||
|
setScanStatus('Überprüfe Code-Typ...', 'warn');
|
||||||
|
|
||||||
|
const isCard = await isStudentCardBarcode(scannedCode);
|
||||||
|
|
||||||
|
if (isCard) {
|
||||||
|
setActiveStudentCard(scannedCode);
|
||||||
|
setScanStatus(`Neuer Ausweis gesetzt: ${activeStudentCardId}. Bitte Medien scannen.`, 'ok');
|
||||||
|
showSmallConfirm(`Benutzer gewechselt zu: ${activeStudentCardId}`, 'ok');
|
||||||
|
|
||||||
|
setTimeout(() => {
|
||||||
|
if (document.getElementById('scanModeSelect').value === 'continuous') {
|
||||||
|
startScanner();
|
||||||
|
}
|
||||||
|
}, 1000);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!activeStudentCardId) {
|
||||||
|
setScanStatus('Kein Ausweis aktiv! Bitte zuerst einen Schülerausweis scannen.', 'error');
|
||||||
|
showSmallConfirm('Bitte zuerst Ausweis scannen', 'error');
|
||||||
|
|
||||||
|
setTimeout(() => {
|
||||||
|
if (document.getElementById('scanModeSelect').value === 'continuous') {
|
||||||
|
startScanner();
|
||||||
|
}
|
||||||
|
}, 2000);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
setScanStatus('Verarbeite Mediencode...', 'warn');
|
||||||
|
const response = await fetch('/api/library_scan_action', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
'X-CSRFToken': '{{ csrf_token }}',
|
||||||
|
'X-CSRF-Token': '{{ csrf_token }}'
|
||||||
|
},
|
||||||
|
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');
|
||||||
|
showSmallConfirm(result.message || 'Aktion fehlgeschlagen.', 'error');
|
||||||
|
} else if (result.action === 'borrowed') {
|
||||||
|
setScanStatus(`Ausgeliehen: ${result.item_name}`, 'ok');
|
||||||
|
showSmallConfirm(`Ausgeliehen: ${result.item_name}`, 'ok');
|
||||||
|
} else if (result.action === 'returned') {
|
||||||
|
setScanStatus(`Zurückgegeben: ${result.item_name}`, 'ok');
|
||||||
|
showSmallConfirm(`Zurückgegeben: ${result.item_name}`, 'ok');
|
||||||
|
} else {
|
||||||
|
setScanStatus(result.message || 'Aktion durchgeführt.', 'ok');
|
||||||
|
showSmallConfirm(result.message || 'Erfolgreich', 'ok');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Tabellen-Ansicht aktualisieren
|
||||||
|
if (typeof loadLibraryItems === "function") {
|
||||||
|
await loadLibraryItems();
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Continuous scan action failed:', err);
|
||||||
|
setScanStatus('Fehler beim Verarbeiten des Scans.', 'error');
|
||||||
|
showSmallConfirm('Fehler im Netzwerk/System', 'error');
|
||||||
|
}
|
||||||
|
|
||||||
|
setTimeout(() => {
|
||||||
|
if (document.getElementById('scanModeSelect').value === 'continuous') {
|
||||||
|
startScanner();
|
||||||
|
}
|
||||||
|
}, 1500);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function processQuickToggleScan(scannedCode) {
|
async function processQuickToggleScan(scannedCode) {
|
||||||
// 1. Prüfen, ob "Nur Rückgabe"-Modus aktiv ist
|
|
||||||
const returnOnly = (document.getElementById('returnOnlyToggle') || {}).checked;
|
|
||||||
if (returnOnly) {
|
|
||||||
await returnByCode(scannedCode);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 2. Wenn kein Ausweis gesetzt ist, wird der Code als Ausweis interpretiert
|
// 2. Wenn kein Ausweis gesetzt ist, wird der Code als Ausweis interpretiert
|
||||||
if (!activeStudentCardId) {
|
if (!activeStudentCardId) {
|
||||||
@@ -1148,9 +1237,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
const defaultCardId = activeStudentCardId || '';
|
const defaultCardId = activeStudentCardId || '';
|
||||||
const cardId = (window.prompt('Bitte Schülerausweis-ID eingeben:', defaultCardId) || '').trim().toUpperCase();
|
const cardId = (window.prompt('Bitte Bibliotheksausweis-ID eingeben:', defaultCardId) || '').trim().toUpperCase();
|
||||||
if (!cardId) {
|
if (!cardId) {
|
||||||
alert('Ausleihe abgebrochen: Für Bibliotheksmedien ist eine gültige Schülerausweis-ID erforderlich.');
|
alert('Ausleihe abgebrochen: Für Bibliotheksmedien ist eine gültige Bibliotheksausweis-ID erforderlich.');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1361,7 +1450,7 @@
|
|||||||
if (modeSelect) {
|
if (modeSelect) {
|
||||||
modeSelect.addEventListener('change', () => {
|
modeSelect.addEventListener('change', () => {
|
||||||
if (modeSelect.value === 'quick_toggle' && !activeStudentCardId) {
|
if (modeSelect.value === 'quick_toggle' && !activeStudentCardId) {
|
||||||
setScanStatus('Schnellmodus: zuerst Schülerausweis scannen.', 'warn');
|
setScanStatus('Schnellmodus: zuerst Bibliotheksausweis scannen.', 'warn');
|
||||||
} else if (modeSelect.value === 'card_only') {
|
} else if (modeSelect.value === 'card_only') {
|
||||||
setScanStatus('Nur Ausweis-Modus aktiv.', 'warn');
|
setScanStatus('Nur Ausweis-Modus aktiv.', 'warn');
|
||||||
}
|
}
|
||||||
@@ -1434,111 +1523,30 @@
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const manualReturnBtn = document.getElementById('manualReturnBtn');
|
const manualActionBtn = document.getElementById('manualActionBtn');
|
||||||
const manualItemCode = document.getElementById('manualItemCode');
|
const manualItemCode = document.getElementById('manualItemCode');
|
||||||
if (manualReturnBtn && manualItemCode) {
|
|
||||||
manualReturnBtn.addEventListener('click', async () => {
|
if (manualActionBtn && manualItemCode) {
|
||||||
|
manualActionBtn.addEventListener('click', () => {
|
||||||
const code = (manualItemCode.value || '').trim();
|
const code = (manualItemCode.value || '').trim();
|
||||||
if (!code) {
|
if (!code) {
|
||||||
alert('Bitte einen Mediencode eingeben.');
|
alert('Bitte einen Code eingeben.');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
await returnByCode(code);
|
|
||||||
|
// Leitet den manuellen Code an die zentrale Logik weiter,
|
||||||
|
// die prüft, welcher Modus im Dropdown aktiv ist.
|
||||||
|
handleScanSuccess(code);
|
||||||
|
|
||||||
|
// Feld nach Eingabe leeren, um direkt den nächsten Code bereitzuhaben
|
||||||
|
manualItemCode.value = '';
|
||||||
});
|
});
|
||||||
}
|
|
||||||
|
|
||||||
const editForm = document.getElementById('editLibraryForm');
|
// Optional: Auch auf "Enter" im Textfeld reagieren
|
||||||
if (editForm) {
|
manualItemCode.addEventListener('keypress', (e) => {
|
||||||
editForm.addEventListener('submit', async function (e) {
|
if (e.key === 'Enter') {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
manualActionBtn.click();
|
||||||
const itemId = document.getElementById('editLibraryItemId').value;
|
|
||||||
const currentItem = libraryItems.find(i => i._id === itemId);
|
|
||||||
if (!currentItem) return;
|
|
||||||
|
|
||||||
const codeInputs = Array.from(document.querySelectorAll('#editLibraryCodesContainer input[data-item-id]'));
|
|
||||||
|
|
||||||
// Daten aus dem Formular sammeln
|
|
||||||
const sharedPayload = {
|
|
||||||
name: document.getElementById('editLibraryName').value,
|
|
||||||
item_type: document.getElementById('editLibraryType').value,
|
|
||||||
isbn: document.getElementById('editLibraryIsbn').value,
|
|
||||||
ort: document.getElementById('editLibraryLocation').value,
|
|
||||||
beschreibung: document.getElementById('editLibraryDescription').value,
|
|
||||||
ansch_jahr: currentItem.Anschaffungsjahr || '',
|
|
||||||
ansch_kost: currentItem.Anschaffungskosten || '',
|
|
||||||
reservierbar: currentItem.Reservierbar !== false,
|
|
||||||
};
|
|
||||||
|
|
||||||
const codeByItemId = new Map(codeInputs.map(input => [input.dataset.itemId, (input.value || '').trim()]));
|
|
||||||
const groupMembers = editLibraryState.groupMembers.length > 0 ? editLibraryState.groupMembers : [currentItem];
|
|
||||||
const isGroupedEdit = Boolean(currentItem.SeriesGroupId) && groupMembers.length > 1;
|
|
||||||
|
|
||||||
// API-Aufruf
|
|
||||||
try {
|
|
||||||
if (isGroupedEdit) {
|
|
||||||
const payload = {
|
|
||||||
series_group_id: currentItem.SeriesGroupId,
|
|
||||||
...sharedPayload,
|
|
||||||
items: groupMembers.map(member => ({
|
|
||||||
id: member._id,
|
|
||||||
code_4: codeByItemId.get(member._id) || ''
|
|
||||||
}))
|
|
||||||
};
|
|
||||||
|
|
||||||
const response = await fetch('/update_group', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
'X-CSRFToken': '{{ csrf_token }}',
|
|
||||||
'X-CSRF-Token': '{{ csrf_token }}'
|
|
||||||
},
|
|
||||||
body: JSON.stringify(payload)
|
|
||||||
});
|
|
||||||
|
|
||||||
const result = await response.json();
|
|
||||||
if (response.ok && result.success) {
|
|
||||||
alert(result.message || 'Gruppe erfolgreich aktualisiert!');
|
|
||||||
closeEditLibraryModal();
|
|
||||||
pagingState.loading = false;
|
|
||||||
await loadLibraryItems();
|
|
||||||
} else {
|
|
||||||
alert(result.message || 'Fehler beim Speichern der Gruppenänderungen.');
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
const primaryCodeInput = codeInputs[0];
|
|
||||||
const payload = {
|
|
||||||
name: sharedPayload.name,
|
|
||||||
item_type: sharedPayload.item_type,
|
|
||||||
isbn: sharedPayload.isbn,
|
|
||||||
code_4: primaryCodeInput ? primaryCodeInput.value.trim() : (currentItem.Code_4 || currentItem.Code4 || '').trim(),
|
|
||||||
ort: sharedPayload.ort,
|
|
||||||
beschreibung: sharedPayload.beschreibung
|
|
||||||
};
|
|
||||||
|
|
||||||
const response = await fetch(`/api/library_item/${itemId}/update`, {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
'X-CSRFToken': '{{ csrf_token }}',
|
|
||||||
'X-CSRF-Token': '{{ csrf_token }}'
|
|
||||||
},
|
|
||||||
body: JSON.stringify(payload)
|
|
||||||
});
|
|
||||||
|
|
||||||
const result = await response.json();
|
|
||||||
if (response.ok && result.ok) {
|
|
||||||
alert(result.message || 'Medium erfolgreich aktualisiert!');
|
|
||||||
closeEditLibraryModal();
|
|
||||||
pagingState.loading = false;
|
|
||||||
await loadLibraryItems();
|
|
||||||
} else {
|
|
||||||
alert(result.message || 'Fehler beim Speichern der Änderungen.');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Update failed:', error);
|
|
||||||
alert('Netzwerkfehler beim Aktualisieren des Mediums.');
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -1560,58 +1568,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function renderLibraryGroupCodeFields(groupMembers, currentItemId) {
|
|
||||||
const codesContainer = document.getElementById('editLibraryCodesContainer');
|
|
||||||
const groupWarning = document.getElementById('editLibraryGroupWarning');
|
|
||||||
const groupCount = document.getElementById('editLibraryGroupCount');
|
|
||||||
const groupHint = document.getElementById('editLibraryGroupHint');
|
|
||||||
|
|
||||||
if (!codesContainer) return;
|
|
||||||
|
|
||||||
const items = Array.isArray(groupMembers) ? groupMembers.slice() : [];
|
|
||||||
items.sort((a, b) => (a.SeriesPosition || 0) - (b.SeriesPosition || 0) || String(a.Name || '').localeCompare(String(b.Name || '')));
|
|
||||||
|
|
||||||
editLibraryState.groupMembers = items;
|
|
||||||
|
|
||||||
if (groupWarning) {
|
|
||||||
groupWarning.style.display = items.length > 1 ? 'block' : 'none';
|
|
||||||
}
|
|
||||||
if (groupCount) {
|
|
||||||
const totalCount = items.length || 1;
|
|
||||||
const declaredCount = items[0]?.SeriesCount || totalCount;
|
|
||||||
groupCount.textContent = `${totalCount} / ${declaredCount}`;
|
|
||||||
}
|
|
||||||
if (groupHint) {
|
|
||||||
groupHint.textContent = items.length > 1
|
|
||||||
? 'Jeder Code gehört zu einem eigenen Exemplar. Änderungen werden für alle Codes gespeichert.'
|
|
||||||
: 'Einzelnes Exemplar. Der Code wird direkt gespeichert.';
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!items.length) {
|
|
||||||
codesContainer.innerHTML = '<div style="padding:10px 0; color:#6b7280;">Keine Codes geladen.</div>';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
codesContainer.innerHTML = items.map((member, index) => {
|
|
||||||
const codeValue = member.Code_4 || member.Code4 || '';
|
|
||||||
const labelParts = [];
|
|
||||||
if (member.SeriesPosition !== undefined && member.SeriesPosition !== null) {
|
|
||||||
labelParts.push(`Exemplar ${member.SeriesPosition}`);
|
|
||||||
} else {
|
|
||||||
labelParts.push(`Exemplar ${index + 1}`);
|
|
||||||
}
|
|
||||||
if (member._id === currentItemId) {
|
|
||||||
labelParts.push('aktuelles Medium');
|
|
||||||
}
|
|
||||||
return `
|
|
||||||
<div style="display:flex; flex-direction:column; gap:6px; margin-bottom:10px;">
|
|
||||||
<label for="editLibraryCode-${member._id}" style="font-weight:600; font-size:0.9em; color:var(--ui-text);">${escapeHtml(labelParts.join(' · '))}</label>
|
|
||||||
<input id="editLibraryCode-${member._id}" data-item-id="${escapeHtml(member._id)}" value="${escapeHtml(codeValue)}" placeholder="Mediencode" style="width:100%; padding:8px 10px; border:1px solid #d0d7e2; border-radius:6px;">
|
|
||||||
</div>
|
|
||||||
`;
|
|
||||||
}).join('');
|
|
||||||
}
|
|
||||||
|
|
||||||
function openEditLibraryItem(itemId) {
|
function openEditLibraryItem(itemId) {
|
||||||
window.location.href = `/item_edit/${itemId}`;
|
window.location.href = `/item_edit/${itemId}`;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -819,7 +819,7 @@
|
|||||||
flex: 0 0 auto;
|
flex: 0 0 auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ausleihen, .edit-button, .delete-button, .details-button, .duplicate-button, .schedule-button, .damage-button {
|
.ausleihen, .edit-button, .delete-button, .details-button, .schedule-button, .damage-button {
|
||||||
padding: 10px 18px;
|
padding: 10px 18px;
|
||||||
border: none;
|
border: none;
|
||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
@@ -942,27 +942,6 @@
|
|||||||
box-shadow: 0 2px 4px rgba(23, 162, 184, 0.3);
|
box-shadow: 0 2px 4px rgba(23, 162, 184, 0.3);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Duplicate Button */
|
|
||||||
.duplicate-button {
|
|
||||||
background-color: #6f42c1;
|
|
||||||
color: white;
|
|
||||||
border: 2px solid #6f42c1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.duplicate-button:hover {
|
|
||||||
background-color: #5a32a3;
|
|
||||||
border-color: #4e2a8e;
|
|
||||||
transform: translateY(-1px);
|
|
||||||
box-shadow: 0 4px 8px rgba(111, 66, 193, 0.3);
|
|
||||||
color: white;
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.duplicate-button:active {
|
|
||||||
transform: translateY(0);
|
|
||||||
box-shadow: 0 2px 4px rgba(111, 66, 193, 0.3);
|
|
||||||
}
|
|
||||||
|
|
||||||
.damage-button {
|
.damage-button {
|
||||||
background-color: #fd7e14;
|
background-color: #fd7e14;
|
||||||
color: white;
|
color: white;
|
||||||
@@ -1645,7 +1624,7 @@
|
|||||||
gap: 10px !important;
|
gap: 10px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ausleihen, .edit-button, .delete-button, .details-button, .duplicate-button, .schedule-button {
|
.ausleihen, .edit-button, .delete-button, .details-button, .schedule-button {
|
||||||
width: 100% !important;
|
width: 100% !important;
|
||||||
min-height: 44px !important;
|
min-height: 44px !important;
|
||||||
padding: 12px 20px !important;
|
padding: 12px 20px !important;
|
||||||
@@ -1777,7 +1756,7 @@
|
|||||||
justify-content: flex-start;
|
justify-content: flex-start;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ausleihen, .edit-button, .delete-button, .details-button, .duplicate-button, .schedule-button {
|
.ausleihen, .edit-button, .delete-button, .details-button, .schedule-button {
|
||||||
padding: 10px 20px;
|
padding: 10px 20px;
|
||||||
font-size: 0.9rem;
|
font-size: 0.9rem;
|
||||||
min-width: 110px;
|
min-width: 110px;
|
||||||
@@ -1790,7 +1769,7 @@
|
|||||||
gap: 8px;
|
gap: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ausleihen, .edit-button, .delete-button, .details-button, .duplicate-button, .schedule-button {
|
.ausleihen, .edit-button, .delete-button, .details-button, .schedule-button {
|
||||||
padding: 8px 16px;
|
padding: 8px 16px;
|
||||||
font-size: 0.85rem;
|
font-size: 0.85rem;
|
||||||
min-width: 95px;
|
min-width: 95px;
|
||||||
@@ -1808,7 +1787,7 @@
|
|||||||
gap: 15px;
|
gap: 15px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ausleihen, .edit-button, .delete-button, .details-button, .duplicate-button, .schedule-button {
|
.ausleihen, .edit-button, .delete-button, .details-button, .schedule-button {
|
||||||
padding: 12px 24px;
|
padding: 12px 24px;
|
||||||
font-size: 1rem;
|
font-size: 1rem;
|
||||||
min-width: 120px;
|
min-width: 120px;
|
||||||
@@ -1980,7 +1959,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Standardize form and document buttons */
|
/* Standardize form and document buttons */
|
||||||
.save-button, .cancel-button, .remove-book-cover-button, .remove-duplicate-image-button,
|
.save-button, .cancel-button, .remove-book-cover-button,
|
||||||
.import-book-button, .fetch-isbn-button, .nav-back-button {
|
.import-book-button, .fetch-isbn-button, .nav-back-button {
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@@ -3465,9 +3444,6 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
{% if current_permissions.actions.get('can_edit', False) %}
|
{% if current_permissions.actions.get('can_edit', False) %}
|
||||||
<button class="edit-button" onclick="openEditModalForSelectedUnit('${item._id}', 'specific-item-card-${item._id}')">Bearbeiten</button>
|
<button class="edit-button" onclick="openEditModalForSelectedUnit('${item._id}', 'specific-item-card-${item._id}')">Bearbeiten</button>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if current_permissions.actions.get('can_insert', False) %}
|
|
||||||
<button class="duplicate-button" onclick="duplicateItem('${item._id}')">Duplizieren</button>
|
|
||||||
{% endif %}
|
|
||||||
{% if current_permissions.pages.get('admin_school_settings', False) %}
|
{% if current_permissions.pages.get('admin_school_settings', False) %}
|
||||||
${canScheduleItem ? `<button class="schedule-button" onclick="openScheduleModal('${item._id}')">Reservieren</button>` : ''}
|
${canScheduleItem ? `<button class="schedule-button" onclick="openScheduleModal('${item._id}')">Reservieren</button>` : ''}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
@@ -4244,7 +4220,6 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
: `<button class="ausleihen disabled-button" disabled>Ausgeliehen</button>`
|
: `<button class="ausleihen disabled-button" disabled>Ausgeliehen</button>`
|
||||||
}
|
}
|
||||||
<button class="edit-button" onclick="openEditModalForSelectedUnit('${item._id}', 'specific-item-modal-${item._id}')">Bearbeiten</button>
|
<button class="edit-button" onclick="openEditModalForSelectedUnit('${item._id}', 'specific-item-modal-${item._id}')">Bearbeiten</button>
|
||||||
<button class="duplicate-button" onclick="duplicateItem('${item._id}')">Duplizieren</button>
|
|
||||||
${damageReports && damageReports.length > 0 ? `<button class="damage-button" onclick="markDamageAsRepaired('${item._id}')">Repariert</button>` : `<button class="damage-button" onclick="registerDamage('${item._id}')">Schaden melden</button>`}
|
${damageReports && damageReports.length > 0 ? `<button class="damage-button" onclick="markDamageAsRepaired('${item._id}')">Repariert</button>` : `<button class="damage-button" onclick="registerDamage('${item._id}')">Schaden melden</button>`}
|
||||||
${canScheduleItem ? `<button class="schedule-button" onclick="openScheduleModal('${item._id}')">Reservieren</button>` : ''}
|
${canScheduleItem ? `<button class="schedule-button" onclick="openScheduleModal('${item._id}')">Reservieren</button>` : ''}
|
||||||
<form method="POST" action="/delete_item/${item._id}" style="display:inline;" onsubmit="return confirm('Sind Sie sicher?')">
|
<form method="POST" action="/delete_item/${item._id}" style="display:inline;" onsubmit="return confirm('Sind Sie sicher?')">
|
||||||
@@ -5044,55 +5019,6 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Duplication function
|
|
||||||
function duplicateItem(itemId) {
|
|
||||||
// Show loading indicator
|
|
||||||
const loadingDiv = document.createElement('div');
|
|
||||||
loadingDiv.innerHTML = `
|
|
||||||
<div style="position: fixed; top: 0; left: 0; width: 100%; height: 100%;
|
|
||||||
background: rgba(0,0,0,0.5); z-index: 10000; display: flex;
|
|
||||||
align-items: center; justify-content: center;">
|
|
||||||
<div class="modal-dialog-white">
|
|
||||||
<div>Element wird dupliziert...</div>
|
|
||||||
<div class="modal-content-margin">
|
|
||||||
<div class="spinner"></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
`;
|
|
||||||
document.body.appendChild(loadingDiv);
|
|
||||||
|
|
||||||
// Create form data for the duplicate_item request
|
|
||||||
const formData = new FormData();
|
|
||||||
formData.append('original_item_id', itemId);
|
|
||||||
|
|
||||||
// Send duplication request to get item data
|
|
||||||
fetch('/duplicate_item', {
|
|
||||||
method: 'POST',
|
|
||||||
body: formData
|
|
||||||
})
|
|
||||||
.then(response => response.json())
|
|
||||||
.then(data => {
|
|
||||||
document.body.removeChild(loadingDiv);
|
|
||||||
|
|
||||||
if (data.success) {
|
|
||||||
// Store duplication data in sessionStorage for the upload page
|
|
||||||
sessionStorage.setItem('duplicateItemData', JSON.stringify(data.item_data));
|
|
||||||
|
|
||||||
// Redirect to upload admin page
|
|
||||||
window.location.href = '/upload_admin?duplicate=true';
|
|
||||||
} else {
|
|
||||||
alert('Fehler beim Duplizieren: ' + (data.message || 'Unbekannter Fehler'));
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.catch(error => {
|
|
||||||
document.body.removeChild(loadingDiv);
|
|
||||||
console.error('Error duplicating item:', error);
|
|
||||||
alert('Fehler beim Duplizieren des Elements. Bitte versuchen Sie es erneut.');
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Helper functions for appointment display
|
// Helper functions for appointment display
|
||||||
function formatAppointmentDate(dateString) {
|
function formatAppointmentDate(dateString) {
|
||||||
if (!dateString) return '';
|
if (!dateString) return '';
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<title>Schülerausweis - Barcode PDF Download</title>
|
<title>Bibliotheksausweis - Barcode PDF Download</title>
|
||||||
<style>
|
<style>
|
||||||
* {
|
* {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
@@ -123,7 +123,7 @@
|
|||||||
<body>
|
<body>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="icon">📇</div>
|
<div class="icon">📇</div>
|
||||||
<h1>Schülerausweis-Download</h1>
|
<h1>Bibliotheksausweis-Download</h1>
|
||||||
<p>Generieren Sie eine PDF mit Barcodes aller Bibliotheksausweise zum direkten Drucken</p>
|
<p>Generieren Sie eine PDF mit Barcodes aller Bibliotheksausweise zum direkten Drucken</p>
|
||||||
|
|
||||||
<div class="info-box">
|
<div class="info-box">
|
||||||
|
|||||||
@@ -249,7 +249,7 @@
|
|||||||
|
|
||||||
<!-- Add/Edit Form -->
|
<!-- Add/Edit Form -->
|
||||||
<div class="student-card-form">
|
<div class="student-card-form">
|
||||||
<h2>{% if edit_mode %}Ausweis bearbeiten{% else %}Neuer Schülerausweis{% endif %}</h2>
|
<h2>{% if edit_mode %}Ausweis bearbeiten{% else %}Neuer Bibliotheksausweis{% endif %}</h2>
|
||||||
|
|
||||||
<form method="POST" action="{{ url_for('student_cards_admin') }}">
|
<form method="POST" action="{{ url_for('student_cards_admin') }}">
|
||||||
{% if edit_mode %}
|
{% if edit_mode %}
|
||||||
|
|||||||
@@ -11,59 +11,6 @@
|
|||||||
{% block title %}{{ page_title|default('Artikel hochladen') }} - Inventarsystem{% endblock %}
|
{% block title %}{{ page_title|default('Artikel hochladen') }} - Inventarsystem{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
{% if duplicate_data and duplicate_data.images %}
|
|
||||||
<!-- Hidden server-side values for duplication, will be processed by JavaScript -->
|
|
||||||
<div id="server-duplicate-data"
|
|
||||||
data-name="{{ duplicate_data.name|default('') }}"
|
|
||||||
data-description="{{ duplicate_data.description|default('') }}"
|
|
||||||
data-location="{{ duplicate_data.location|default('') }}"
|
|
||||||
data-room="{{ duplicate_data.room|default('') }}"
|
|
||||||
data-year="{{ duplicate_data.year|default('') }}"
|
|
||||||
data-cost="{{ duplicate_data.cost|default('') }}"
|
|
||||||
data-images="{{ duplicate_data.images|tojson|safe }}"
|
|
||||||
data-filter1="{{ duplicate_data.filter1|tojson|safe if duplicate_data.filter1 else '[]' }}"
|
|
||||||
data-filter2="{{ duplicate_data.filter2|tojson|safe if duplicate_data.filter2 else '[]' }}"
|
|
||||||
data-filter3="{{ duplicate_data.filter3|tojson|safe if duplicate_data.filter3 else '[]' }}"
|
|
||||||
data-original-id="{{ duplicate_data.original_id|default('') }}"
|
|
||||||
style="display:none;">
|
|
||||||
</div>
|
|
||||||
<script>
|
|
||||||
// Pre-initialize duplicate data from server
|
|
||||||
var serverDuplicateData = null;
|
|
||||||
const dataElement = document.getElementById('server-duplicate-data');
|
|
||||||
if (dataElement) {
|
|
||||||
// Safely parse JSON arrays with error handling
|
|
||||||
function safeJsonParse(jsonStr, defaultValue = []) {
|
|
||||||
try {
|
|
||||||
if (!jsonStr) return defaultValue;
|
|
||||||
return JSON.parse(jsonStr);
|
|
||||||
} catch (e) {
|
|
||||||
console.error("Error parsing JSON:", e, "Value was:", jsonStr);
|
|
||||||
return defaultValue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get images data and log it for debugging
|
|
||||||
const imagesData = dataElement.getAttribute('data-images') || "[]";
|
|
||||||
console.log("Raw images data attribute:", imagesData);
|
|
||||||
|
|
||||||
serverDuplicateData = {
|
|
||||||
name: dataElement.getAttribute('data-name') || "",
|
|
||||||
description: dataElement.getAttribute('data-description') || "",
|
|
||||||
location: dataElement.getAttribute('data-location') || "",
|
|
||||||
room: dataElement.getAttribute('data-room') || "",
|
|
||||||
year: dataElement.getAttribute('data-year') || "",
|
|
||||||
cost: dataElement.getAttribute('data-cost') || "",
|
|
||||||
images: safeJsonParse(imagesData),
|
|
||||||
filter1: safeJsonParse(dataElement.getAttribute('data-filter1')),
|
|
||||||
filter2: safeJsonParse(dataElement.getAttribute('data-filter2')),
|
|
||||||
filter3: safeJsonParse(dataElement.getAttribute('data-filter3')),
|
|
||||||
original_id: dataElement.getAttribute('data-original-id') || ""
|
|
||||||
};
|
|
||||||
console.log("Server-provided duplicate data:", serverDuplicateData);
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
/* Book information display styles */
|
/* Book information display styles */
|
||||||
@@ -296,38 +243,11 @@
|
|||||||
color: #721c24 !important;
|
color: #721c24 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Duplicate code popup styling */
|
|
||||||
.popup-overlay {
|
|
||||||
position: fixed;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
background-color: rgba(0, 0, 0, 0.6);
|
|
||||||
z-index: 10000;
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
animation: overlayFadeIn 0.3s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes overlayFadeIn {
|
@keyframes overlayFadeIn {
|
||||||
from { opacity: 0; }
|
from { opacity: 0; }
|
||||||
to { opacity: 1; }
|
to { opacity: 1; }
|
||||||
}
|
}
|
||||||
|
|
||||||
.duplicate-code-popup {
|
|
||||||
background-color: white;
|
|
||||||
padding: 30px;
|
|
||||||
border-radius: 8px;
|
|
||||||
box-shadow: 0 5px 20px rgba(0, 0, 0, 0.3);
|
|
||||||
max-width: 500px;
|
|
||||||
width: 90%;
|
|
||||||
text-align: center;
|
|
||||||
position: relative;
|
|
||||||
animation: popupSlideIn 0.3s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes popupSlideIn {
|
@keyframes popupSlideIn {
|
||||||
from {
|
from {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
@@ -2049,34 +1969,6 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle duplication data if available (from sessionStorage or server)
|
|
||||||
if (typeof prefillFormWithDuplicateData === 'function') {
|
|
||||||
setTimeout(() => {
|
|
||||||
prefillFormWithDuplicateData();
|
|
||||||
}, 500); // Wait for all dropdowns to load
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// Initialize duplication data - handle both server-side and sessionStorage data
|
|
||||||
let duplicateData = null;
|
|
||||||
|
|
||||||
// First check if serverDuplicateData is defined by the script above
|
|
||||||
if (typeof serverDuplicateData !== 'undefined' && serverDuplicateData) {
|
|
||||||
console.log("Using server-provided duplicateData:", serverDuplicateData);
|
|
||||||
duplicateData = serverDuplicateData;
|
|
||||||
|
|
||||||
// Ensure images is properly handled as an array
|
|
||||||
if (duplicateData.images) {
|
|
||||||
if (typeof duplicateData.images === 'string') {
|
|
||||||
try {
|
|
||||||
duplicateData.images = JSON.parse(duplicateData.images);
|
|
||||||
} catch (e) {
|
|
||||||
console.error("Error parsing duplicate images array:", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
console.log("Parsed duplicate images successfully.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
Reference in New Issue
Block a user