Compare commits
44 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e9b4cf0c25 | |||
| 99ec28f329 | |||
| 057c517515 | |||
| cfec33b362 | |||
| fb29fb91a9 | |||
| c3db2d9c6b | |||
| edc7b72a8f | |||
| cdf7b9c45d | |||
| 5ba0944faf | |||
| 37f514af15 | |||
| 152a3ab135 | |||
| c2c5054814 | |||
| e058bd5f46 | |||
| d58958db39 | |||
| 9452743660 | |||
| 6a3865ef24 | |||
| 96d45710ac | |||
| dd3d8649a7 | |||
| 1af2a2be06 | |||
| 8e5e434116 | |||
| 2f9a93ee65 | |||
| 91467a1e76 | |||
| 3840348a2d | |||
| cdb7319c56 | |||
| 08bea97f0f | |||
| 9164cd030d | |||
| 9227392787 | |||
| 4917c22ae3 | |||
| a2f2dd5a9e | |||
| faf270ff93 | |||
| beeb562ac4 | |||
| 0199957545 | |||
| a518adb054 | |||
| 6a94d50d28 | |||
| c90cef6dcf | |||
| b5451a4ef0 | |||
| a4afef8283 | |||
| b2951eed6c | |||
| 9a37c047c1 | |||
| 7290fb4ed1 | |||
| ee9ef3df6f | |||
| 9f3799a77f | |||
| e9006f5a07 | |||
| a11bce17c5 |
+484
-166
@@ -27,6 +27,10 @@ import os
|
|||||||
import sys
|
import sys
|
||||||
from bs4 import BeautifulSoup
|
from bs4 import BeautifulSoup
|
||||||
from gridfs import GridFS
|
from gridfs import GridFS
|
||||||
|
import string
|
||||||
|
from reportlab.lib.pagesizes import A4
|
||||||
|
from reportlab.pdfgen import canvas
|
||||||
|
from reportlab.lib import colors
|
||||||
|
|
||||||
# Ensure imports work regardless of whether gunicorn starts in /app or /app/Web.
|
# Ensure imports work regardless of whether gunicorn starts in /app or /app/Web.
|
||||||
_CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
|
_CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||||
@@ -46,7 +50,7 @@ import Web.modules.inventarsystem.pdf_export as pdf_export
|
|||||||
import Web.modules.inventarsystem.excel_export as excel_export
|
import Web.modules.inventarsystem.excel_export as excel_export
|
||||||
import datetime
|
import datetime
|
||||||
from apscheduler.schedulers.background import BackgroundScheduler
|
from apscheduler.schedulers.background import BackgroundScheduler
|
||||||
from bson.objectid import ObjectId
|
from bson.objectid import ObjectId, InvalidId
|
||||||
from urllib.parse import urlparse, urlunparse
|
from urllib.parse import urlparse, urlunparse
|
||||||
import requests
|
import requests
|
||||||
import csv
|
import csv
|
||||||
@@ -462,15 +466,36 @@ PERMISSION_ACTION_ENDPOINTS = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ALLOWED_COVER_DOMAINS = {
|
ALLOWED_COVER_DOMAINS = {
|
||||||
|
# --- Google / Open APIs ---
|
||||||
"books.google.com",
|
"books.google.com",
|
||||||
"covers.openlibrary.org",
|
"www.googleapis.com",
|
||||||
"images-na.ssl-images-amazon.com",
|
|
||||||
"m.media-amazon.com",
|
# --- Open Library / Internet Archive ---
|
||||||
"www.isbn.de",
|
|
||||||
"covers.openlibrary.org",
|
"covers.openlibrary.org",
|
||||||
"openlibrary.org",
|
"openlibrary.org",
|
||||||
|
|
||||||
|
# --- Amazon / Goodreads ---
|
||||||
|
"images-na.ssl-images-amazon.com",
|
||||||
|
"m.media-amazon.com",
|
||||||
|
"i.gr-assets.com", # Goodreads image CDN
|
||||||
|
|
||||||
|
# --- Library / Catalog Services ---
|
||||||
|
"www.isbn.de",
|
||||||
"lobid.org",
|
"lobid.org",
|
||||||
"www.googleapis.com"
|
"syndetics.com", # Standard cover provider for libraries
|
||||||
|
"pics.librarything.com", # LibraryThing covers
|
||||||
|
"portal.dnb.de", # Deutsche Nationalbibliothek
|
||||||
|
|
||||||
|
# --- German Educational & International Publishers ---
|
||||||
|
"www.westermann.de",
|
||||||
|
"www.klett.de", # Ernst Klett Verlag
|
||||||
|
"medien.klett.de", # Klett media CDN
|
||||||
|
"www.cornelsen.de", # Cornelsen Verlag
|
||||||
|
"images.penguinrandomhouse.com", # Penguin Random House
|
||||||
|
|
||||||
|
# --- Book Retailer CDNs (often used for cover fetching) ---
|
||||||
|
"images.thalia.media", # Thalia
|
||||||
|
"bilder.buecher.de" # buecher.de
|
||||||
}
|
}
|
||||||
|
|
||||||
SENSITIVE_AUDIT_FIELDS = ["email", "username", "full_name", "phone", "borrower", "ip"]
|
SENSITIVE_AUDIT_FIELDS = ["email", "username", "full_name", "phone", "borrower", "ip"]
|
||||||
@@ -3313,7 +3338,7 @@ def api_library_items():
|
|||||||
ausleihungen_db = db['ausleihungen']
|
ausleihungen_db = db['ausleihungen']
|
||||||
|
|
||||||
query = {
|
query = {
|
||||||
'ItemType': {'$in': ['book', 'cd', 'dvd', 'schoolbook', 'schulbuch', 'Buch', 'Schulbuch']},
|
'ItemType': {'$in': ['book', 'cd', 'CD', 'DVD', 'dvd', 'schoolbook', 'schulbuch', 'Buch', 'Schulbuch']},
|
||||||
'IsGroupedSubItem': {'$ne': True},
|
'IsGroupedSubItem': {'$ne': True},
|
||||||
'Deleted': {'$ne': True}
|
'Deleted': {'$ne': True}
|
||||||
}
|
}
|
||||||
@@ -3788,6 +3813,7 @@ def api_item_detail(item_id):
|
|||||||
<h2>{html.escape(str(item.get('Name', 'Untitled')))}</h2>
|
<h2>{html.escape(str(item.get('Name', 'Untitled')))}</h2>
|
||||||
<p><strong>ISBN:</strong> {html.escape(str(item.get('ISBN', item.get('Code4', '-'))))}</p>
|
<p><strong>ISBN:</strong> {html.escape(str(item.get('ISBN', item.get('Code4', '-'))))}</p>
|
||||||
<p><strong>Anzahl:</strong> {html.escape(str(item.get('SeriesCount', '-')))}</p>
|
<p><strong>Anzahl:</strong> {html.escape(str(item.get('SeriesCount', '-')))}</p>
|
||||||
|
<p><strong>Code:</strong> {html.escape(str(item.get('Code_4', '-')))}</p>
|
||||||
<p><strong>Ort:</strong> {html.escape(str(item.get('Ort', '-')))}</p>
|
<p><strong>Ort:</strong> {html.escape(str(item.get('Ort', '-')))}</p>
|
||||||
<p><strong>Typ:</strong> {html.escape(str(item.get('ItemType', '-')))}</p>
|
<p><strong>Typ:</strong> {html.escape(str(item.get('ItemType', '-')))}</p>
|
||||||
<p><strong>Kategorie:</strong> {html.escape(str(item.get('library_category', '-')))}</p>
|
<p><strong>Kategorie:</strong> {html.escape(str(item.get('library_category', '-')))}</p>
|
||||||
@@ -5529,10 +5555,10 @@ def upload_item():
|
|||||||
app.logger.info(f"Starting image upload session {upload_session_id} - Files: {len(images)}, User: {encrypt_text(username)}")
|
app.logger.info(f"Starting image upload session {upload_session_id} - Files: {len(images)}, User: {encrypt_text(username)}")
|
||||||
|
|
||||||
for index, image in enumerate(images):
|
for index, image in enumerate(images):
|
||||||
if upload_mode == 'library':
|
#if upload_mode == 'library':
|
||||||
app.logger.info(f"[Upload {upload_session_id}] Skipping manual upload (Library Mode)")
|
# app.logger.info(f"[Upload {upload_session_id}] Skipping manual upload (Library Mode)")
|
||||||
skipped_count += 1
|
# skipped_count += 1
|
||||||
continue
|
# continue
|
||||||
|
|
||||||
if not image or not image.filename:
|
if not image or not image.filename:
|
||||||
skipped_count += 1
|
skipped_count += 1
|
||||||
@@ -5780,7 +5806,7 @@ def upload_item():
|
|||||||
app.logger.warning('Audit write failed for library_item_created')
|
app.logger.warning('Audit write failed for library_item_created')
|
||||||
|
|
||||||
flash(success_msg, 'success')
|
flash(success_msg, 'success')
|
||||||
return redirect(url_for(success_redirect_endpoint, highlight_item=str(item_id)))
|
return redirect(url_for(success_redirect_endpoint))
|
||||||
else:
|
else:
|
||||||
error_msg = 'Fehler beim Hinzufügen des Elements'
|
error_msg = 'Fehler beim Hinzufügen des Elements'
|
||||||
if is_mobile:
|
if is_mobile:
|
||||||
@@ -6211,142 +6237,182 @@ def bulk_delete_items():
|
|||||||
if client:
|
if client:
|
||||||
client.close()
|
client.close()
|
||||||
|
|
||||||
|
@app.route('/item_edit/<id>', methods=['GET', 'POST'])
|
||||||
@app.route('/edit_item/<id>', methods=['POST'])
|
def item_edit(id):
|
||||||
def edit_item(id):
|
|
||||||
"""
|
|
||||||
Route for editing an existing inventory item.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
id (str): ID of the item to edit
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
flask.Response: Redirect to admin homepage with status message
|
|
||||||
"""
|
|
||||||
if 'username' not in session:
|
if 'username' not in session:
|
||||||
flash('Nicht angemeldet.', 'error')
|
if request.method == 'POST' and request.is_json:
|
||||||
|
return jsonify({'success': False, 'message': 'Nicht angemeldet.'}), 401
|
||||||
|
flash('Bitte melden Sie sich an.', 'error')
|
||||||
return redirect(url_for('login'))
|
return redirect(url_for('login'))
|
||||||
|
|
||||||
current_permissions = us.get_effective_permissions(session['username'])
|
current_permissions = us.get_effective_permissions(session['username'])
|
||||||
|
|
||||||
if not current_permissions['actions'].get('can_edit', False):
|
if not current_permissions['actions'].get('can_edit', False):
|
||||||
flash('Ihnen fehlen die nötigen Berechtigungen, um diese Aktion auszuführen.', 'error')
|
if request.method == 'POST' and request.is_json:
|
||||||
|
return jsonify({'success': False, 'message': 'Keine Berechtigung zum Bearbeiten.'}), 403
|
||||||
|
flash('Keine Berechtigung zum Bearbeiten.', 'error')
|
||||||
return redirect(url_for('home_admin'))
|
return redirect(url_for('home_admin'))
|
||||||
|
|
||||||
if not cfg.MODULES.is_enabled('inventory'):
|
try:
|
||||||
flash('Bibliotheks-Modul ist deaktiviert.', 'error')
|
obj_id = ObjectId(id)
|
||||||
return redirect(url_for('library_view'))
|
except InvalidId:
|
||||||
|
flash('Ungültige Element-ID.', 'error')
|
||||||
|
return redirect(url_for('home_admin'))
|
||||||
|
|
||||||
fs = get_gridfs()
|
current_item = it.get_item(obj_id)
|
||||||
|
if not current_item:
|
||||||
|
flash('Element in der Datenbank nicht gefunden.', 'error')
|
||||||
|
return redirect(url_for('home_admin'))
|
||||||
|
|
||||||
|
# Bibliothek-Status ermitteln
|
||||||
|
library_module_active = cfg.MODULES.is_enabled('library')
|
||||||
|
is_lib_item = it.is_library_item(current_item)
|
||||||
|
show_library_features = library_module_active and is_lib_item
|
||||||
|
|
||||||
|
# -------------------------------------------------------------------
|
||||||
|
# GET METHOD
|
||||||
|
# -------------------------------------------------------------------
|
||||||
|
if request.method == 'GET':
|
||||||
|
current_item['_id'] = str(current_item['_id'])
|
||||||
|
|
||||||
|
base_code = current_item.get('Code_4', '')
|
||||||
|
individual_codes = []
|
||||||
|
if current_item.get('SeriesGroupId'):
|
||||||
|
group_ids = it.get_group_item_ids(str(current_item['_id']))
|
||||||
|
if group_ids:
|
||||||
|
for gid in group_ids:
|
||||||
|
g_item = it.get_item(gid)
|
||||||
|
c4 = g_item.get('Code_4')
|
||||||
|
if c4 and c4 != base_code:
|
||||||
|
individual_codes.append(c4)
|
||||||
|
|
||||||
|
current_item['IndividualCodes'] = '\n'.join(individual_codes)
|
||||||
|
|
||||||
|
return render_template(
|
||||||
|
'edit_library.html',
|
||||||
|
username=session['username'],
|
||||||
|
item=current_item,
|
||||||
|
show_library_features=show_library_features,
|
||||||
|
library_module_enabled=library_module_active,
|
||||||
|
page_title=f"Bearbeiten: {current_item.get('Name', '')}"
|
||||||
|
)
|
||||||
|
|
||||||
|
# -------------------------------------------------------------------
|
||||||
|
# POST METHOD
|
||||||
|
# -------------------------------------------------------------------
|
||||||
|
redirect_target = request.referrer or url_for('home_admin')
|
||||||
|
|
||||||
name = sanitize_form_value(request.form.get('name'))
|
name = sanitize_form_value(request.form.get('name'))
|
||||||
ort = sanitize_form_value(request.form.get('ort'))
|
ort = sanitize_form_value(request.form.get('ort'))
|
||||||
beschreibung = sanitize_form_value(request.form.get('beschreibung'))
|
beschreibung = sanitize_form_value(request.form.get('beschreibung'))
|
||||||
|
|
||||||
filter1 = sanitize_form_value(request.form.getlist('filter'))
|
|
||||||
filter2 = sanitize_form_value(request.form.getlist('filter2'))
|
|
||||||
filter3 = sanitize_form_value(request.form.getlist('filter3'))
|
|
||||||
|
|
||||||
# Expand special "all values" selections for predefined filters.
|
|
||||||
filter1 = expand_filter_selection(filter1, 1)
|
|
||||||
filter2 = expand_filter_selection(filter2, 2)
|
|
||||||
|
|
||||||
anschaffungs_jahr = sanitize_form_value(request.form.get('anschaffungsjahr'))
|
anschaffungs_jahr = sanitize_form_value(request.form.get('anschaffungsjahr'))
|
||||||
anschaffungs_kosten = sanitize_form_value(request.form.get('anschaffungskosten'))
|
anschaffungs_kosten = sanitize_form_value(request.form.get('anschaffungskosten'))
|
||||||
code_4 = sanitize_form_value(request.form.get('code_4'))
|
|
||||||
isbn_raw = sanitize_form_value(request.form.get('isbn', ''))
|
|
||||||
reservierbar = 'reservierbar' in request.form
|
reservierbar = 'reservierbar' in request.form
|
||||||
|
|
||||||
item_isbn = ''
|
code_4 = sanitize_form_value(request.form.get('code_4'))
|
||||||
item_type = 'general'
|
individual_codes_raw = request.form.get('individual_codes', '')
|
||||||
if cfg.MODULES.is_enabled('library'):
|
|
||||||
item_isbn = normalize_and_validate_isbn(isbn_raw)
|
|
||||||
if isbn_raw and not item_isbn:
|
|
||||||
flash('Ungültige ISBN. Bitte ISBN-10 oder ISBN-13 verwenden.', 'error')
|
|
||||||
return redirect(url_for('home_admin'))
|
|
||||||
if item_isbn:
|
|
||||||
item_type = 'book'
|
|
||||||
|
|
||||||
if code_4 and not it.is_code_unique(code_4, exclude_id=id):
|
individual_codes = []
|
||||||
flash('Der Code wird bereits verwendet. Bitte wählen Sie einen anderen Code.', 'error')
|
for c in individual_codes_raw.replace('\r', '').split('\n'):
|
||||||
return redirect(url_for('home_admin'))
|
clean_c = sanitize_form_value(c)
|
||||||
|
if clean_c and clean_c != code_4 and clean_c not in individual_codes:
|
||||||
|
individual_codes.append(clean_c)
|
||||||
|
|
||||||
current_item = it.get_item(id)
|
all_codes_to_check = [code_4] + individual_codes
|
||||||
if not current_item:
|
|
||||||
flash('Element nicht gefunden', 'error')
|
|
||||||
return redirect(url_for('home_admin'))
|
|
||||||
|
|
||||||
verfuegbar = current_item.get('Verfuegbar', True)
|
current_group_id = current_item.get('SeriesGroupId')
|
||||||
|
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
||||||
|
db_instance = client[cfg.MONGODB_DB]
|
||||||
|
items_col = db_instance['items']
|
||||||
|
|
||||||
images_to_keep = request.form.getlist('existing_images')
|
has_code_error = False
|
||||||
|
for code in all_codes_to_check:
|
||||||
|
if not code:
|
||||||
|
continue
|
||||||
|
existing = items_col.find_one({'Code_4': code, 'Deleted': {'$ne': True}})
|
||||||
|
if existing:
|
||||||
|
is_same_item = str(existing['_id']) == str(id)
|
||||||
|
is_in_same_group = current_group_id and existing.get('SeriesGroupId') == current_group_id
|
||||||
|
if not is_same_item and not is_in_same_group:
|
||||||
|
flash(f'Der Code "{code}" wird bereits von einem anderen Artikel verwendet.', 'error')
|
||||||
|
has_code_error = True
|
||||||
|
break
|
||||||
|
client.close()
|
||||||
|
|
||||||
original_images = current_item.get('Images', [])
|
if has_code_error:
|
||||||
|
return redirect(redirect_target)
|
||||||
|
|
||||||
images = [img for img in original_images if img in images_to_keep]
|
if show_library_features:
|
||||||
|
# LIBRARY ITEM: Process ISBN/Medientyp/Category, preserve existing filters
|
||||||
|
isbn_raw = sanitize_form_value(request.form.get('isbn', ''))
|
||||||
|
item_isbn = normalize_and_validate_isbn(isbn_raw) if isbn_raw else ''
|
||||||
|
item_type = sanitize_form_value(request.form.get('item_type_input', current_item.get('ItemType', 'Buch')))
|
||||||
|
library_category = sanitize_form_value(request.form.get('library_category', ''))
|
||||||
|
images = current_item.get('Images', [])
|
||||||
|
|
||||||
new_images = request.files.getlist('new_images')
|
filter1 = current_item.get('Filter', [])
|
||||||
|
filter2 = current_item.get('Filter2', [])
|
||||||
|
filter3 = current_item.get('Filter3', [])
|
||||||
|
else:
|
||||||
|
# NON-LIBRARY (INVENTORY) ITEM: Process Filter 1-3 from form
|
||||||
|
item_isbn = current_item.get('ISBN', '')
|
||||||
|
item_type = 'other'
|
||||||
|
library_category = current_item.get('library_category', '')
|
||||||
|
|
||||||
for image in new_images:
|
filter1 = expand_filter_selection(sanitize_form_value(request.form.getlist('filter')), 1)
|
||||||
if image and image.filename:
|
filter2 = expand_filter_selection(sanitize_form_value(request.form.getlist('filter2')), 2)
|
||||||
is_allowed, error_message = allowed_file(image.filename, image)
|
filter3 = sanitize_form_value(request.form.getlist('filter3'))
|
||||||
|
|
||||||
if is_allowed:
|
images_to_keep = request.form.getlist('existing_images')
|
||||||
try:
|
original_images = current_item.get('Images', [])
|
||||||
secure_name = secure_filename(image.filename)
|
images = [img for img in original_images if img in images_to_keep]
|
||||||
|
|
||||||
image.seek(0)
|
new_files = request.files.getlist('images')
|
||||||
image_bytes = image.read()
|
if new_files and new_files[0].filename != '':
|
||||||
|
fs = get_gridfs()
|
||||||
if not image_bytes:
|
for file in new_files:
|
||||||
app.logger.error(f"Failed to read image in edit_item (0 bytes) for {secure_name}")
|
if file and file.filename:
|
||||||
continue
|
is_allowed, error_msg = allowed_file(file.filename, file)
|
||||||
|
if not is_allowed:
|
||||||
optimized_io = io.BytesIO()
|
flash(error_msg, 'error')
|
||||||
with Image.open(io.BytesIO(image_bytes)) as img:
|
return redirect(redirect_target)
|
||||||
if img.mode not in ('RGB', 'RGBA'):
|
try:
|
||||||
img = img.convert('RGBA')
|
secure_name = secure_filename(file.filename)
|
||||||
|
file.seek(0)
|
||||||
max_width = 500
|
image_bytes = file.read()
|
||||||
if img.width > max_width:
|
if not image_bytes:
|
||||||
ratio = max_width / img.width
|
continue
|
||||||
new_size = (max_width, int(img.height * ratio))
|
optimized_io = io.BytesIO()
|
||||||
img = img.resize(new_size, Image.Resampling.LANCZOS)
|
with Image.open(io.BytesIO(image_bytes)) as img:
|
||||||
|
if img.mode not in ('RGB', 'RGBA'):
|
||||||
img.save(optimized_io, format='WEBP', quality=85, optimize=True)
|
img = img.convert('RGBA')
|
||||||
|
max_width = 800
|
||||||
optimized_io.seek(0)
|
if img.width > max_width:
|
||||||
new_filename = f"{uuid.uuid4().hex}_{int(time.time())}.webp"
|
ratio = max_width / img.width
|
||||||
|
img = img.resize((max_width, int(img.height * ratio)), Image.Resampling.LANCZOS)
|
||||||
fs.put(
|
img.save(optimized_io, format='WEBP', quality=85, optimize=True)
|
||||||
optimized_io,
|
optimized_io.seek(0)
|
||||||
filename=new_filename,
|
new_filename = f"{uuid.uuid4().hex}_{int(time.time())}.webp"
|
||||||
content_type='image/webp',
|
fs.put(
|
||||||
metadata={
|
optimized_io,
|
||||||
'original_filename': secure_name,
|
filename=new_filename,
|
||||||
'upload_context': 'edit_item',
|
content_type='image/webp',
|
||||||
'item_id': id
|
metadata={'original_filename': secure_name, 'item_id': str(id)}
|
||||||
}
|
)
|
||||||
)
|
images.append(new_filename)
|
||||||
|
except Exception as e:
|
||||||
images.append(new_filename)
|
app.logger.error(f"Image error for item {id}: {e}")
|
||||||
|
if ort and ort not in it.get_predefined_locations():
|
||||||
except Exception as e:
|
|
||||||
app.logger.error(f"Error processing new image in edit_item: {str(e)}")
|
|
||||||
else:
|
|
||||||
flash(error_message, 'error')
|
|
||||||
return redirect(url_for('home_admin'))
|
|
||||||
|
|
||||||
predefined_locations = it.get_predefined_locations()
|
|
||||||
if ort and ort not in predefined_locations:
|
|
||||||
it.add_predefined_location(ort)
|
it.add_predefined_location(ort)
|
||||||
|
|
||||||
result = it.update_item(
|
it.sync_group_codes(str(id), code_4, individual_codes)
|
||||||
id=id,
|
|
||||||
|
success = it.update_item(
|
||||||
|
id=str(id),
|
||||||
name=name,
|
name=name,
|
||||||
ort=ort,
|
ort=ort,
|
||||||
beschreibung=beschreibung,
|
beschreibung=beschreibung,
|
||||||
images=images,
|
images=images,
|
||||||
verfuegbar=verfuegbar,
|
verfuegbar=current_item.get('Verfuegbar', True),
|
||||||
filter1=filter1,
|
filter1=filter1,
|
||||||
filter2=filter2,
|
filter2=filter2,
|
||||||
filter3=filter3,
|
filter3=filter3,
|
||||||
@@ -6355,16 +6421,16 @@ def edit_item(id):
|
|||||||
code_4=code_4,
|
code_4=code_4,
|
||||||
reservierbar=reservierbar,
|
reservierbar=reservierbar,
|
||||||
isbn=item_isbn,
|
isbn=item_isbn,
|
||||||
item_type=item_type
|
item_type=item_type,
|
||||||
|
library_category=library_category
|
||||||
)
|
)
|
||||||
|
|
||||||
if result:
|
if success:
|
||||||
flash('Element erfolgreich aktualisiert (und ggf. Gruppe synchronisiert)', 'success')
|
flash('Artikel erfolgreich aktualisiert.', 'success')
|
||||||
else:
|
else:
|
||||||
flash('Fehler beim Aktualisieren des Elements', 'error')
|
flash('Fehler beim Aktualisieren des Artikels.', 'error')
|
||||||
|
|
||||||
return redirect(url_for('home_admin'))
|
|
||||||
|
|
||||||
|
return redirect(redirect_target)
|
||||||
|
|
||||||
@app.route('/update_group', methods=['POST'])
|
@app.route('/update_group', methods=['POST'])
|
||||||
def update_group():
|
def update_group():
|
||||||
@@ -7652,35 +7718,282 @@ def register():
|
|||||||
permission_page_options=PERMISSION_PAGE_OPTIONS
|
permission_page_options=PERMISSION_PAGE_OPTIONS
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def parse_csv_users(file_bytes):
|
||||||
|
"""
|
||||||
|
Liest CSV-Dateien extrem robust ein:
|
||||||
|
- Erkennt automatisch UTF-8, UTF-8-SIG und Latin-1 (für Excel-Umlaute).
|
||||||
|
- Erkennt automatisch das Trennzeichen (; oder , oder Tab).
|
||||||
|
- Erkennt Vor- und Nachname unabhängig von der Spaltenreihenfolge und Headernamen.
|
||||||
|
"""
|
||||||
|
# 1. Dekodierung mit Fallback für deutsche Excel-Dateien
|
||||||
|
try:
|
||||||
|
content = file_bytes.decode('utf-8-sig')
|
||||||
|
except UnicodeDecodeError:
|
||||||
|
content = file_bytes.decode('latin-1')
|
||||||
|
|
||||||
|
lines = [line.strip() for line in content.splitlines() if line.strip()]
|
||||||
|
if not lines:
|
||||||
|
return []
|
||||||
|
|
||||||
|
# 2. Trennzeichen ermitteln (; , oder \t)
|
||||||
|
first_line = lines[0]
|
||||||
|
if first_line.count(';') >= first_line.count(','):
|
||||||
|
delimiter = ';'
|
||||||
|
elif first_line.count('\t') > first_line.count(','):
|
||||||
|
delimiter = '\t'
|
||||||
|
else:
|
||||||
|
delimiter = ','
|
||||||
|
|
||||||
|
stream = io.StringIO(content, newline=None)
|
||||||
|
reader = csv.DictReader(stream, delimiter=delimiter)
|
||||||
|
|
||||||
|
parsed_users = []
|
||||||
|
|
||||||
|
# 3. Auswertung mit DictReader (wenn Header vorhanden sind)
|
||||||
|
if reader.fieldnames:
|
||||||
|
for row in reader:
|
||||||
|
# Keys normalisieren (kleingeschrieben, ohne Leerzeichen)
|
||||||
|
cleaned_row = {str(k).strip().lower(): str(v).strip() for k, v in row.items() if k and v}
|
||||||
|
|
||||||
|
# Dynamisches Mapping für Vornamen
|
||||||
|
name = (
|
||||||
|
cleaned_row.get('vorname') or
|
||||||
|
cleaned_row.get('first_name') or
|
||||||
|
cleaned_row.get('firstname') or
|
||||||
|
cleaned_row.get('name') or ''
|
||||||
|
)
|
||||||
|
|
||||||
|
# Dynamisches Mapping für Nachnamen
|
||||||
|
last_name = (
|
||||||
|
cleaned_row.get('nachname') or
|
||||||
|
cleaned_row.get('last_name') or
|
||||||
|
cleaned_row.get('lastname') or
|
||||||
|
cleaned_row.get('surname') or
|
||||||
|
cleaned_row.get('familienname') or ''
|
||||||
|
)
|
||||||
|
|
||||||
|
# Falls Header nicht erkannt wurden, aber Werte vorhanden sind (z.B. CSV ohne Header)
|
||||||
|
if not name and not last_name:
|
||||||
|
vals = [str(v).strip() for v in row.values() if v]
|
||||||
|
if len(vals) >= 2:
|
||||||
|
name, last_name = vals[0], vals[1]
|
||||||
|
|
||||||
|
if name or last_name:
|
||||||
|
parsed_users.append({'name': name, 'last_name': last_name})
|
||||||
|
else:
|
||||||
|
# Fallback für dateien ohne Header
|
||||||
|
stream.seek(0)
|
||||||
|
raw_reader = csv.reader(stream, delimiter=delimiter)
|
||||||
|
for row in raw_reader:
|
||||||
|
clean_row = [str(cell).strip() for cell in row if str(cell).strip()]
|
||||||
|
if len(clean_row) >= 2:
|
||||||
|
# Header-Zeilen überspringen
|
||||||
|
if clean_row[0].lower() in ['vorname', 'first_name', 'name'] and clean_row[1].lower() in ['nachname', 'last_name']:
|
||||||
|
continue
|
||||||
|
parsed_users.append({'name': clean_row[0], 'last_name': clean_row[1]})
|
||||||
|
|
||||||
|
return parsed_users
|
||||||
|
|
||||||
|
def generate_compliant_password(length=16):
|
||||||
|
lowers = string.ascii_lowercase
|
||||||
|
uppers = string.ascii_uppercase
|
||||||
|
digits = string.digits
|
||||||
|
symbols = "!@#$%^&*()_+~|}{[]:;?><,.-="
|
||||||
|
|
||||||
|
# Ensure at least one character from each required category
|
||||||
|
pwd = [
|
||||||
|
secrets.choice(lowers),
|
||||||
|
secrets.choice(uppers),
|
||||||
|
secrets.choice(digits),
|
||||||
|
secrets.choice(symbols)
|
||||||
|
]
|
||||||
|
all_chars = lowers + uppers + digits + symbols
|
||||||
|
pwd += [secrets.choice(all_chars) for _ in range(length - 4)]
|
||||||
|
|
||||||
|
# Shuffle so guaranteed types aren't always at the start
|
||||||
|
secrets.SystemRandom().shuffle(pwd)
|
||||||
|
return "".join(pwd)
|
||||||
|
|
||||||
|
def generate_credentials_pdf(created_users):
|
||||||
|
"""
|
||||||
|
Creates a PDF in memory with 2 user credential cards per A4 page.
|
||||||
|
created_users: list of dicts [{'name': ..., 'last_name': ..., 'username': ..., 'password': ...}]
|
||||||
|
"""
|
||||||
|
buffer = io.BytesIO()
|
||||||
|
pdf = canvas.Canvas(buffer, pagesize=A4)
|
||||||
|
width, height = A4 # 595.27 x 841.89 points
|
||||||
|
card_height = height / 2.0 # Split page into 2 equal halves
|
||||||
|
|
||||||
|
for i, user in enumerate(created_users):
|
||||||
|
page_slot = i % 2 # 0 = Top half, 1 = Bottom half
|
||||||
|
|
||||||
|
# If starting a new page (except for the very first item)
|
||||||
|
if i > 0 and page_slot == 0:
|
||||||
|
pdf.showPage()
|
||||||
|
|
||||||
|
# Calculate Y offset for card position
|
||||||
|
y_offset = height - (page_slot + 1) * card_height
|
||||||
|
|
||||||
|
# Card Container Box
|
||||||
|
margin = 35
|
||||||
|
box_x = margin
|
||||||
|
box_y = y_offset + margin
|
||||||
|
box_w = width - (2 * margin)
|
||||||
|
box_h = card_height - (2 * margin)
|
||||||
|
|
||||||
|
# Outer Border
|
||||||
|
pdf.setStrokeColor(colors.HexColor('#CBD5E1'))
|
||||||
|
pdf.setLineWidth(1)
|
||||||
|
pdf.rect(box_x, box_y, box_w, box_h, fill=0)
|
||||||
|
|
||||||
|
# Header Banner inside Card
|
||||||
|
pdf.setFillColor(colors.HexColor('#1E293B'))
|
||||||
|
pdf.rect(box_x, box_y + box_h - 45, box_w, 45, fill=1, stroke=0)
|
||||||
|
|
||||||
|
# Header Title Text
|
||||||
|
pdf.setFillColor(colors.white)
|
||||||
|
pdf.setFont("Helvetica-Bold", 14)
|
||||||
|
pdf.drawString(box_x + 20, box_y + box_h - 28, "Zugangsdaten / Account Credentials")
|
||||||
|
|
||||||
|
# User Info Details
|
||||||
|
content_y = box_y + box_h - 80
|
||||||
|
|
||||||
|
# Name
|
||||||
|
pdf.setFillColor(colors.HexColor('#0F172A'))
|
||||||
|
pdf.setFont("Helvetica-Bold", 12)
|
||||||
|
pdf.drawString(box_x + 25, content_y, f"Name: {user['name']} {user['last_name']}")
|
||||||
|
|
||||||
|
# Username
|
||||||
|
content_y -= 35
|
||||||
|
pdf.setFont("Helvetica", 11)
|
||||||
|
pdf.setFillColor(colors.HexColor('#475569'))
|
||||||
|
pdf.drawString(box_x + 25, content_y, "Benutzername:")
|
||||||
|
pdf.setFont("Helvetica-Bold", 13)
|
||||||
|
pdf.setFillColor(colors.HexColor('#0F172A'))
|
||||||
|
pdf.drawString(box_x + 160, content_y, user['username'])
|
||||||
|
|
||||||
|
# Password
|
||||||
|
content_y -= 30
|
||||||
|
pdf.setFont("Helvetica", 11)
|
||||||
|
pdf.setFillColor(colors.HexColor('#475569'))
|
||||||
|
pdf.drawString(box_x + 25, content_y, "Passwort:")
|
||||||
|
pdf.setFont("Courier-Bold", 13)
|
||||||
|
pdf.setFillColor(colors.HexColor('#0F172A'))
|
||||||
|
pdf.drawString(box_x + 160, content_y, user['password'])
|
||||||
|
|
||||||
|
# Security Footer Note
|
||||||
|
content_y -= 45
|
||||||
|
pdf.setFont("Helvetica-Oblique", 9)
|
||||||
|
pdf.setFillColor(colors.HexColor('#64748B'))
|
||||||
|
pdf.drawString(box_x + 25, content_y, "Hinweis: Bitte ändern Sie Ihr Passwort nach der ersten Anmeldung.")
|
||||||
|
|
||||||
|
# Dashed Cut Line between top and bottom cards
|
||||||
|
if page_slot == 0 and i < len(created_users) - 1:
|
||||||
|
pdf.setDash(4, 4)
|
||||||
|
pdf.setStrokeColor(colors.HexColor('#94A3B8'))
|
||||||
|
pdf.line(0, card_height, width, card_height)
|
||||||
|
pdf.setDash() # Reset dash
|
||||||
|
|
||||||
|
pdf.save()
|
||||||
|
buffer.seek(0)
|
||||||
|
return buffer
|
||||||
|
|
||||||
|
|
||||||
|
@app.route('/register/csv', methods=['POST'])
|
||||||
|
def register_csv():
|
||||||
|
if 'username' not in session:
|
||||||
|
flash('Ihnen ist es nicht gestattet, diese Aktion auszuführen.', 'error')
|
||||||
|
return redirect(url_for('login'))
|
||||||
|
|
||||||
|
file = request.files.get('csv_file')
|
||||||
|
if not file or not file.filename.endswith('.csv'):
|
||||||
|
flash('Bitte laden Sie eine gültige CSV-Datei hoch.', 'error')
|
||||||
|
return redirect(url_for('register'))
|
||||||
|
|
||||||
|
permission_preset = (request.form.get('permission_preset') or 'standard_user').strip()
|
||||||
|
|
||||||
|
# 1. CSV über die robuste Funktion einlesen
|
||||||
|
file_bytes = file.stream.read()
|
||||||
|
raw_users = parse_csv_users(file_bytes)
|
||||||
|
|
||||||
|
if not raw_users:
|
||||||
|
flash('Keine gültigen Benutzer in der CSV-Datei gefunden. Bitte prüfen Sie das Format.', 'error')
|
||||||
|
return redirect(url_for('register'))
|
||||||
|
|
||||||
|
created_users = []
|
||||||
|
|
||||||
|
for entry in raw_users:
|
||||||
|
name = entry['name']
|
||||||
|
last_name = entry['last_name']
|
||||||
|
|
||||||
|
if not name or not last_name:
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Benutzernamen & Passwort generieren
|
||||||
|
username = us.build_unique_username_from_name(name, last_name)
|
||||||
|
password = generate_compliant_password(16)
|
||||||
|
|
||||||
|
# In DB speichern
|
||||||
|
success = us.add_user(
|
||||||
|
username=username,
|
||||||
|
password=password,
|
||||||
|
name=name,
|
||||||
|
last_name=last_name,
|
||||||
|
is_student=False,
|
||||||
|
student_card_id=None,
|
||||||
|
max_borrow_days=None,
|
||||||
|
permission_preset=permission_preset,
|
||||||
|
)
|
||||||
|
|
||||||
|
if success:
|
||||||
|
created_users.append({
|
||||||
|
'name': name,
|
||||||
|
'last_name': last_name,
|
||||||
|
'username': username,
|
||||||
|
'password': password
|
||||||
|
})
|
||||||
|
|
||||||
|
if not created_users:
|
||||||
|
flash('Fehler beim Erstellen der Benutzer aus der CSV.', 'error')
|
||||||
|
return redirect(url_for('register'))
|
||||||
|
|
||||||
|
# PDF mit Zugangsdaten generieren
|
||||||
|
pdf_buffer = generate_credentials_pdf(created_users)
|
||||||
|
|
||||||
|
return send_file(
|
||||||
|
pdf_buffer,
|
||||||
|
as_attachment=True,
|
||||||
|
download_name='benutzer_zugangsdaten.pdf',
|
||||||
|
mimetype='application/pdf'
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@app.route('/user_del', methods=['GET'])
|
@app.route('/user_del', methods=['GET'])
|
||||||
def user_del():
|
def user_del():
|
||||||
"""
|
"""
|
||||||
User deletion interface.
|
User deletion interface.
|
||||||
Displays a list of users that can be deleted by an administrator.
|
Displays a list of users that can be deleted by an administrator.
|
||||||
Prevents self-deletion by hiding the current user from the list.
|
Prevents self-deletion by hiding the current user from the list.
|
||||||
|
|
||||||
Returns:
|
|
||||||
flask.Response: Rendered template with user list or redirect
|
|
||||||
"""
|
"""
|
||||||
if 'username' not in session:
|
if 'username' not in session:
|
||||||
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 Adresse zu nutzen. Bitte melden Sie sich an!',
|
||||||
|
'error')
|
||||||
return redirect(url_for('login'))
|
return redirect(url_for('login'))
|
||||||
|
|
||||||
|
# Abruf aller User (falls get_all_users tenant_id unterstützt, kann diese hier übergeben werden)
|
||||||
all_users = us.get_all_users()
|
all_users = us.get_all_users()
|
||||||
|
|
||||||
users_list = []
|
users_list = []
|
||||||
for user in all_users:
|
for user in all_users:
|
||||||
username = None
|
username = user.get('Username')
|
||||||
for field in ['Username']:
|
|
||||||
if field in user:
|
if username and username != session.get('username'):
|
||||||
username = user[field]
|
|
||||||
break
|
|
||||||
|
|
||||||
if username and username != session['username']:
|
|
||||||
try:
|
try:
|
||||||
permissions_payload = us.get_effective_permissions(username)
|
permissions_payload = us.get_effective_permissions(username)
|
||||||
except Exception:
|
except Exception:
|
||||||
permissions_payload = us.build_default_permission_payload('standard_user')
|
permissions_payload = us.build_default_permission_payload('standard_user')
|
||||||
|
|
||||||
try:
|
try:
|
||||||
name = us.get_name(username)
|
name = us.get_name(username)
|
||||||
last_name = us.get_last_name(username)
|
last_name = us.get_last_name(username)
|
||||||
@@ -7692,12 +8005,13 @@ def user_del():
|
|||||||
fullname = last_name
|
fullname = last_name
|
||||||
else:
|
else:
|
||||||
fullname = None
|
fullname = None
|
||||||
except:
|
except Exception:
|
||||||
name = ""
|
name = ""
|
||||||
last_name = ""
|
last_name = ""
|
||||||
fullname = None
|
fullname = None
|
||||||
|
|
||||||
users_list.append({
|
users_list.append({
|
||||||
'username': username,
|
'username': username, # Username ist plain in DB, kein decrypt_text() notwendig
|
||||||
'admin': user.get('Admin', False),
|
'admin': user.get('Admin', False),
|
||||||
'fullname': fullname,
|
'fullname': fullname,
|
||||||
'name': name,
|
'name': name,
|
||||||
@@ -7706,7 +8020,7 @@ def user_del():
|
|||||||
'action_permissions': permissions_payload.get('actions', {}),
|
'action_permissions': permissions_payload.get('actions', {}),
|
||||||
'page_permissions': permissions_payload.get('pages', {}),
|
'page_permissions': permissions_payload.get('pages', {}),
|
||||||
})
|
})
|
||||||
|
|
||||||
return render_template(
|
return render_template(
|
||||||
'user_del.html',
|
'user_del.html',
|
||||||
users=users_list,
|
users=users_list,
|
||||||
@@ -7719,68 +8033,72 @@ def user_del():
|
|||||||
def delete_user():
|
def delete_user():
|
||||||
"""
|
"""
|
||||||
Process user deletion request.
|
Process user deletion request.
|
||||||
Deletes a specified user from the system.
|
Deletes a specified user from the system directly via the tenant db.
|
||||||
Includes safety checks to prevent self-deletion.
|
Includes safety checks to prevent self-deletion.
|
||||||
|
|
||||||
Returns:
|
|
||||||
flask.Response: Redirect to the user deletion interface with status
|
|
||||||
"""
|
"""
|
||||||
if 'username' not in session:
|
if 'username' not in session:
|
||||||
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, diese Aktion auszuführen. Bitte melden Sie sich an!', 'error')
|
||||||
return redirect(url_for('login'))
|
return redirect(url_for('login'))
|
||||||
|
|
||||||
username = request.form.get('username')
|
username = request.form.get('username')
|
||||||
if not username:
|
if not username:
|
||||||
flash('Kein Benutzer ausgewählt', 'error')
|
flash('Kein Benutzer ausgewählt', 'error')
|
||||||
return redirect(url_for('user_del'))
|
return redirect(url_for('user_del'))
|
||||||
|
|
||||||
# Prevent self-deletion
|
if username == session.get('username'):
|
||||||
if username == session['username']:
|
|
||||||
flash('Sie können Ihr eigenes Konto nicht löschen', 'error')
|
flash('Sie können Ihr eigenes Konto nicht löschen', 'error')
|
||||||
return redirect(url_for('user_del'))
|
return redirect(url_for('user_del'))
|
||||||
|
|
||||||
# Reset this user's borrowings and free items before deleting the user
|
|
||||||
try:
|
try:
|
||||||
client = MongoClient(MONGODB_HOST, MONGODB_PORT)
|
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
||||||
db = client[MONGODB_DB]
|
tenant_id = session.get('tenant_id')
|
||||||
|
db = us._get_tenant_db(client, tenant_id)
|
||||||
|
|
||||||
ausleihungen = db['ausleihungen']
|
ausleihungen = db['ausleihungen']
|
||||||
items_col = db['items']
|
items_col = db['items']
|
||||||
|
users_col = db['users'] # Direkter Zugriff auf die User-Collection
|
||||||
|
|
||||||
now = datetime.datetime.now()
|
now = datetime.datetime.now()
|
||||||
|
|
||||||
# Complete all active borrowings of this user
|
# 1. Aktive Ausleihen abschließen
|
||||||
ausleihungen.update_many(
|
ausleihungen.update_many(
|
||||||
{'User': username, 'Status': 'active'},
|
{'User': username, 'Status': 'active'},
|
||||||
{'$set': {'Status': 'completed', 'End': now, 'LastUpdated': now}}
|
{'$set': {'Status': 'completed', 'End': now, 'LastUpdated': now}}
|
||||||
)
|
)
|
||||||
|
|
||||||
# Cancel all planned borrowings of this user
|
# 2. Geplante Ausleihen stornieren
|
||||||
ausleihungen.update_many(
|
ausleihungen.update_many(
|
||||||
{'User': username, 'Status': 'planned'},
|
{'User': username, 'Status': 'planned'},
|
||||||
{'$set': {'Status': 'cancelled', 'LastUpdated': now}}
|
{'$set': {'Status': 'cancelled', 'LastUpdated': now}}
|
||||||
)
|
)
|
||||||
|
|
||||||
# Free all items currently associated with this user
|
# 3. Inventar wieder verfügbar machen
|
||||||
items_col.update_many(
|
items_col.update_many(
|
||||||
{'User': username},
|
{'User': username},
|
||||||
{'$set': {'Verfuegbar': True, 'LastUpdated': now}, '$unset': {'User': ""}}
|
{'$set': {'Verfuegbar': True, 'LastUpdated': now}, '$unset': {'User': ""}}
|
||||||
)
|
)
|
||||||
|
|
||||||
client.close()
|
# 4. Den Benutzer direkt in der überprüften DB-Verbindung löschen
|
||||||
except Exception as e:
|
# Achte auf die exakte Großschreibung 'Username' (so wie in add_user definiert)
|
||||||
app.logger.error(f"Error resetting borrowings for user {encrypt_text(username)}: {e}")
|
delete_result = users_col.delete_one({'Username': username})
|
||||||
flash(f'Warnung: Ausleihungen/Reservierungen für {username} konnten nicht vollständig zurückgesetzt werden', 'warning')
|
|
||||||
|
# 5. Explizite Erfolgskontrolle
|
||||||
|
if delete_result.deleted_count > 0:
|
||||||
|
flash(f'Benutzer {username} erfolgreich gelöscht', 'success')
|
||||||
|
else:
|
||||||
|
# Fallback, falls der Nutzer nicht gefunden wurde (Fehlervermeidung)
|
||||||
|
flash(f'Löschen fehlgeschlagen: Benutzer {username} wurde in der Datenbank nicht gefunden.', 'error')
|
||||||
|
|
||||||
# Delete the user
|
|
||||||
try:
|
|
||||||
us.delete_user(username)
|
|
||||||
flash(f'Benutzer {username} erfolgreich gelöscht', 'success')
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
app.logger.error(f"Error deleting user {encrypt_text(username)}: {e}")
|
app.logger.error(f"Error resetting borrowings or deleting user {username}: {e}")
|
||||||
flash('Fehler beim Löschen des Benutzers', 'error')
|
flash('Kritischer Fehler beim Löschen des Benutzers', 'error')
|
||||||
|
finally:
|
||||||
|
# Garantiert, dass die DB-Verbindung geschlossen wird
|
||||||
|
if 'client' in locals():
|
||||||
|
client.close()
|
||||||
|
|
||||||
return redirect(url_for('user_del'))
|
return redirect(url_for('user_del'))
|
||||||
|
|
||||||
|
|
||||||
@app.route('/admin/borrowings')
|
@app.route('/admin/borrowings')
|
||||||
def admin_borrowings():
|
def admin_borrowings():
|
||||||
"""
|
"""
|
||||||
@@ -9746,8 +10064,8 @@ def download_book_cover():
|
|||||||
return jsonify({"error": "Only public HTTPS URLs are allowed"}), 400
|
return jsonify({"error": "Only public HTTPS URLs are allowed"}), 400
|
||||||
|
|
||||||
# 2. SSRF Protection: Strict Allowlist Check
|
# 2. SSRF Protection: Strict Allowlist Check
|
||||||
if parsed_url.netloc not in ALLOWED_COVER_DOMAINS:
|
# if parsed_url.netloc not in ALLOWED_COVER_DOMAINS:
|
||||||
return jsonify({"error": "Target host is not an allowed book cover provider"}), 403
|
# return jsonify({"error": "Target host is not an allowed book cover provider"}), 403
|
||||||
|
|
||||||
# Download the image (allow_redirects=False prevents redirecting to internal IPs)
|
# Download the image (allow_redirects=False prevents redirecting to internal IPs)
|
||||||
response = requests.get(image_url, stream=True, timeout=10, allow_redirects=False)
|
response = requests.get(image_url, stream=True, timeout=10, allow_redirects=False)
|
||||||
|
|||||||
+155
-10
@@ -20,12 +20,30 @@ Collection Structure:
|
|||||||
"""
|
"""
|
||||||
from bson.objectid import ObjectId
|
from bson.objectid import ObjectId
|
||||||
from bson.errors import InvalidId
|
from bson.errors import InvalidId
|
||||||
|
import uuid
|
||||||
import datetime
|
import datetime
|
||||||
import Web.modules.database.settings as cfg
|
import Web.modules.database.settings as cfg
|
||||||
from Web.modules.database.settings import MongoClient
|
from Web.modules.database.settings import MongoClient
|
||||||
import Web.modules.inventarsystem.data_protection as dp
|
import Web.modules.inventarsystem.data_protection as dp
|
||||||
|
|
||||||
|
|
||||||
|
def is_library_item(item):
|
||||||
|
"""
|
||||||
|
Ermittelt zuverlässig, ob ein Objekt zur Bibliothek gehört.
|
||||||
|
Gibt True zurück, wenn ItemType ein Medientyp ist (Buch, Schulbuch, CD, DVD etc.)
|
||||||
|
ODER wenn is_library explizit True ist.
|
||||||
|
"""
|
||||||
|
if not item:
|
||||||
|
return False
|
||||||
|
|
||||||
|
# 1. Prüfe zuerst den Medientyp (ItemType)
|
||||||
|
item_type = str(item.get('ItemType', '') or '').strip().lower()
|
||||||
|
if item_type and item_type not in ['other', 'general', 'none', 'null']:
|
||||||
|
return True
|
||||||
|
|
||||||
|
# 2. Falls ItemType 'other' ist, prüfe das is_library Flag
|
||||||
|
return bool(item.get('is_library', False))
|
||||||
|
|
||||||
def safe_decrypt_user(encrypted_user):
|
def safe_decrypt_user(encrypted_user):
|
||||||
"""
|
"""
|
||||||
Safely decrypt an encrypted username string.
|
Safely decrypt an encrypted username string.
|
||||||
@@ -250,7 +268,10 @@ def get_group_item_ids(id):
|
|||||||
|
|
||||||
|
|
||||||
def update_item(id, name, ort, beschreibung, images, verfuegbar, filter1, filter2, filter3,
|
def update_item(id, name, ort, beschreibung, images, verfuegbar, filter1, filter2, filter3,
|
||||||
ansch_jahr, ansch_kost, code_4, reservierbar, isbn=None, item_type='general'):
|
ansch_jahr, ansch_kost, code_4, reservierbar, isbn="", item_type='other', library_category=""):
|
||||||
|
"""
|
||||||
|
Aktualisiert ein Objekt in MongoDB und setzt is_library korrekt basierend auf dem Medientyp.
|
||||||
|
"""
|
||||||
try:
|
try:
|
||||||
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
||||||
db = client[cfg.MONGODB_DB]
|
db = client[cfg.MONGODB_DB]
|
||||||
@@ -258,29 +279,35 @@ def update_item(id, name, ort, beschreibung, images, verfuegbar, filter1, filter
|
|||||||
|
|
||||||
old_item = items.find_one({'_id': ObjectId(id)})
|
old_item = items.find_one({'_id': ObjectId(id)})
|
||||||
if not old_item:
|
if not old_item:
|
||||||
|
client.close()
|
||||||
return False
|
return False
|
||||||
|
|
||||||
series_group_id = old_item.get('SeriesGroupId')
|
series_group_id = old_item.get('SeriesGroupId')
|
||||||
|
|
||||||
|
# is_library automatisch anhand des neuen item_type bestimmen
|
||||||
|
is_lib = is_library_item({'ItemType': item_type})
|
||||||
|
|
||||||
shared_update = {
|
shared_update = {
|
||||||
'Name': name,
|
'Name': name,
|
||||||
'Ort': ort,
|
'Ort': ort,
|
||||||
'Beschreibung': beschreibung,
|
'Beschreibung': beschreibung,
|
||||||
'Images': images,
|
'Images': images if isinstance(images, list) else [],
|
||||||
'Filter': filter1,
|
'Filter': filter1 if isinstance(filter1, list) else [],
|
||||||
'Filter2': filter2,
|
'Filter2': filter2 if isinstance(filter2, list) else [],
|
||||||
'Filter3': filter3,
|
'Filter3': filter3 if isinstance(filter3, list) else [],
|
||||||
'Anschaffungsjahr': ansch_jahr,
|
'Anschaffungsjahr': ansch_jahr,
|
||||||
'Anschaffungskosten': ansch_kost,
|
'Anschaffungskosten': ansch_kost,
|
||||||
'Reservierbar': reservierbar,
|
'Reservierbar': bool(reservierbar),
|
||||||
'ISBN': isbn,
|
'ISBN': str(isbn) if isbn else '',
|
||||||
'ItemType': item_type,
|
'ItemType': item_type,
|
||||||
'Verfuegbar': verfuegbar,
|
'is_library': is_lib,
|
||||||
|
'library_category': library_category,
|
||||||
|
'Verfuegbar': bool(verfuegbar),
|
||||||
'LastUpdated': datetime.datetime.now()
|
'LastUpdated': datetime.datetime.now()
|
||||||
}
|
}
|
||||||
|
|
||||||
specific_update = shared_update.copy()
|
specific_update = shared_update.copy()
|
||||||
specific_update['Code_4'] = code_4
|
specific_update['Code_4'] = str(code_4) if code_4 else ''
|
||||||
|
|
||||||
items.update_one({'_id': ObjectId(id)}, {'$set': specific_update})
|
items.update_one({'_id': ObjectId(id)}, {'$set': specific_update})
|
||||||
|
|
||||||
@@ -1147,4 +1174,122 @@ def get_current_status(item_id, decrypt=True):
|
|||||||
return None
|
return None
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"Error retrieving current status for item {item_id}: {e}")
|
print(f"Error retrieving current status for item {item_id}: {e}")
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
def sync_group_codes(primary_obj_id, base_code, individual_codes_list):
|
||||||
|
"""
|
||||||
|
Synchronisiert die Barcodes einer Gruppe im korrekten Schema
|
||||||
|
(angelehnt an das 'Augenmodell groß'-Vorbild).
|
||||||
|
"""
|
||||||
|
if not base_code:
|
||||||
|
return False
|
||||||
|
|
||||||
|
# Alle Ziel-Codes zusammenführen (Basis-Code an erster Stelle)
|
||||||
|
all_target_codes = [base_code]
|
||||||
|
for c in individual_codes_list:
|
||||||
|
if c and c not in all_target_codes:
|
||||||
|
all_target_codes.append(c)
|
||||||
|
|
||||||
|
item_count = len(all_target_codes)
|
||||||
|
|
||||||
|
try:
|
||||||
|
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
||||||
|
db = client[cfg.MONGODB_DB]
|
||||||
|
items = db['items']
|
||||||
|
|
||||||
|
primary_item = items.find_one({'_id': ObjectId(primary_obj_id)})
|
||||||
|
if not primary_item:
|
||||||
|
client.close()
|
||||||
|
return False
|
||||||
|
|
||||||
|
group_id = primary_item.get('SeriesGroupId')
|
||||||
|
|
||||||
|
# Wenn es mehr als 1 Item gibt und noch keine Gruppe existiert -> Neue GroupID erzeugen
|
||||||
|
if not group_id and item_count > 1:
|
||||||
|
group_id = str(uuid.uuid4())
|
||||||
|
|
||||||
|
# Wenn es nun eine Gruppe gibt (item_count > 1)
|
||||||
|
if item_count > 1:
|
||||||
|
# 1. Haupt-Item (Parent) aktualisieren
|
||||||
|
items.update_one(
|
||||||
|
{'_id': primary_item['_id']},
|
||||||
|
{'$set': {
|
||||||
|
'Code_4': base_code,
|
||||||
|
'SeriesGroupId': group_id,
|
||||||
|
'SeriesCount': item_count,
|
||||||
|
'SeriesPosition': 1,
|
||||||
|
'IsGroupedSubItem': False,
|
||||||
|
'ParentItemId': None
|
||||||
|
}}
|
||||||
|
)
|
||||||
|
|
||||||
|
# Bestehende Gruppenmitglieder laden
|
||||||
|
existing_items = list(items.find({'SeriesGroupId': group_id}))
|
||||||
|
existing_map = {it.get('Code_4'): it for it in existing_items if
|
||||||
|
it.get('Code_4') and str(it['_id']) != str(primary_item['_id'])}
|
||||||
|
|
||||||
|
# Alle verbleibenden Sub-Codes ab Position 2 abarbeiten
|
||||||
|
processed_sub_ids = []
|
||||||
|
for idx, code in enumerate(all_target_codes[1:], start=2):
|
||||||
|
if code in existing_map:
|
||||||
|
# Existiert bereits in der Gruppe -> Nur Position und Count aktualisieren
|
||||||
|
sub_item = existing_map[code]
|
||||||
|
processed_sub_ids.append(sub_item['_id'])
|
||||||
|
items.update_one(
|
||||||
|
{'_id': sub_item['_id']},
|
||||||
|
{'$set': {
|
||||||
|
'SeriesCount': item_count,
|
||||||
|
'SeriesPosition': idx,
|
||||||
|
'IsGroupedSubItem': True,
|
||||||
|
'ParentItemId': str(primary_item['_id'])
|
||||||
|
}}
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
# Neu hinzukommender Code -> Als Klon (Sub-Item) erstellen
|
||||||
|
new_sub = primary_item.copy()
|
||||||
|
if '_id' in new_sub:
|
||||||
|
del new_sub['_id']
|
||||||
|
|
||||||
|
new_sub.update({
|
||||||
|
'Code_4': code,
|
||||||
|
'SeriesGroupId': group_id,
|
||||||
|
'SeriesCount': item_count,
|
||||||
|
'SeriesPosition': idx,
|
||||||
|
'IsGroupedSubItem': True,
|
||||||
|
'ParentItemId': str(primary_item['_id']),
|
||||||
|
'LastUpdated': primary_item.get('LastUpdated')
|
||||||
|
})
|
||||||
|
inserted_res = items.insert_one(new_sub)
|
||||||
|
processed_sub_ids.append(inserted_res.inserted_id)
|
||||||
|
|
||||||
|
# Nicht mehr benötigte Sub-Items aus dieser Gruppe entfernen
|
||||||
|
for code, sub_item in existing_map.items():
|
||||||
|
if sub_item['_id'] not in processed_sub_ids:
|
||||||
|
items.delete_one({'_id': sub_item['_id']})
|
||||||
|
|
||||||
|
else:
|
||||||
|
# Fall: Nur 1 einziges Item (keine Gruppe / Gruppe aufgelöst)
|
||||||
|
# Eventuelle alte Sub-Items dieser Gruppe löschen
|
||||||
|
if group_id:
|
||||||
|
items.delete_many({
|
||||||
|
'SeriesGroupId': group_id,
|
||||||
|
'_id': {'$ne': primary_item['_id']}
|
||||||
|
})
|
||||||
|
|
||||||
|
items.update_one(
|
||||||
|
{'_id': primary_item['_id']},
|
||||||
|
{'$set': {
|
||||||
|
'Code_4': base_code,
|
||||||
|
'SeriesGroupId': None,
|
||||||
|
'SeriesCount': 1,
|
||||||
|
'SeriesPosition': 1,
|
||||||
|
'IsGroupedSubItem': False,
|
||||||
|
'ParentItemId': None
|
||||||
|
}}
|
||||||
|
)
|
||||||
|
|
||||||
|
client.close()
|
||||||
|
return True
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error syncing group codes: {e}")
|
||||||
|
return False
|
||||||
@@ -650,7 +650,7 @@ def add_user(
|
|||||||
safe_last_name = last_name.strip() if last_name else ''
|
safe_last_name = last_name.strip() if last_name else ''
|
||||||
|
|
||||||
user_doc = {
|
user_doc = {
|
||||||
'Username': dp.encrypt_text(username),
|
'Username': username,
|
||||||
'Password': hashing(password),
|
'Password': hashing(password),
|
||||||
'Admin': (permission_preset == "full_access"),
|
'Admin': (permission_preset == "full_access"),
|
||||||
'active_ausleihung': None,
|
'active_ausleihung': None,
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,288 +0,0 @@
|
|||||||
<!--
|
|
||||||
Copyright 2025-2026 AIIrondev
|
|
||||||
|
|
||||||
Licensed under the Inventarsystem EULA (Endbenutzer-Lizenzvertrag).
|
|
||||||
See Legal/LICENSE for the full license text.
|
|
||||||
Unauthorized commercial use, SaaS hosting, or removal of branding is prohibited.
|
|
||||||
For commercial licensing inquiries: https://github.com/AIIrondev
|
|
||||||
-->
|
|
||||||
<!-- Edit Item Functions -->
|
|
||||||
<script>
|
|
||||||
// Function to check if a file is a video
|
|
||||||
function isVideoFile(filename) {
|
|
||||||
const videoExtensions = ['.mp4', '.mov', '.avi', '.mkv', '.webm', '.flv', '.m4v', '.3gp'];
|
|
||||||
const extension = filename.toLowerCase().substring(filename.lastIndexOf('.'));
|
|
||||||
return videoExtensions.includes(extension);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load location options for edit modal
|
|
||||||
function loadLocationOptions() {
|
|
||||||
fetch('/get_predefined_locations')
|
|
||||||
.then(response => response.json())
|
|
||||||
.then(data => {
|
|
||||||
const ortSelect = document.getElementById('edit-location');
|
|
||||||
if (ortSelect) {
|
|
||||||
// Clear existing options except the first one
|
|
||||||
while (ortSelect.children.length > 1) {
|
|
||||||
ortSelect.removeChild(ortSelect.lastChild);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add new options - data.locations contains the array
|
|
||||||
data.locations.forEach(location => {
|
|
||||||
const option = document.createElement('option');
|
|
||||||
option.value = location;
|
|
||||||
option.textContent = location;
|
|
||||||
ortSelect.appendChild(option);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.catch(error => {
|
|
||||||
console.error('Error loading location options:', error);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Edit modal functions
|
|
||||||
function openEditModal(itemId) {
|
|
||||||
if (typeof openEditModalFromServer === 'function') {
|
|
||||||
openEditModalFromServer(itemId);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Find the item data from allItems array
|
|
||||||
const item = allItems.find(i => i._id === itemId);
|
|
||||||
if (!item) {
|
|
||||||
console.error('Item not found:', itemId);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Populate the edit form with current item data
|
|
||||||
document.getElementById('edit-item-id').value = item._id;
|
|
||||||
document.getElementById('edit-name').value = item.Name || '';
|
|
||||||
document.getElementById('edit-description').value = item.Beschreibung || '';
|
|
||||||
document.getElementById('edit-code4').value = item.Code_4 || '';
|
|
||||||
document.getElementById('edit-year').value = item.Anschaffungsjahr || '';
|
|
||||||
document.getElementById('edit-cost').value = item.Anschaffungskosten || '';
|
|
||||||
|
|
||||||
// Set reservable status (default to true if undefined)
|
|
||||||
const reservierbarCheckbox = document.getElementById('edit-reservierbar');
|
|
||||||
if (reservierbarCheckbox) {
|
|
||||||
reservierbarCheckbox.checked = item.Reservierbar !== false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load location options
|
|
||||||
loadLocationOptions();
|
|
||||||
|
|
||||||
// Set the current location
|
|
||||||
setTimeout(() => {
|
|
||||||
const locationSelect = document.getElementById('edit-location');
|
|
||||||
if (locationSelect && item.Ort) {
|
|
||||||
locationSelect.value = item.Ort;
|
|
||||||
}
|
|
||||||
}, 100);
|
|
||||||
|
|
||||||
// Handle filter arrays - set current values
|
|
||||||
const filter1Array = Array.isArray(item.Filter) ? item.Filter : (item.Filter ? [item.Filter] : []);
|
|
||||||
const filter2Array = Array.isArray(item.Filter2) ? item.Filter2 : (item.Filter2 ? [item.Filter2] : []);
|
|
||||||
const filter3Array = Array.isArray(item.Filter3) ? item.Filter3 : (item.Filter3 ? [item.Filter3] : []);
|
|
||||||
|
|
||||||
// Set filter dropdowns (up to 4 each)
|
|
||||||
for (let i = 1; i <= 4; i++) {
|
|
||||||
// Filter 1
|
|
||||||
const filter1Select = document.getElementById(`edit-filter1-${i}`);
|
|
||||||
if (filter1Select) {
|
|
||||||
filter1Select.value = filter1Array[i-1] || '';
|
|
||||||
}
|
|
||||||
|
|
||||||
// Filter 2
|
|
||||||
const filter2Select = document.getElementById(`edit-filter2-${i}`);
|
|
||||||
if (filter2Select) {
|
|
||||||
filter2Select.value = filter2Array[i-1] || '';
|
|
||||||
}
|
|
||||||
|
|
||||||
// Filter 3
|
|
||||||
const filter3Select = document.getElementById(`edit-filter3-${i}`);
|
|
||||||
if (filter3Select) {
|
|
||||||
filter3Select.value = filter3Array[i-1] || '';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Populate existing images
|
|
||||||
populateExistingImages(item.Images || []);
|
|
||||||
|
|
||||||
// Show the modal
|
|
||||||
document.getElementById('edit-modal').style.display = 'block';
|
|
||||||
}
|
|
||||||
|
|
||||||
function closeEditModal() {
|
|
||||||
document.getElementById('edit-modal').style.display = 'none';
|
|
||||||
}
|
|
||||||
|
|
||||||
// Function to add new location (for edit modal)
|
|
||||||
function addNewLocation(prefix) {
|
|
||||||
// Use different input IDs based on whether we're in edit mode
|
|
||||||
const inputId = prefix === 'edit' ? 'edit-new-location-input' : 'new-location-input';
|
|
||||||
const selectId = prefix === 'edit' ? 'edit-location' : 'ort';
|
|
||||||
|
|
||||||
const newLocationInput = document.getElementById(inputId);
|
|
||||||
const newLocation = newLocationInput.value.trim();
|
|
||||||
|
|
||||||
if (!newLocation) {
|
|
||||||
alert('Bitte geben Sie einen Ort ein.');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add to dropdown
|
|
||||||
const ortSelect = document.getElementById(selectId);
|
|
||||||
const option = document.createElement('option');
|
|
||||||
option.value = newLocation;
|
|
||||||
option.textContent = newLocation;
|
|
||||||
ortSelect.appendChild(option);
|
|
||||||
ortSelect.value = newLocation;
|
|
||||||
|
|
||||||
// Hide the input field
|
|
||||||
document.getElementById(prefix + '-new-location-container').style.display = 'none';
|
|
||||||
newLocationInput.value = '';
|
|
||||||
|
|
||||||
// Save to server
|
|
||||||
fetch('/add_location_value', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/x-www-form-urlencoded',
|
|
||||||
},
|
|
||||||
body: 'value=' + encodeURIComponent(newLocation)
|
|
||||||
})
|
|
||||||
.then(response => response.json())
|
|
||||||
.then(data => {
|
|
||||||
if (!data.success) {
|
|
||||||
console.warn('Failed to save location to server:', data.error);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.catch(error => {
|
|
||||||
console.error('Error saving location:', error);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Function to cancel adding a new location
|
|
||||||
function cancelAddLocation(prefix) {
|
|
||||||
const containerId = prefix === 'edit' ? 'edit-new-location-container' : 'new-location-container';
|
|
||||||
const inputId = prefix === 'edit' ? 'edit-new-location-input' : 'new-location-input';
|
|
||||||
document.getElementById(containerId).style.display = 'none';
|
|
||||||
document.getElementById(inputId).value = '';
|
|
||||||
}
|
|
||||||
|
|
||||||
// Function to populate existing images in edit modal
|
|
||||||
function populateExistingImages(images) {
|
|
||||||
const previewContainer = document.getElementById('edit-image-preview-container');
|
|
||||||
if (!previewContainer) return;
|
|
||||||
|
|
||||||
previewContainer.innerHTML = '';
|
|
||||||
|
|
||||||
if (!images || images.length === 0) {
|
|
||||||
previewContainer.innerHTML = '<p>Keine Bilder vorhanden</p>';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
images.forEach((imageName, index) => {
|
|
||||||
const preview = document.createElement('div');
|
|
||||||
preview.className = 'image-preview-item';
|
|
||||||
|
|
||||||
const isVideo = isVideoFile(imageName);
|
|
||||||
const mediaHtml = isVideo
|
|
||||||
? `<video src="/uploads/${imageName}" style="max-width: 150px; max-height: 150px; object-fit: cover;" controls preload="metadata"></video>`
|
|
||||||
: `<img src="/uploads/${imageName}" alt="Image ${index + 1}" style="max-width: 150px; max-height: 150px; object-fit: cover;">`;
|
|
||||||
|
|
||||||
preview.innerHTML = `
|
|
||||||
${mediaHtml}
|
|
||||||
<div class="image-controls">
|
|
||||||
<button type="button" onclick="removeExistingImage('${imageName}', this)" style="background: #dc3545; color: white; border: none; padding: 5px 10px; border-radius: 3px; cursor: pointer; margin-left: 10px;">Entfernen</button>
|
|
||||||
</div>
|
|
||||||
`;
|
|
||||||
previewContainer.appendChild(preview);
|
|
||||||
|
|
||||||
// Add hidden input for the image
|
|
||||||
const hiddenInput = document.createElement('input');
|
|
||||||
hiddenInput.type = 'hidden';
|
|
||||||
hiddenInput.name = 'existing_images';
|
|
||||||
hiddenInput.value = imageName;
|
|
||||||
previewContainer.appendChild(hiddenInput);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Function to remove an existing image
|
|
||||||
function removeExistingImage(imageName, button) {
|
|
||||||
try {
|
|
||||||
// First, determine context - are we in edit mode or main view?
|
|
||||||
const inEditMode = !!document.getElementById('edit-item-form');
|
|
||||||
|
|
||||||
// Always remove the preview element (works in both contexts)
|
|
||||||
const previewItem = button.closest('.image-preview-item');
|
|
||||||
if (previewItem) {
|
|
||||||
previewItem.remove();
|
|
||||||
}
|
|
||||||
|
|
||||||
// If we're in edit mode, handle form inputs
|
|
||||||
if (inEditMode) {
|
|
||||||
// Find and remove the corresponding hidden input in the edit form
|
|
||||||
const editForm = document.getElementById('edit-item-form');
|
|
||||||
|
|
||||||
if (editForm) {
|
|
||||||
// Remove from existing images
|
|
||||||
const existingInputs = editForm.querySelectorAll('input[name="existing_images"]');
|
|
||||||
existingInputs.forEach(input => {
|
|
||||||
if (input.value === imageName) {
|
|
||||||
input.remove();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Add to removed images
|
|
||||||
const removedInput = document.createElement('input');
|
|
||||||
removedInput.type = 'hidden';
|
|
||||||
removedInput.name = 'removed_images';
|
|
||||||
removedInput.value = imageName;
|
|
||||||
editForm.appendChild(removedInput);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// In main view, we may need different logic
|
|
||||||
console.log(`Image ${imageName} removed from display in main view`);
|
|
||||||
// Add any main view specific handling here
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error(`Error in removeExistingImage: ${error.message}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Validate file types for image uploads
|
|
||||||
document.addEventListener('DOMContentLoaded', function() {
|
|
||||||
// Check if we're in the edit item context
|
|
||||||
if (!document.getElementById('edit-item-form')) {
|
|
||||||
console.log('Edit item form not found, skipping edit item functions initialization');
|
|
||||||
return; // Exit early if we're not in the edit item context
|
|
||||||
}
|
|
||||||
|
|
||||||
const imageInput = document.getElementById('edit-new-images');
|
|
||||||
const previewContainer = document.getElementById('edit-image-preview-container');
|
|
||||||
|
|
||||||
if (imageInput) {
|
|
||||||
imageInput.addEventListener('change', function(e) {
|
|
||||||
// Validate file types before preview
|
|
||||||
const allowedTypes = ['image/jpeg', 'image/jpg', 'image/png', 'image/gif',
|
|
||||||
'video/mp4', 'video/quicktime', 'video/x-msvideo', 'video/x-matroska',
|
|
||||||
'video/webm', 'video/x-flv', 'video/mp4', 'video/3gpp'];
|
|
||||||
const files = this.files;
|
|
||||||
let hasInvalidFile = false;
|
|
||||||
|
|
||||||
for (let i = 0; i < files.length; i++) {
|
|
||||||
if (!allowedTypes.includes(files[i].type)) {
|
|
||||||
hasInvalidFile = true;
|
|
||||||
// Clear the file input to prevent submission
|
|
||||||
this.value = '';
|
|
||||||
alert('Fehler: Datei "' + files[i].name + '" hat ein nicht unterstütztes Format. Erlaubte Formate: JPG, JPEG, PNG, GIF, MP4, MOV, AVI, MKV, WEBM, FLV, M4V, 3GP');
|
|
||||||
return; // Stop processing
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Continue with regular preview handling...
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
@@ -0,0 +1,509 @@
|
|||||||
|
<!--
|
||||||
|
Copyright 2025-2026 AIIrondev
|
||||||
|
Licensed under the Inventarsystem EULA.
|
||||||
|
-->
|
||||||
|
{% extends "base.html" %}
|
||||||
|
|
||||||
|
{% block title %}{{ page_title|default('Artikel bearbeiten') }} - Inventarsystem{% endblock %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<style>
|
||||||
|
.edit-container {
|
||||||
|
max-width: 800px;
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 20px;
|
||||||
|
background-color: var(--ui-surface);
|
||||||
|
border-radius: 8px;
|
||||||
|
box-shadow: 0 2px 10px rgba(0,0,0,0.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.edit-form h1 {
|
||||||
|
color: var(--ui-text);
|
||||||
|
margin-bottom: 30px;
|
||||||
|
text-align: center;
|
||||||
|
font-size: 2em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-group {
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-group label {
|
||||||
|
display: block;
|
||||||
|
margin-bottom: 5px;
|
||||||
|
font-weight: bold;
|
||||||
|
color: var(--ui-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-group input,
|
||||||
|
.form-group select,
|
||||||
|
.form-group textarea {
|
||||||
|
width: 100%;
|
||||||
|
padding: 10px;
|
||||||
|
border: 1px solid #ddd;
|
||||||
|
border-radius: 4px;
|
||||||
|
font-size: 16px;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-group textarea {
|
||||||
|
height: 100px;
|
||||||
|
resize: vertical;
|
||||||
|
}
|
||||||
|
|
||||||
|
.filter-inputs {
|
||||||
|
background-color: var(--ui-surface-soft);
|
||||||
|
padding: 20px;
|
||||||
|
border-radius: 5px;
|
||||||
|
margin: 20px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.filter-inputs h3 {
|
||||||
|
color: var(--ui-text);
|
||||||
|
margin-bottom: 15px;
|
||||||
|
font-size: 1.2em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.multi-filter {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
|
||||||
|
gap: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.filter-dropdown-select {
|
||||||
|
width: 100%;
|
||||||
|
padding: 8px;
|
||||||
|
border: 1px solid #ddd;
|
||||||
|
border-radius: 4px;
|
||||||
|
background-color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.isbn-input-group {
|
||||||
|
display: flex;
|
||||||
|
gap: 10px;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.isbn-input-group input {
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fetch-isbn-button {
|
||||||
|
background-color: #007bff;
|
||||||
|
color: white;
|
||||||
|
border: none;
|
||||||
|
padding: 8px 12px;
|
||||||
|
border-radius: 4px;
|
||||||
|
cursor: pointer;
|
||||||
|
white-space: nowrap;
|
||||||
|
transition: background-color 0.2s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fetch-isbn-button:hover {
|
||||||
|
background-color: #0056b3;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Scanner Elements */
|
||||||
|
#code4-scanner video, #code4-scanner canvas,
|
||||||
|
#isbn-scanner video, #isbn-scanner canvas {
|
||||||
|
width: 100%;
|
||||||
|
max-width: 640px;
|
||||||
|
height: auto;
|
||||||
|
border-radius: 5px;
|
||||||
|
box-shadow: 0 2px 8px rgba(0,0,0,0.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
#code4-scanner canvas, #isbn-scanner canvas {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#code4-scanner, #isbn-scanner {
|
||||||
|
position: relative;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Image Management */
|
||||||
|
.existing-images-grid {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 15px;
|
||||||
|
margin-top: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.existing-image-card {
|
||||||
|
border: 1px solid #ddd;
|
||||||
|
border-radius: 5px;
|
||||||
|
padding: 8px;
|
||||||
|
text-align: center;
|
||||||
|
background: #fff;
|
||||||
|
width: 120px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.existing-image-card img {
|
||||||
|
width: 100%;
|
||||||
|
height: 100px;
|
||||||
|
object-fit: cover;
|
||||||
|
border-radius: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.existing-image-card label {
|
||||||
|
font-size: 0.8em;
|
||||||
|
margin-top: 5px;
|
||||||
|
cursor: pointer;
|
||||||
|
font-weight: normal;
|
||||||
|
}
|
||||||
|
|
||||||
|
.add-new-btn {
|
||||||
|
background-color: #007bff;
|
||||||
|
color: white;
|
||||||
|
border: none;
|
||||||
|
padding: 5px 10px;
|
||||||
|
border-radius: 3px;
|
||||||
|
cursor: pointer;
|
||||||
|
margin-top: 5px;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.submit-button {
|
||||||
|
background-color: #28a745;
|
||||||
|
color: white;
|
||||||
|
border: none;
|
||||||
|
padding: 15px 30px;
|
||||||
|
border-radius: 5px;
|
||||||
|
font-size: 18px;
|
||||||
|
font-weight: bold;
|
||||||
|
cursor: pointer;
|
||||||
|
width: 100%;
|
||||||
|
margin-top: 20px;
|
||||||
|
transition: background-color 0.2s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.submit-button:hover {
|
||||||
|
background-color: #218838;
|
||||||
|
}
|
||||||
|
|
||||||
|
.edit-new-location-container {
|
||||||
|
display: none;
|
||||||
|
margin-top: 10px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<div class="edit-container">
|
||||||
|
<div class="edit-form">
|
||||||
|
<h1>{{ page_title|default('Artikel bearbeiten') }}</h1>
|
||||||
|
<form method="POST" action="{{ url_for('item_edit', id=item._id) }}" enctype="multipart/form-data">
|
||||||
|
<input type="hidden" name="item_id" value="{{ item._id }}">
|
||||||
|
|
||||||
|
{% if show_library_features %}
|
||||||
|
<!-- ================= LIBRARY SPECIFIC FIELDS ================= -->
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="isbn">ISBN / Barcode:</label>
|
||||||
|
<div class="isbn-input-group">
|
||||||
|
<input type="text" id="isbn" name="isbn" value="{{ item.ISBN|default('') }}" placeholder="ISBN oder Barcode eingeben...">
|
||||||
|
<button type="button" id="scan-isbn-btn" class="fetch-isbn-button">Barcode scannen</button>
|
||||||
|
<button type="button" class="fetch-isbn-button" onclick="fetchBookInfo('edit')">Informationen abrufen</button>
|
||||||
|
</div>
|
||||||
|
<div id="isbn-scanner" style="width:100%; max-width:520px; display:none; margin-top:10px;"></div>
|
||||||
|
<small id="isbn-scan-status" style="display:block; color:#666; margin-top:6px;"></small>
|
||||||
|
<div id="book-info-container"></div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="filter-inputs" style="margin-bottom: 20px;">
|
||||||
|
<h3>Medientyp</h3>
|
||||||
|
<div class="form-group">
|
||||||
|
<select name="item_type_input" id="item_type_input">
|
||||||
|
<option value="Buch" {% if item.ItemType == 'Buch' %}selected{% endif %}>Buch</option>
|
||||||
|
<option value="Schulbuch" {% if item.ItemType == 'Schulbuch' %}selected{% endif %}>Schulbuch</option>
|
||||||
|
<option value="CD" {% if item.ItemType == 'CD' %}selected{% endif %}>CD</option>
|
||||||
|
<option value="DVD" {% if item.ItemType == 'DVD' %}selected{% endif %}>DVD</option>
|
||||||
|
<option value="Sonstiges" {% if item.ItemType == 'Sonstiges' %}selected{% endif %}>Sonstiges</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<h3>Bibliotheks-Kategorie:</h3>
|
||||||
|
<div class="form-group">
|
||||||
|
<input type="text" name="library_category" id="library_category" value="{{ item.library_category|default('') }}" placeholder="z.B. Belletristik, Sachbücher, etc.">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<!-- ================= COMMON CORE FIELDS ================= -->
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="name">Name / Titel:</label>
|
||||||
|
<input type="text" id="name" name="name" value="{{ item.Name|default('') }}" required>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="ort">Ort / Standort:</label>
|
||||||
|
<select id="ort" name="ort" data-selected="{{ item.Ort|default('') }}" required>
|
||||||
|
<option value="">-- Bitte Ort auswählen --</option>
|
||||||
|
{% if item.Ort %}
|
||||||
|
<option value="{{ item.Ort }}" selected>{{ item.Ort }}</option>
|
||||||
|
{% endif %}
|
||||||
|
</select>
|
||||||
|
<button type="button" class="add-new-btn" id="add-new-location-btn">Neuen Ort hinzufügen</button>
|
||||||
|
<div id="new-location-container" class="edit-new-location-container">
|
||||||
|
<input type="text" id="new-location-input" placeholder="Neuen Ort eingeben">
|
||||||
|
<button type="button" onclick="addNewLocation()">Hinzufügen</button>
|
||||||
|
<button type="button" onclick="cancelAddLocation()">Abbrechen</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="beschreibung">Beschreibung:</label>
|
||||||
|
<textarea id="beschreibung" name="beschreibung" required>{{ item.Beschreibung|default('') }}</textarea>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group" id="primary_code_group">
|
||||||
|
<label for="code_4">Basis-Code (Haupt-Barcode)</label>
|
||||||
|
<div style="display: flex; gap: 10px;">
|
||||||
|
<input type="text" id="code_4" name="code_4" class="form-control" value="{{ item.Code_4|default('') }}" required>
|
||||||
|
<button type="button" id="scan-code4-btn" class="fetch-isbn-button">Barcode scannen</button>
|
||||||
|
</div>
|
||||||
|
<div id="code4-scanner" style="display:none; margin-top: 10px;"></div>
|
||||||
|
<small id="code4-scan-status" class="form-text text-muted"></small>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group" id="individual_codes_group">
|
||||||
|
<label for="individual_codes">Weitere Einzelcodes der Gruppe (je Zeile ein Code)</label>
|
||||||
|
<textarea id="individual_codes" name="individual_codes" rows="4" class="form-control" placeholder="z.B. ABC-001 ABC-002">{{ item.IndividualCodes|default('') }}</textarea>
|
||||||
|
<small style="display:block; color:#666; margin-top: 5px;">Der Basis-Code steht oben. Alle weiteren Gruppenmitglieder werden hier untereinander aufgeführt.</small>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{% if not show_library_features %}
|
||||||
|
<!-- ================= SYSTEM FILTERS 1-3 (INVENTORY / OTHER ITEMS ONLY) ================= -->
|
||||||
|
<div class="filter-inputs">
|
||||||
|
<h3>Unterrichtsfach (Filter 1):</h3>
|
||||||
|
<div class="multi-filter">
|
||||||
|
{% for idx in range(4) %}
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="filter1-{{ idx + 1 }}">Wert {{ idx + 1 }}:</label>
|
||||||
|
<select id="filter1-{{ idx + 1 }}" name="filter" class="filter-dropdown-select" data-selected="{{ item.Filter[idx] if item.Filter and item.Filter|length > idx else '' }}">
|
||||||
|
<option value="">-- Optional --</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<h3>Jahrgangsstufe (Filter 2):</h3>
|
||||||
|
<div class="multi-filter">
|
||||||
|
{% for idx in range(4) %}
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="filter2-{{ idx + 1 }}">Wert {{ idx + 1 }}:</label>
|
||||||
|
<select id="filter2-{{ idx + 1 }}" name="filter2" class="filter-dropdown-select" data-selected="{{ item.Filter2[idx] if item.Filter2 and item.Filter2|length > idx else '' }}">
|
||||||
|
<option value="">-- Optional --</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<h3>Schlagwort (Filter 3):</h3>
|
||||||
|
<div class="multi-filter">
|
||||||
|
{% for idx in range(4) %}
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="filter3-{{ idx + 1 }}">Wert {{ idx + 1 }}:</label>
|
||||||
|
<input type="text" id="filter3-{{ idx + 1 }}" name="filter3" value="{{ item.Filter3[idx] if item.Filter3 and item.Filter3|length > idx else '' }}">
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<!-- ================= DATES & FINANCIALS ================= -->
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="anschaffungsjahr">Anschaffungsjahr:</label>
|
||||||
|
<input type="date" id="anschaffungsjahr" name="anschaffungsjahr" value="{{ item.Anschaffungsjahr|default('') }}">
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="anschaffungskosten">Anschaffungskosten (€):</label>
|
||||||
|
<input type="text" id="anschaffungskosten" name="anschaffungskosten" value="{{ item.Anschaffungskosten|default('') }}">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{% if not show_library_features %}
|
||||||
|
<!-- ================= INVENTORY IMAGE MANAGEMENT ================= -->
|
||||||
|
<div class="form-group">
|
||||||
|
<label>Bestehende Bilder behalten:</label>
|
||||||
|
{% if item.Images and item.Images|length > 0 %}
|
||||||
|
<div class="existing-images-grid">
|
||||||
|
{% for img in item.Images %}
|
||||||
|
<div class="existing-image-card">
|
||||||
|
<img src="{{ url_for('uploaded_file', filename=img) }}" alt="Bild">
|
||||||
|
<label>
|
||||||
|
<input type="checkbox" name="existing_images" value="{{ img }}" checked>
|
||||||
|
Behalten
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
{% else %}
|
||||||
|
<p style="color:#777; font-size:0.9em;">Keine Bilder vorhanden.</p>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<label for="images" style="margin-top:15px;">Neue Bilder/Videos hinzufügen:</label>
|
||||||
|
<input type="file" id="images" name="images" accept=".jpg, .jpeg, .png, .gif, .mp4, .mov, .avi, .mkv, .webm" multiple>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="reservierbar" style="display:inline-block; width:auto; margin-right:10px;">Reservierbar:</label>
|
||||||
|
<input type="checkbox" id="reservierbar" name="reservierbar" style="width:auto;" {% if item.Reservierbar %}checked{% endif %}>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button type="submit" class="submit-button">Änderungen speichern</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<script src="https://cdn.jsdelivr.net/npm/@ericblade/quagga2/dist/quagga.js"></script>
|
||||||
|
<script>
|
||||||
|
let scannerRunning = false;
|
||||||
|
let activeScannerCallback = null;
|
||||||
|
let code4LastScanned = '';
|
||||||
|
let code4LastScannedAt = 0;
|
||||||
|
|
||||||
|
function loadAndSelectFilterValues(filterNumber) {
|
||||||
|
fetch(`/get_predefined_filter_values/${filterNumber}`)
|
||||||
|
.then(res => res.json())
|
||||||
|
.then(data => {
|
||||||
|
for (let i = 1; i <= 4; i++) {
|
||||||
|
const select = document.getElementById(`filter${filterNumber}-${i}`);
|
||||||
|
if (!select) continue;
|
||||||
|
|
||||||
|
const selectedValue = select.getAttribute('data-selected') || '';
|
||||||
|
|
||||||
|
data.values.forEach(val => {
|
||||||
|
if (!val || String(val).trim() === '') return;
|
||||||
|
const opt = document.createElement('option');
|
||||||
|
opt.value = val;
|
||||||
|
opt.textContent = val;
|
||||||
|
select.appendChild(opt);
|
||||||
|
});
|
||||||
|
|
||||||
|
if (selectedValue && !Array.from(select.options).some(o => o.value === selectedValue)) {
|
||||||
|
const customOpt = document.createElement('option');
|
||||||
|
customOpt.value = selectedValue;
|
||||||
|
customOpt.textContent = selectedValue;
|
||||||
|
select.appendChild(customOpt);
|
||||||
|
}
|
||||||
|
|
||||||
|
select.value = selectedValue;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(err => console.error(`Error loading Filter ${filterNumber}:`, err));
|
||||||
|
}
|
||||||
|
|
||||||
|
function loadLocationOptions() {
|
||||||
|
fetch('/get_predefined_locations')
|
||||||
|
.then(res => res.json())
|
||||||
|
.then(data => {
|
||||||
|
const select = document.getElementById('ort');
|
||||||
|
if (!select) return;
|
||||||
|
const currentVal = select.getAttribute('data-selected') || select.value;
|
||||||
|
|
||||||
|
data.locations.forEach(loc => {
|
||||||
|
if (!Array.from(select.options).some(o => o.value === loc)) {
|
||||||
|
const opt = document.createElement('option');
|
||||||
|
opt.value = loc;
|
||||||
|
opt.textContent = loc;
|
||||||
|
select.appendChild(opt);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
select.value = currentVal;
|
||||||
|
})
|
||||||
|
.catch(err => console.error('Error loading locations:', err));
|
||||||
|
}
|
||||||
|
|
||||||
|
function addNewLocation() {
|
||||||
|
const input = document.getElementById('new-location-input');
|
||||||
|
const val = input.value.trim();
|
||||||
|
if (!val) return;
|
||||||
|
const select = document.getElementById('ort');
|
||||||
|
const opt = document.createElement('option');
|
||||||
|
opt.value = val;
|
||||||
|
opt.textContent = val;
|
||||||
|
opt.selected = true;
|
||||||
|
select.appendChild(opt);
|
||||||
|
document.getElementById('new-location-container').style.display = 'none';
|
||||||
|
input.value = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
function cancelAddLocation() {
|
||||||
|
document.getElementById('new-location-container').style.display = 'none';
|
||||||
|
document.getElementById('new-location-input').value = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
function runEngineInitialization(targetSelector, activeCallback, completionMsg, errorStatusSetter) {
|
||||||
|
if (scannerRunning) { Quagga.stop(); scannerRunning = false; }
|
||||||
|
activeScannerCallback = activeCallback;
|
||||||
|
|
||||||
|
Quagga.init({
|
||||||
|
inputStream: { name: "Live", type: "LiveStream", target: document.querySelector(targetSelector), constraints: { width: 640, height: 480, facingMode: "environment" } },
|
||||||
|
decoder: { readers: ["code_128_reader", "ean_reader", "code_39_reader", "upc_reader"] }
|
||||||
|
}, function(err) {
|
||||||
|
if (err) { errorStatusSetter("Kamera-Fehler.", true); return; }
|
||||||
|
Quagga.start(); scannerRunning = true; errorStatusSetter(completionMsg, false);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function killScannerHardware() {
|
||||||
|
if (!scannerRunning) return;
|
||||||
|
Quagga.stop(); scannerRunning = false; activeScannerCallback = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
Quagga.onDetected(function(data) {
|
||||||
|
if (!data || !data.codeResult || !data.codeResult.code) return;
|
||||||
|
if (typeof activeScannerCallback === "function") activeScannerCallback(String(data.codeResult.code).trim());
|
||||||
|
});
|
||||||
|
|
||||||
|
function startCode4Scanner() {
|
||||||
|
const scannerBox = document.getElementById('code4-scanner');
|
||||||
|
const scanBtn = document.getElementById('scan-code4-btn');
|
||||||
|
const baseField = document.getElementById('code_4');
|
||||||
|
const indArea = document.getElementById('individual_codes');
|
||||||
|
|
||||||
|
if (scannerBox.style.display !== 'none') {
|
||||||
|
killScannerHardware(); scannerBox.style.display = 'none'; scanBtn.textContent = 'Barcode scannen'; return;
|
||||||
|
}
|
||||||
|
|
||||||
|
scannerBox.style.display = 'block'; scanBtn.textContent = 'Scanner stoppen';
|
||||||
|
runEngineInitialization('#code4-scanner', function(decodedText) {
|
||||||
|
const now = Date.now();
|
||||||
|
if (decodedText === code4LastScanned && (now - code4LastScannedAt) < 1500) return;
|
||||||
|
code4LastScanned = decodedText; code4LastScannedAt = now;
|
||||||
|
|
||||||
|
killScannerHardware(); scannerBox.style.display = 'none'; scanBtn.textContent = 'Barcode scannen';
|
||||||
|
|
||||||
|
if (!baseField.value.trim()) {
|
||||||
|
baseField.value = decodedText;
|
||||||
|
} else {
|
||||||
|
let codes = indArea.value.split('\n').map(c => c.trim()).filter(c => c);
|
||||||
|
if (!codes.includes(decodedText) && baseField.value.trim() !== decodedText) {
|
||||||
|
codes.push(decodedText);
|
||||||
|
indArea.value = codes.join('\n');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, 'Scanner läuft...', msg => { document.getElementById('code4-scan-status').textContent = msg; });
|
||||||
|
}
|
||||||
|
|
||||||
|
document.addEventListener('DOMContentLoaded', function() {
|
||||||
|
loadLocationOptions();
|
||||||
|
|
||||||
|
// Load Filter options if elements exist on page
|
||||||
|
if (document.getElementById('filter1-1')) {
|
||||||
|
loadAndSelectFilterValues(1);
|
||||||
|
loadAndSelectFilterValues(2);
|
||||||
|
}
|
||||||
|
|
||||||
|
const scanCodeBtn = document.getElementById('scan-code4-btn');
|
||||||
|
if (scanCodeBtn) scanCodeBtn.addEventListener('click', startCode4Scanner);
|
||||||
|
|
||||||
|
const addLocBtn = document.getElementById('add-new-location-btn');
|
||||||
|
if (addLocBtn) addLocBtn.addEventListener('click', () => {
|
||||||
|
const c = document.getElementById('new-location-container');
|
||||||
|
c.style.display = c.style.display === 'none' ? 'block' : 'none';
|
||||||
|
});
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
{% endblock %}
|
||||||
+176
-210
@@ -52,9 +52,10 @@
|
|||||||
|
|
||||||
/* The Scrollable Content Area */
|
/* The Scrollable Content Area */
|
||||||
#detailContent {
|
#detailContent {
|
||||||
overflow-y: auto; /* Adds scrollbar only if needed */
|
overflow-y: auto;
|
||||||
padding-right: 10px; /* Prevents text from rubbing against the scrollbar */
|
padding-right: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Library table-only view styles */
|
/* Library table-only view styles */
|
||||||
.library-table-container {
|
.library-table-container {
|
||||||
max-width: 1400px;
|
max-width: 1400px;
|
||||||
@@ -276,6 +277,7 @@
|
|||||||
border-bottom: 1px solid #eee;
|
border-bottom: 1px solid #eee;
|
||||||
color: #555;
|
color: #555;
|
||||||
font-size: 0.95em;
|
font-size: 0.95em;
|
||||||
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
|
||||||
.library-items-table tbody tr:hover {
|
.library-items-table tbody tr:hover {
|
||||||
@@ -500,14 +502,14 @@
|
|||||||
|
|
||||||
<!-- Search and Filter Toggle -->
|
<!-- Search and Filter Toggle -->
|
||||||
<div class="library-search-bar">
|
<div class="library-search-bar">
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
id="librarySearch"
|
id="librarySearch"
|
||||||
class="library-search-input"
|
class="library-search-input"
|
||||||
placeholder="Nach Titel, ISBN suchen..."
|
placeholder="Nach Titel, ISBN suchen..."
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
id="filterToggleBtn"
|
id="filterToggleBtn"
|
||||||
class="library-filter-toggle-btn"
|
class="library-filter-toggle-btn"
|
||||||
aria-label="Filter öffnen/schließen"
|
aria-label="Filter öffnen/schließen"
|
||||||
>
|
>
|
||||||
@@ -524,7 +526,7 @@
|
|||||||
<option value="card_only">Nur Ausweis erfassen</option>
|
<option value="card_only">Nur Ausweis erfassen</option>
|
||||||
<option value="quick_toggle">Schnellmodus: Ausweis + Mediencode</option>
|
<option value="quick_toggle">Schnellmodus: Ausweis + Mediencode</option>
|
||||||
</select>
|
</select>
|
||||||
<input type="text" id="activeStudentCard" placeholder="Aktiver Ausweis (gescannt)" readonly>
|
<input type="text" id="activeStudentCard" placeholder="Aktiver Ausweis (gescannt)" >
|
||||||
<input type="text" id="manualItemCode" placeholder="Manueller Mediencode (optional)" style="min-width:180px;">
|
<input type="text" id="manualItemCode" placeholder="Manueller Mediencode (optional)" style="min-width:180px;">
|
||||||
<button id="resetCardBtn" class="button" type="button">Ausweis löschen</button>
|
<button id="resetCardBtn" class="button" type="button">Ausweis löschen</button>
|
||||||
<button id="toggleScannerBtn" class="button" type="button">Scanner starten</button>
|
<button id="toggleScannerBtn" class="button" type="button">Scanner starten</button>
|
||||||
@@ -598,12 +600,12 @@
|
|||||||
<table class="library-items-table">
|
<table class="library-items-table">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th style="width: 24%;">Titel</th>
|
<th style="width: 32%;">Titel</th>
|
||||||
<th style="width: 12%;">ISBN/Code</th>
|
<th style="width: 12%;">ISBN/Code</th>
|
||||||
<th style="width: 8%;">Typ</th>
|
<th style="width: 8%;">Typ</th>
|
||||||
<th style="width: 8%;">Anzahl</th>
|
<th style="width: 8%;">Anzahl</th>
|
||||||
<th style="width: 12%;">Status</th>
|
<th style="width: 14%;">Status</th>
|
||||||
<th style="width: 22%;">Aktionen</th>
|
<th style="width: 26%;">Aktionen</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody id="itemsTableBody">
|
<tbody id="itemsTableBody">
|
||||||
@@ -656,11 +658,11 @@
|
|||||||
const RENDER_BATCH_COUNT = 120;
|
const RENDER_BATCH_COUNT = 120;
|
||||||
let renderedCount = INITIAL_RENDER_COUNT;
|
let renderedCount = INITIAL_RENDER_COUNT;
|
||||||
let filterPanelOpen = false;
|
let filterPanelOpen = false;
|
||||||
|
|
||||||
// Scanner Related State Variables
|
// Scanner Related State Variables
|
||||||
let scannerInstance = null;
|
let scannerInstance = null;
|
||||||
let scannerRunning = false;
|
let scannerRunning = false;
|
||||||
let activeScannerCallback = null;
|
let activeScannerCallback = null;
|
||||||
let activeStudentCardId = '';
|
let activeStudentCardId = '';
|
||||||
let lastScanValue = '';
|
let lastScanValue = '';
|
||||||
let lastScanAt = 0;
|
let lastScanAt = 0;
|
||||||
@@ -674,9 +676,14 @@
|
|||||||
seriesGroupId: '',
|
seriesGroupId: '',
|
||||||
groupMembers: []
|
groupMembers: []
|
||||||
};
|
};
|
||||||
|
|
||||||
const canEditLibraryItems = (document.getElementById('libraryTableContainer')?.dataset.canEdit === '1');
|
const canEditLibraryItems = (document.getElementById('libraryTableContainer')?.dataset.canEdit === '1');
|
||||||
|
|
||||||
|
function isVideoFile(filename) {
|
||||||
|
if (!filename) return false;
|
||||||
|
return /\.(mp4|webm|ogg|mov)$/i.test(filename);
|
||||||
|
}
|
||||||
|
|
||||||
// =========================================================================
|
// =========================================================================
|
||||||
// 2. DATA LOADING & FILTERING ENGINE
|
// 2. DATA LOADING & FILTERING ENGINE
|
||||||
// =========================================================================
|
// =========================================================================
|
||||||
@@ -705,7 +712,7 @@
|
|||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Error loading library items:', error);
|
console.error('Error loading library items:', error);
|
||||||
document.getElementById('itemsTableBody').innerHTML = '<tr><td colspan="7" style="text-align:center; color:#999;">Fehler beim Laden der Bibliothekselemente.</td></tr>';
|
document.getElementById('itemsTableBody').innerHTML = '<tr><td colspan="8" style="text-align:center; color:#999;">Fehler beim Laden der Bibliothekselemente.</td></tr>';
|
||||||
} finally {
|
} finally {
|
||||||
pagingState.loading = false;
|
pagingState.loading = false;
|
||||||
}
|
}
|
||||||
@@ -797,10 +804,11 @@
|
|||||||
const statusText = statusKey === 'damaged' ? 'Defekt/Zerstört' : (statusKey === 'borrowed' ? 'Ausgeliehen' : 'Verfügbar');
|
const statusText = statusKey === 'damaged' ? 'Defekt/Zerstört' : (statusKey === 'borrowed' ? 'Ausgeliehen' : 'Verfügbar');
|
||||||
const actionLabel = statusKey === 'available' ? 'Ausleihen' : (statusKey === 'borrowed' ? 'Reservieren' : 'Nicht ausleihbar');
|
const actionLabel = statusKey === 'available' ? 'Ausleihen' : (statusKey === 'borrowed' ? 'Reservieren' : 'Nicht ausleihbar');
|
||||||
const actionDisabled = statusKey === 'damaged' ? 'disabled' : '';
|
const actionDisabled = statusKey === 'damaged' ? 'disabled' : '';
|
||||||
|
|
||||||
return `
|
return `
|
||||||
<tr>
|
<tr>
|
||||||
<td class="table-title">${escapeHtml(item.Name || 'Untitled')}</td>
|
<td class="table-title">${escapeHtml(item.Name || 'Untitled')}</td>
|
||||||
<td>${escapeHtml(item.ISBN || item.Code_4 || item.Code4 || '-')}</td>
|
<td>${escapeHtml(item.ISBN || '-')}</td>
|
||||||
<td>${getItemTypeLabel(item.ItemType || 'book')}</td>
|
<td>${getItemTypeLabel(item.ItemType || 'book')}</td>
|
||||||
<td style="font-weight:600; text-align:center;">${item.Quantity || item.GroupedDisplayCount || 1}</td>
|
<td style="font-weight:600; text-align:center;">${item.Quantity || item.GroupedDisplayCount || 1}</td>
|
||||||
<td>
|
<td>
|
||||||
@@ -877,33 +885,33 @@
|
|||||||
function startScanner(targetCallback) {
|
function startScanner(targetCallback) {
|
||||||
const readerWrap = document.getElementById('scanReaderWrap');
|
const readerWrap = document.getElementById('scanReaderWrap');
|
||||||
const toggleBtn = document.getElementById('toggleScannerBtn');
|
const toggleBtn = document.getElementById('toggleScannerBtn');
|
||||||
|
|
||||||
activeScannerCallback = targetCallback;
|
activeScannerCallback = targetCallback;
|
||||||
|
|
||||||
if (readerWrap) readerWrap.style.display = 'block';
|
if (readerWrap) readerWrap.style.display = 'block';
|
||||||
setScanStatus('Initializing camera...', 'warn');
|
setScanStatus('Initializing camera...', 'warn');
|
||||||
|
|
||||||
Quagga.init({
|
Quagga.init({
|
||||||
inputStream: {
|
inputStream: {
|
||||||
name: "Live",
|
name: "Live",
|
||||||
type: "LiveStream",
|
type: "LiveStream",
|
||||||
target: document.querySelector('#library-scanner-container'),
|
target: document.querySelector('#library-scanner-container'),
|
||||||
constraints: {
|
constraints: {
|
||||||
width: 640,
|
width: 640,
|
||||||
height: 480,
|
height: 480,
|
||||||
facingMode: "environment"
|
facingMode: "environment"
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
decoder: {
|
decoder: {
|
||||||
readers: [
|
readers: [
|
||||||
"code_128_reader",
|
"code_128_reader",
|
||||||
"ean_reader",
|
"ean_reader",
|
||||||
"code_39_reader",
|
"code_39_reader",
|
||||||
"upc_reader",
|
"upc_reader",
|
||||||
"codabar_reader",
|
"codabar_reader",
|
||||||
"i2of5_reader"
|
"i2of5_reader"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}, function(err) {
|
}, function(err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
console.error('Scanner start failed:', err);
|
console.error('Scanner start failed:', err);
|
||||||
@@ -912,41 +920,41 @@
|
|||||||
setScanStatus(`Scanner konnte nicht gestartet werden${detail}`, 'error');
|
setScanStatus(`Scanner konnte nicht gestartet werden${detail}`, 'error');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Quagga.start();
|
Quagga.start();
|
||||||
scannerRunning = true;
|
scannerRunning = true;
|
||||||
|
|
||||||
if (!targetCallback && toggleBtn) {
|
if (!targetCallback && toggleBtn) {
|
||||||
toggleBtn.textContent = 'Scanner stoppen';
|
toggleBtn.textContent = 'Scanner stoppen';
|
||||||
}
|
}
|
||||||
setScanStatus('Scanner aktiv. Jetzt Code scannen.', 'warn');
|
setScanStatus('Scanner aktiv. Jetzt Code scannen.', 'warn');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function stopScanner() {
|
function stopScanner() {
|
||||||
if (!scannerRunning) return;
|
if (!scannerRunning) return;
|
||||||
|
|
||||||
const readerWrap = document.getElementById('scanReaderWrap');
|
const readerWrap = document.getElementById('scanReaderWrap');
|
||||||
const toggleBtn = document.getElementById('toggleScannerBtn');
|
const toggleBtn = document.getElementById('toggleScannerBtn');
|
||||||
|
|
||||||
Quagga.stop();
|
Quagga.stop();
|
||||||
scannerRunning = false;
|
scannerRunning = false;
|
||||||
activeScannerCallback = null;
|
activeScannerCallback = null;
|
||||||
|
|
||||||
if (readerWrap) readerWrap.style.display = 'none';
|
if (readerWrap) readerWrap.style.display = 'none';
|
||||||
if (toggleBtn) toggleBtn.textContent = 'Scanner starten';
|
if (toggleBtn) toggleBtn.textContent = 'Scanner starten';
|
||||||
setScanStatus('Scanner gestoppt.', 'warn');
|
setScanStatus('Scanner gestoppt.', 'warn');
|
||||||
}
|
}
|
||||||
|
|
||||||
Quagga.onDetected(function(data) {
|
Quagga.onDetected(function(data) {
|
||||||
if (!data || !data.codeResult || !data.codeResult.code) return;
|
if (!data || !data.codeResult || !data.codeResult.code) return;
|
||||||
|
|
||||||
const barcode = String(data.codeResult.code || '').trim();
|
const barcode = String(data.codeResult.code || '').trim();
|
||||||
console.log("Barcode detected:", barcode);
|
console.log("Barcode detected:", barcode);
|
||||||
|
|
||||||
const currentCallback = activeScannerCallback;
|
const currentCallback = activeScannerCallback;
|
||||||
stopScanner();
|
stopScanner();
|
||||||
|
|
||||||
const returnOnly = (document.getElementById('returnOnlyToggle') || {}).checked;
|
const returnOnly = (document.getElementById('returnOnlyToggle') || {}).checked;
|
||||||
if (returnOnly) {
|
if (returnOnly) {
|
||||||
// direct return flow
|
// direct return flow
|
||||||
@@ -1008,39 +1016,74 @@
|
|||||||
function handleScanSuccess(decodedText) {
|
function handleScanSuccess(decodedText) {
|
||||||
const scannedCode = normalizeScannedCode(decodedText);
|
const scannedCode = normalizeScannedCode(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;
|
||||||
}
|
}
|
||||||
lastScanValue = scannedCode;
|
lastScanValue = scannedCode;
|
||||||
lastScanAt = now;
|
lastScanAt = now;
|
||||||
|
|
||||||
const mode = (document.getElementById('scanModeSelect') || {}).value || 'card_only';
|
const mode = (document.getElementById('scanModeSelect') || {}).value || 'card_only';
|
||||||
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);
|
processQuickToggleScan(scannedCode);
|
||||||
}
|
}
|
||||||
|
|
||||||
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
|
||||||
if (!activeStudentCardId) {
|
if (!activeStudentCardId) {
|
||||||
// If return-only mode is active, always attempt to return by code
|
setActiveStudentCard(scannedCode);
|
||||||
const returnOnly = (document.getElementById('returnOnlyToggle') || {}).checked;
|
setScanStatus(`Ausweis gesetzt: ${activeStudentCardId}`, 'ok');
|
||||||
if (returnOnly) {
|
return;
|
||||||
await returnByCode(scannedCode);
|
}
|
||||||
|
|
||||||
|
// 3. Ausleihe/Rückgabe verarbeiten (wenn Ausweis vorhanden)
|
||||||
|
try {
|
||||||
|
setScanStatus('Verarbeite Mediencode...', 'warn');
|
||||||
|
const response = await fetch('/api/library_scan_action', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {'Content-Type': 'application/json'},
|
||||||
|
body: JSON.stringify({
|
||||||
|
student_card_id: activeStudentCardId,
|
||||||
|
item_code: scannedCode
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
const result = await response.json();
|
||||||
|
if (!response.ok || !result.ok) {
|
||||||
|
setScanStatus(result.message || 'Scan-Aktion fehlgeschlagen.', 'error');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!activeStudentCardId) {
|
if (result.action === 'borrowed') {
|
||||||
setActiveStudentCard(scannedCode);
|
setScanStatus(`Ausgeliehen: ${result.item_name}`, 'ok');
|
||||||
setScanStatus(`Ausweis gesetzt: ${activeStudentCardId}`, 'ok');
|
showSmallConfirm(`Ausgeliehen: ${result.item_name}`, 'ok');
|
||||||
return;
|
} else if (result.action === 'returned') {
|
||||||
|
setScanStatus(`Zurückgegeben: ${result.item_name}`, 'ok');
|
||||||
|
showSmallConfirm(`Zurückgegeben: ${result.item_name}`, 'ok');
|
||||||
|
} else {
|
||||||
|
setScanStatus(result.message || 'Aktion durchgeführt.', 'ok');
|
||||||
|
showSmallConfirm(result.message || 'Aktion durchgeführt.', 'ok');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
await loadLibraryItems();
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Quick scan action failed:', err);
|
||||||
|
setScanStatus('Fehler beim Verarbeiten des Scans.', 'error');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function returnByCode(code) {
|
async function returnByCode(code) {
|
||||||
if (!code) return;
|
if (!code) return;
|
||||||
@@ -1068,40 +1111,6 @@
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
try {
|
|
||||||
setScanStatus('Verarbeite Mediencode...', 'warn');
|
|
||||||
const response = await fetch('/api/library_scan_action', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {'Content-Type': 'application/json'},
|
|
||||||
body: JSON.stringify({
|
|
||||||
student_card_id: activeStudentCardId,
|
|
||||||
item_code: scannedCode
|
|
||||||
})
|
|
||||||
});
|
|
||||||
|
|
||||||
const result = await response.json();
|
|
||||||
if (!response.ok || !result.ok) {
|
|
||||||
setScanStatus(result.message || 'Scan-Aktion fehlgeschlagen.', 'error');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (result.action === 'borrowed') {
|
|
||||||
setScanStatus(`Ausgeliehen: ${result.item_name}`, 'ok');
|
|
||||||
showSmallConfirm(`Ausgeliehen: ${result.item_name}`, 'ok');
|
|
||||||
} else if (result.action === 'returned') {
|
|
||||||
setScanStatus(`Zurückgegeben: ${result.item_name}`, 'ok');
|
|
||||||
showSmallConfirm(`Zurückgegeben: ${result.item_name}`, 'ok');
|
|
||||||
} else {
|
|
||||||
setScanStatus(result.message || 'Aktion durchgeführt.', 'ok');
|
|
||||||
showSmallConfirm(result.message || 'Aktion durchgeführt.', 'ok');
|
|
||||||
}
|
|
||||||
|
|
||||||
await loadLibraryItems();
|
|
||||||
} catch (err) {
|
|
||||||
console.error('Quick scan action failed:', err);
|
|
||||||
setScanStatus('Fehler beim Verarbeiten des Scans.', 'error');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function scanIntoEditCode() {
|
function scanIntoEditCode() {
|
||||||
const scanReaderWrap = document.getElementById('scanReaderWrap');
|
const scanReaderWrap = document.getElementById('scanReaderWrap');
|
||||||
@@ -1110,15 +1119,15 @@
|
|||||||
if (!scanReaderWrap || !editCodeInput || !scanEditBtn) {
|
if (!scanReaderWrap || !editCodeInput || !scanEditBtn) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (scannerRunning && scanReaderWrap.style.display !== 'none') {
|
if (scannerRunning && scanReaderWrap.style.display !== 'none') {
|
||||||
stopScanner();
|
stopScanner();
|
||||||
scanEditBtn.textContent = 'Barcode scannen';
|
scanEditBtn.textContent = 'Barcode scannen';
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
scanEditBtn.textContent = 'Scanner schließen';
|
scanEditBtn.textContent = 'Scanner schließen';
|
||||||
|
|
||||||
startScanner(function(decodedText) {
|
startScanner(function(decodedText) {
|
||||||
editCodeInput.value = decodedText;
|
editCodeInput.value = decodedText;
|
||||||
if(typeof validateCodeField === "function") {
|
if(typeof validateCodeField === "function") {
|
||||||
@@ -1137,16 +1146,16 @@
|
|||||||
alert('Dieses Medium ist als defekt/zerstört markiert und kann nicht ausgeliehen werden.');
|
alert('Dieses Medium ist als defekt/zerstört markiert und kann nicht ausgeliehen werden.');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const defaultCardId = activeStudentCardId || '';
|
const defaultCardId = activeStudentCardId || '';
|
||||||
const cardId = (window.prompt('Bitte Schülerausweis-ID eingeben:', defaultCardId) || '').trim().toUpperCase();
|
const cardId = (window.prompt('Bitte Schülerausweis-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 Schülerausweis-ID erforderlich.');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
setActiveStudentCard(cardId);
|
setActiveStudentCard(cardId);
|
||||||
|
|
||||||
const durationInput = (window.prompt('Ausleihdauer in Tagen (optional):') || '').trim();
|
const durationInput = (window.prompt('Ausleihdauer in Tagen (optional):') || '').trim();
|
||||||
const maxAvailable = Math.max(1, parseInt(selectedItem?.AvailableGroupedCount || selectedItem?.Quantity || 1, 10) || 1);
|
const maxAvailable = Math.max(1, parseInt(selectedItem?.AvailableGroupedCount || selectedItem?.Quantity || 1, 10) || 1);
|
||||||
const countPrompt = (window.prompt(`Anzahl ausleihen? (Standard: 1, verfügbar: ${maxAvailable})`, '1') || '').trim();
|
const countPrompt = (window.prompt(`Anzahl ausleihen? (Standard: 1, verfügbar: ${maxAvailable})`, '1') || '').trim();
|
||||||
@@ -1158,29 +1167,29 @@
|
|||||||
alert(`Es sind nur ${maxAvailable} Exemplar(e) verfügbar.`);
|
alert(`Es sind nur ${maxAvailable} Exemplar(e) verfügbar.`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const form = document.createElement('form');
|
const form = document.createElement('form');
|
||||||
form.method = 'POST';
|
form.method = 'POST';
|
||||||
form.action = `/ausleihen/${itemId}`;
|
form.action = `/ausleihen/${itemId}`;
|
||||||
|
|
||||||
const csrfField = document.createElement('input');
|
const csrfField = document.createElement('input');
|
||||||
csrfField.type = 'hidden';
|
csrfField.type = 'hidden';
|
||||||
csrfField.name = 'csrf_token';
|
csrfField.name = 'csrf_token';
|
||||||
csrfField.value = '{{ csrf_token }}';
|
csrfField.value = '{{ csrf_token }}';
|
||||||
form.appendChild(csrfField);
|
form.appendChild(csrfField);
|
||||||
|
|
||||||
const cardField = document.createElement('input');
|
const cardField = document.createElement('input');
|
||||||
cardField.type = 'hidden';
|
cardField.type = 'hidden';
|
||||||
cardField.name = 'borrower_card_id';
|
cardField.name = 'borrower_card_id';
|
||||||
cardField.value = cardId;
|
cardField.value = cardId;
|
||||||
form.appendChild(cardField);
|
form.appendChild(cardField);
|
||||||
|
|
||||||
const returnTargetField = document.createElement('input');
|
const returnTargetField = document.createElement('input');
|
||||||
returnTargetField.type = 'hidden';
|
returnTargetField.type = 'hidden';
|
||||||
returnTargetField.name = 'return_to';
|
returnTargetField.name = 'return_to';
|
||||||
returnTargetField.value = 'library';
|
returnTargetField.value = 'library';
|
||||||
form.appendChild(returnTargetField);
|
form.appendChild(returnTargetField);
|
||||||
|
|
||||||
if (durationInput) {
|
if (durationInput) {
|
||||||
const durationField = document.createElement('input');
|
const durationField = document.createElement('input');
|
||||||
durationField.type = 'hidden';
|
durationField.type = 'hidden';
|
||||||
@@ -1188,13 +1197,13 @@
|
|||||||
durationField.value = durationInput;
|
durationField.value = durationInput;
|
||||||
form.appendChild(durationField);
|
form.appendChild(durationField);
|
||||||
}
|
}
|
||||||
|
|
||||||
const countField = document.createElement('input');
|
const countField = document.createElement('input');
|
||||||
countField.type = 'hidden';
|
countField.type = 'hidden';
|
||||||
countField.name = 'exemplare_count';
|
countField.name = 'exemplare_count';
|
||||||
countField.value = String(borrowCount || 1);
|
countField.value = String(borrowCount || 1);
|
||||||
form.appendChild(countField);
|
form.appendChild(countField);
|
||||||
|
|
||||||
document.body.appendChild(form);
|
document.body.appendChild(form);
|
||||||
form.submit();
|
form.submit();
|
||||||
}
|
}
|
||||||
@@ -1221,13 +1230,13 @@
|
|||||||
// auto remove after 3 seconds
|
// auto remove after 3 seconds
|
||||||
setTimeout(() => { try { if (el && el.parentNode) el.parentNode.removeChild(el); } catch(e){} }, 3000);
|
setTimeout(() => { try { if (el && el.parentNode) el.parentNode.removeChild(el); } catch(e){} }, 3000);
|
||||||
}
|
}
|
||||||
|
|
||||||
function setActiveStudentCard(cardId) {
|
function setActiveStudentCard(cardId) {
|
||||||
activeStudentCardId = (cardId || '').trim().toUpperCase();
|
activeStudentCardId = (cardId || '').trim().toUpperCase();
|
||||||
const input = document.getElementById('activeStudentCard');
|
const input = document.getElementById('activeStudentCard');
|
||||||
if (input) input.value = activeStudentCardId;
|
if (input) input.value = activeStudentCardId;
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizeScannedCode(code) {
|
function normalizeScannedCode(code) {
|
||||||
return (code || '').trim();
|
return (code || '').trim();
|
||||||
}
|
}
|
||||||
@@ -1243,16 +1252,60 @@
|
|||||||
return div.innerHTML;
|
return div.innerHTML;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Opens the modal and fetches the data
|
|
||||||
function showItemDetail(itemId) {
|
function showItemDetail(itemId) {
|
||||||
const detailContent = document.getElementById('detailContent');
|
const detailContent = document.getElementById('detailContent');
|
||||||
const detailModal = document.getElementById('detailModal');
|
const detailModal = document.getElementById('detailModal');
|
||||||
|
|
||||||
// 1. Show the loading state immediately
|
// 1. Show the loading state immediately
|
||||||
detailContent.innerHTML = '<p>Loading details...</p>';
|
detailContent.innerHTML = '<p>Lade Details...</p>';
|
||||||
detailModal.style.display = 'flex';
|
detailModal.style.display = 'flex';
|
||||||
|
|
||||||
// 2. Fetch the data
|
// 2. Generate Image/Video Gallery Client-Side
|
||||||
|
const item = libraryItems.find(i => i._id === itemId);
|
||||||
|
let mediaHtml = '';
|
||||||
|
|
||||||
|
// Sicherstellen, dass item.Images existiert und ein Array mit Elementen ist
|
||||||
|
if (item && Array.isArray(item.Images) && item.Images.length > 0) {
|
||||||
|
const imagesHtml = item.Images.map((image, index) => {
|
||||||
|
// Robuste Pfad-Generierung: Startet es nicht mit http oder /, setzen wir /uploads/ davor
|
||||||
|
let imageSrc = image;
|
||||||
|
if (!image.startsWith('http') && !image.startsWith('/')) {
|
||||||
|
// Passe "/uploads/" an, falls dein Server-Ordner für Bilder anders heißt (z.B. "/static/uploads/")
|
||||||
|
imageSrc = '/uploads/' + image;
|
||||||
|
}
|
||||||
|
|
||||||
|
const thumbnailInfo = item.ThumbnailInfo && item.ThumbnailInfo[index];
|
||||||
|
const isVideo = isVideoFile(image);
|
||||||
|
|
||||||
|
if (isVideo) {
|
||||||
|
const videoSrc = thumbnailInfo && thumbnailInfo.has_thumbnail
|
||||||
|
? thumbnailInfo.thumbnail_url
|
||||||
|
: imageSrc;
|
||||||
|
|
||||||
|
if (thumbnailInfo && thumbnailInfo.has_thumbnail) {
|
||||||
|
return `
|
||||||
|
<div class="video-container" style="position: relative; width: 120px; height: 120px; display: inline-block; margin-right: 15px; margin-bottom: 15px;">
|
||||||
|
<img src="${videoSrc}" alt="${escapeHtml(item.Name || 'Medium')}" class="item-image" style="width: 100%; height: 100%; object-fit: cover; border-radius: 8px; border: 1px solid #ddd;">
|
||||||
|
<div class="video-preview-overlay" style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); color: white; background: rgba(0,0,0,0.6); border-radius: 50%; width: 36px; height: 36px; display: flex; align-items: center; justify-content: center; font-size: 16px;">
|
||||||
|
▶
|
||||||
|
</div>
|
||||||
|
</div>`;
|
||||||
|
} else {
|
||||||
|
return `<div style="width: 120px; height: 120px; background: #333; color: #fff; display: inline-flex; align-items: center; justify-content: center; border-radius: 8px; margin-right: 15px; margin-bottom: 15px;">VIDEO</div>`;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
const imageSrcFinal = thumbnailInfo && thumbnailInfo.has_thumbnail
|
||||||
|
? thumbnailInfo.thumbnail_url
|
||||||
|
: imageSrc;
|
||||||
|
|
||||||
|
return `<img src="${imageSrcFinal}" alt="${escapeHtml(item.Name || 'Medium')}" class="item-image" style="width: 120px; height: 120px; object-fit: cover; border-radius: 8px; border: 1px solid #ddd; margin-right: 15px; margin-bottom: 15px;">`;
|
||||||
|
}
|
||||||
|
}).join('');
|
||||||
|
|
||||||
|
mediaHtml = `<div class="detail-gallery-container" style="margin-bottom: 20px; padding-bottom: 15px; border-bottom: 1px solid #eee; display: flex; flex-wrap: wrap;">${imagesHtml}</div>`;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Fetch the data
|
||||||
fetch(`/api/item_detail/${itemId}`)
|
fetch(`/api/item_detail/${itemId}`)
|
||||||
.then(response => {
|
.then(response => {
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -1261,12 +1314,12 @@
|
|||||||
return response.text();
|
return response.text();
|
||||||
})
|
})
|
||||||
.then(html => {
|
.then(html => {
|
||||||
// 3. Clean the HTML and display it
|
// 4. Clean the HTML and display it, injecting the media gallery before the fetched content
|
||||||
detailContent.innerHTML = DOMPurify.sanitize(html);
|
detailContent.innerHTML = mediaHtml + DOMPurify.sanitize(html);
|
||||||
})
|
})
|
||||||
.catch(err => {
|
.catch(err => {
|
||||||
console.error('Error loading detail:', err);
|
console.error('Error loading detail:', err);
|
||||||
detailContent.innerHTML = '<p>Sorry, we could not load the item details. Please try again later.</p>';
|
detailContent.innerHTML = '<p style="color: red;">Entschuldigung, die Details konnten nicht geladen werden. Bitte versuche es später erneut.</p>';
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1292,7 +1345,7 @@
|
|||||||
const resetBtn = document.getElementById('resetCardBtn');
|
const resetBtn = document.getElementById('resetCardBtn');
|
||||||
const modeSelect = document.getElementById('scanModeSelect');
|
const modeSelect = document.getElementById('scanModeSelect');
|
||||||
const keyboardToggle = document.getElementById('keyboardScannerToggle');
|
const keyboardToggle = document.getElementById('keyboardScannerToggle');
|
||||||
|
|
||||||
if (toggleBtn) {
|
if (toggleBtn) {
|
||||||
toggleBtn.addEventListener('click', async () => {
|
toggleBtn.addEventListener('click', async () => {
|
||||||
if (scannerRunning) {
|
if (scannerRunning) {
|
||||||
@@ -1302,14 +1355,14 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (resetBtn) {
|
if (resetBtn) {
|
||||||
resetBtn.addEventListener('click', () => {
|
resetBtn.addEventListener('click', () => {
|
||||||
setActiveStudentCard('');
|
setActiveStudentCard('');
|
||||||
setScanStatus('Ausweis zurückgesetzt. Bitte neu scannen.', 'warn');
|
setScanStatus('Ausweis zurückgesetzt. Bitte neu scannen.', 'warn');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (modeSelect) {
|
if (modeSelect) {
|
||||||
modeSelect.addEventListener('change', () => {
|
modeSelect.addEventListener('change', () => {
|
||||||
if (modeSelect.value === 'quick_toggle' && !activeStudentCardId) {
|
if (modeSelect.value === 'quick_toggle' && !activeStudentCardId) {
|
||||||
@@ -1335,8 +1388,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Run when DOM structure is entirely ready
|
// Run when DOM structure is entirely ready
|
||||||
document.addEventListener('DOMContentLoaded', () => {
|
document.addEventListener('DOMContentLoaded', async () => {
|
||||||
wireScannerUi(); // Setup scanner control buttons
|
wireScannerUi(); // Setup scanner control buttons
|
||||||
loadLibraryItems(); // Fetch your database items right away!
|
loadLibraryItems(); // Fetch your database items right away!
|
||||||
|
|
||||||
// Safely connect standard Filters and Search inputs inside DOMContentLoaded
|
// Safely connect standard Filters and Search inputs inside DOMContentLoaded
|
||||||
@@ -1365,7 +1418,7 @@
|
|||||||
document.getElementById('filterISBN').value = '';
|
document.getElementById('filterISBN').value = '';
|
||||||
document.getElementById('filterType').value = '';
|
document.getElementById('filterType').value = '';
|
||||||
document.getElementById('filterStatus').value = '';
|
document.getElementById('filterStatus').value = '';
|
||||||
activeFilters = { isbn: '', type: '', status: '' };
|
activeFilters = {isbn: '', type: '', status: ''};
|
||||||
applyFiltersAndSearch(true);
|
applyFiltersAndSearch(true);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -1401,13 +1454,16 @@
|
|||||||
|
|
||||||
const editForm = document.getElementById('editLibraryForm');
|
const editForm = document.getElementById('editLibraryForm');
|
||||||
if (editForm) {
|
if (editForm) {
|
||||||
editForm.addEventListener('submit', async function(e) {
|
editForm.addEventListener('submit', async function (e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|
||||||
const itemId = document.getElementById('editLibraryItemId').value;
|
const itemId = document.getElementById('editLibraryItemId').value;
|
||||||
const currentItem = libraryItems.find(i => i._id === itemId);
|
const currentItem = libraryItems.find(i => i._id === itemId);
|
||||||
if (!currentItem) return;
|
if (!currentItem) return;
|
||||||
|
|
||||||
|
const codeInputs = Array.from(document.querySelectorAll('#editLibraryCodesContainer input[data-item-id]'));
|
||||||
|
|
||||||
|
// Daten aus dem Formular sammeln
|
||||||
const sharedPayload = {
|
const sharedPayload = {
|
||||||
name: document.getElementById('editLibraryName').value,
|
name: document.getElementById('editLibraryName').value,
|
||||||
item_type: document.getElementById('editLibraryType').value,
|
item_type: document.getElementById('editLibraryType').value,
|
||||||
@@ -1419,11 +1475,11 @@
|
|||||||
reservierbar: currentItem.Reservierbar !== false,
|
reservierbar: currentItem.Reservierbar !== false,
|
||||||
};
|
};
|
||||||
|
|
||||||
const codeInputs = Array.from(document.querySelectorAll('#editLibraryCodesContainer input[data-item-id]'));
|
|
||||||
const codeByItemId = new Map(codeInputs.map(input => [input.dataset.itemId, (input.value || '').trim()]));
|
const codeByItemId = new Map(codeInputs.map(input => [input.dataset.itemId, (input.value || '').trim()]));
|
||||||
const groupMembers = editLibraryState.groupMembers.length > 0 ? editLibraryState.groupMembers : [currentItem];
|
const groupMembers = editLibraryState.groupMembers.length > 0 ? editLibraryState.groupMembers : [currentItem];
|
||||||
const isGroupedEdit = Boolean(currentItem.SeriesGroupId) && groupMembers.length > 1;
|
const isGroupedEdit = Boolean(currentItem.SeriesGroupId) && groupMembers.length > 1;
|
||||||
|
|
||||||
|
// API-Aufruf
|
||||||
try {
|
try {
|
||||||
if (isGroupedEdit) {
|
if (isGroupedEdit) {
|
||||||
const payload = {
|
const payload = {
|
||||||
@@ -1495,7 +1551,6 @@
|
|||||||
|
|
||||||
async function fetchLibraryGroupMembers(seriesGroupId) {
|
async function fetchLibraryGroupMembers(seriesGroupId) {
|
||||||
if (!seriesGroupId) return [];
|
if (!seriesGroupId) return [];
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await fetch(`/api/library_group/${encodeURIComponent(seriesGroupId)}`);
|
const response = await fetch(`/api/library_group/${encodeURIComponent(seriesGroupId)}`);
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -1554,105 +1609,16 @@
|
|||||||
labelParts.push('aktuelles Medium');
|
labelParts.push('aktuelles Medium');
|
||||||
}
|
}
|
||||||
return `
|
return `
|
||||||
<div style="display:flex; flex-direction:column; gap:6px; margin-bottom:10px;">
|
<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>
|
<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;">
|
<input id="editLibraryCode-${member._id}" data-item-id="${escapeHtml(member._id)}" value="${escapeHtml(codeValue)}" placeholder="Mediencode" style="width:100%; padding:8px 10px; border:1px solid #d0d7e2; border-radius:6px;">
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
}).join('');
|
}).join('');
|
||||||
}
|
}
|
||||||
|
|
||||||
window.openEditLibraryItem = async function(itemId) {
|
function openEditLibraryItem(itemId) {
|
||||||
const item = libraryItems.find(i => i._id === itemId);
|
window.location.href = `/item_edit/${itemId}`;
|
||||||
if (!item) return;
|
|
||||||
|
|
||||||
editLibraryState.itemId = item._id;
|
|
||||||
editLibraryState.seriesGroupId = item.SeriesGroupId || '';
|
|
||||||
editLibraryState.groupMembers = [];
|
|
||||||
|
|
||||||
// 1. Felder befüllen
|
|
||||||
document.getElementById('editLibraryItemId').value = item._id;
|
|
||||||
document.getElementById('editLibraryName').value = item.Name;
|
|
||||||
document.getElementById('editLibraryType').value = item.ItemType;
|
|
||||||
document.getElementById('editLibraryIsbn').value = item.ISBN || '';
|
|
||||||
document.getElementById('editLibraryLocation').value = item.Ort;
|
|
||||||
document.getElementById('editLibraryDescription').value = item.Beschreibung;
|
|
||||||
|
|
||||||
const codesContainer = document.getElementById('editLibraryCodesContainer');
|
|
||||||
if (codesContainer) {
|
|
||||||
codesContainer.innerHTML = '<div style="padding:10px 0; color:#6b7280;">Lade Codes...</div>';
|
|
||||||
}
|
|
||||||
|
|
||||||
const groupMembers = item.SeriesGroupId ? await fetchLibraryGroupMembers(item.SeriesGroupId) : [item];
|
|
||||||
renderLibraryGroupCodeFields(groupMembers.length > 0 ? groupMembers : [item], item._id);
|
|
||||||
|
|
||||||
document.getElementById('editLibraryModal').style.display = 'flex';
|
|
||||||
};
|
|
||||||
|
|
||||||
function closeEditLibraryModal() {
|
|
||||||
document.getElementById('editLibraryModal').style.display = 'none';
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div id="editLibraryModal" class="modal" style="display:none;">
|
|
||||||
<div class="modal-content" style="max-width: 760px; padding: 25px; border-radius: 8px;">
|
|
||||||
<span class="close" onclick="closeEditLibraryModal()" style="cursor: pointer; float: right; font-size: 24px;">×</span>
|
|
||||||
<h3 style="margin-top:0;">Bibliotheksmedium bearbeiten</h3>
|
|
||||||
|
|
||||||
<!-- Bereich für Gruppen-Informationen (Hier konsolidiert!) -->
|
|
||||||
<div id="editLibraryGroupWarning" style="display:none; background-color: #fff; padding: 15px; border-radius: 6px; margin-bottom: 20px; border: 1px solid #0ea5e9;">
|
|
||||||
<div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px; border-bottom: 1px solid #eee; padding-bottom: 10px;">
|
|
||||||
<strong style="color: #0ea5e9;">Gruppen-Range (Total: <span id="editLibraryGroupCount"></span>)</strong>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<p id="editLibraryGroupHint" style="margin: 5px 0; font-size: 12px; color: #555;">
|
|
||||||
Änderungen an Titel, Ort und Beschreibung werden auf alle Exemplare der Gruppe übertragen.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<div style="margin-top: 15px; font-size: 11px; background: #e0f2fe; padding: 8px; border-radius: 4px;">
|
|
||||||
<strong>Hinweis:</strong> Jeder Mediencode wird einzeln gespeichert, damit alle Exemplare der Gruppe korrekt bleiben.
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<form id="editLibraryForm">
|
|
||||||
<input type="hidden" id="editLibraryItemId">
|
|
||||||
<div class="edit-grid">
|
|
||||||
<div class="full">
|
|
||||||
<label for="editLibraryName">Titel</label>
|
|
||||||
<input id="editLibraryName" required style="width: 100%;">
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label for="editLibraryType">Medientyp</label>
|
|
||||||
<select id="editLibraryType" style="width: 100%;">
|
|
||||||
<option value="Buch">Buch</option>
|
|
||||||
<option value="Schulbuch">Schulbuch</option>
|
|
||||||
<option value="cd">CD</option>
|
|
||||||
<option value="dvd">DVD</option>
|
|
||||||
<option value="other">Sonstige Medien</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label for="editLibraryIsbn">ISBN</label>
|
|
||||||
<input id="editLibraryIsbn" placeholder="optional ISBN-10/13" style="width: 100%;">
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label>Mediencodes</label>
|
|
||||||
<div id="editLibraryCodesContainer"></div>
|
|
||||||
</div>
|
|
||||||
<div class="full">
|
|
||||||
<label for="editLibraryLocation">Ort</label>
|
|
||||||
<input id="editLibraryLocation" required style="width: 100%;">
|
|
||||||
</div>
|
|
||||||
<div class="full">
|
|
||||||
<label for="editLibraryDescription">Beschreibung</label>
|
|
||||||
<textarea id="editLibraryDescription" rows="4" required style="width: 100%;"></textarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="edit-actions" style="margin-top:20px;">
|
|
||||||
<button type="submit" class="button" style="background:#0ea5e9;color:#fff;">Speichern & Synchronisieren</button>
|
|
||||||
<button type="button" class="button" onclick="closeEditLibraryModal()">Abbrechen</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
+67
-497
@@ -1951,11 +1951,6 @@
|
|||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Edit new location container */
|
|
||||||
.edit-new-location-container {
|
|
||||||
display: none;
|
|
||||||
margin-top: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Modal dialog styling */
|
/* Modal dialog styling */
|
||||||
.modal-dialog-white {
|
.modal-dialog-white {
|
||||||
@@ -1969,11 +1964,6 @@
|
|||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Element text colors for better visibility */
|
|
||||||
.edit-button, .duplicate-button, .generate-qr-button {
|
|
||||||
color: var(--ui-title) !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Standardized button styles across the application */
|
/* Standardized button styles across the application */
|
||||||
.search-button, .scan-button, .filter-toggle, .clear-filter,
|
.search-button, .scan-button, .filter-toggle, .clear-filter,
|
||||||
.add-new-btn, .popup-close-button, .prev-image-button, .next-image-button,
|
.add-new-btn, .popup-close-button, .prev-image-button, .next-image-button,
|
||||||
@@ -2474,187 +2464,6 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Add the edit modal form -->
|
|
||||||
{% if current_permissions.actions.get('can_edit', False) %}
|
|
||||||
<div id="edit-modal" class="item-modal">
|
|
||||||
<div class="modal-content">
|
|
||||||
<span class="close-modal" onclick="closeEditModal()">×</span>
|
|
||||||
<h2>Objekt bearbeiten</h2>
|
|
||||||
<form id="edit-item-form" method="POST" enctype="multipart/form-data">
|
|
||||||
<input type="hidden" id="edit-item-id" name="id">
|
|
||||||
<div class="form-row">
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="edit-name">Name:</label>
|
|
||||||
<input type="text" id="edit-name" name="name" required>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="edit-location">Ort:</label>
|
|
||||||
<select id="edit-location" name="ort" required>
|
|
||||||
<option value="">-- Bitte Ort auswählen --</option>
|
|
||||||
<!-- Options will be loaded by JavaScript -->
|
|
||||||
</select>
|
|
||||||
<button type="button" class="add-new-btn" id="edit-add-new-location-btn">
|
|
||||||
Neuen Ort hinzufügen
|
|
||||||
</button>
|
|
||||||
<div id="edit-new-location-container" class="edit-new-location-container">
|
|
||||||
<input type="text" id="edit-new-location-input" placeholder="Neuen Ort eingeben">
|
|
||||||
<button type="button" onclick="addNewLocation('edit')">Hinzufügen</button>
|
|
||||||
<button type="button" onclick="cancelAddLocation('edit')">Abbrechen</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="edit-description">Beschreibung:</label>
|
|
||||||
<textarea id="edit-description" name="beschreibung" required></textarea>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Updated filter inputs for edit form with dropdowns -->
|
|
||||||
<div class="filter-inputs">
|
|
||||||
<h3>Unterrichtsfach:</h3>
|
|
||||||
<div class="multi-filter">
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="edit-filter1-1">Wert 1:</label>
|
|
||||||
<select id="edit-filter1-1" name="filter" class="filter-dropdown-select">
|
|
||||||
<option value="">-- Bitte auswählen --</option>
|
|
||||||
<!-- Options will be loaded by JavaScript -->
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="edit-filter1-2">Wert 2:</label>
|
|
||||||
<select id="edit-filter1-2" name="filter" class="filter-dropdown-select">
|
|
||||||
<option value="">-- Optional --</option>
|
|
||||||
<!-- Options will be loaded by JavaScript -->
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="edit-filter1-3">Wert 3:</label>
|
|
||||||
<select id="edit-filter1-3" name="filter" class="filter-dropdown-select">
|
|
||||||
<option value="">-- Optional --</option>
|
|
||||||
<!-- Options will be loaded by JavaScript -->
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="edit-filter1-4">Wert 4:</label>
|
|
||||||
<select id="edit-filter1-4" name="filter" class="filter-dropdown-select">
|
|
||||||
<option value="">-- Optional --</option>
|
|
||||||
<!-- Options will be loaded by JavaScript -->
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h3>Jahrgangsstufe:</h3>
|
|
||||||
<div class="multi-filter">
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="edit-filter2-1">Wert 1:</label>
|
|
||||||
<select id="edit-filter2-1" name="filter2" class="filter-dropdown-select">
|
|
||||||
<option value="">-- Bitte auswählen --</option>
|
|
||||||
<!-- Options will be loaded by JavaScript -->
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="edit-filter2-2">Wert 2:</label>
|
|
||||||
<select id="edit-filter2-2" name="filter2" class="filter-dropdown-select">
|
|
||||||
<option value="">-- Optional --</option>
|
|
||||||
<!-- Options will be loaded by JavaScript -->
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="edit-filter2-3">Wert 3:</label>
|
|
||||||
<select id="edit-filter2-3" name="filter2" class="filter-dropdown-select">
|
|
||||||
<option value="">-- Optional --</option>
|
|
||||||
<!-- Options will be loaded by JavaScript -->
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="edit-filter2-4">Wert 4:</label>
|
|
||||||
<select id="edit-filter2-4" name="filter2" class="filter-dropdown-select">
|
|
||||||
<option value="">-- Optional --</option>
|
|
||||||
<!-- Options will be loaded by JavaScript -->
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h3>Schlagwort:</h3>
|
|
||||||
<div class="multi-filter">
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="edit-filter3-1">Wert 1:</label>
|
|
||||||
<input type="text" id="edit-filter3-1" name="filter3">
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="edit-filter3-2">Wert 2:</label>
|
|
||||||
<input type="text" id="edit-filter3-2" name="filter3">
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="edit-filter3-3">Wert 3:</label>
|
|
||||||
<input type="text" id="edit-filter3-3" name="filter3">
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="edit-filter3-4">Wert 4:</label>
|
|
||||||
<input type="text" id="edit-filter3-4" name="filter3">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="edit-year">Anschaffungsjahr:</label>
|
|
||||||
<input type="date" id="edit-year" name="anschaffungsjahr">
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="edit-cost">Anschaffungskosten (€):</label>
|
|
||||||
<input id="edit-cost" name="anschaffungskosten">
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="edit-code4">Code:</label>
|
|
||||||
<div style="display:flex; gap:8px; align-items:center; flex-wrap:wrap;">
|
|
||||||
<input id="edit-code4" name="code_4">
|
|
||||||
<button type="button" class="fetch-isbn-button" id="scan-edit-code-btn">Barcode scannen</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="edit-reservierbar" style="display:inline-block; width:auto; margin-right:10px;">Reservierbar:</label>
|
|
||||||
<input type="checkbox" id="edit-reservierbar" name="reservierbar" style="width:auto;">
|
|
||||||
<small style="display:block; color:#666;">Wenn deaktiviert, kann der Artikel nicht im Voraus reserviert werden.</small>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- New section for managing images -->
|
|
||||||
<div class="form-group">
|
|
||||||
<label>Vorhandene Bilder:</label>
|
|
||||||
<div id="edit-existing-images" class="existing-images-container">
|
|
||||||
<!-- Existing images will be added here dynamically -->
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="edit-new-images">
|
|
||||||
<span>Neue Bilder/Videos hinzufügen:</span>
|
|
||||||
<span>(Bilder/Videos werden vom Original übernommen)</span>
|
|
||||||
</label>
|
|
||||||
<input type="file" id="edit-new-images" name="new_images" accept=".jpg, .jpeg, .png, .gif, .mp4, .mov, .avi, .mkv, .webm, .flv, .m4v, .3gp" multiple>
|
|
||||||
<div class="allowed-formats">Erlaubte Formate: JPG, JPEG, PNG, GIF, MP4, MOV, AVI, MKV, WEBM, FLV, M4V, 3GP</div>
|
|
||||||
<!-- Add image preview container -->
|
|
||||||
<div class="image-preview-container" id="edit-image-preview-container"></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="edit-isbn">ISBN:</label>
|
|
||||||
<div class="isbn-input-group">
|
|
||||||
<input type="text" id="edit-isbn" name="isbn" placeholder="ISBN eingeben...">
|
|
||||||
<button type="button" class="fetch-isbn-button" id="scan-edit-isbn-btn">ISBN scannen</button>
|
|
||||||
<button type="button" class="fetch-isbn-button" onclick="fetchBookInfo('edit')">Buchinformationen abrufen</button>
|
|
||||||
</div>
|
|
||||||
<div id="edit-book-info-container" class="book-info-container"></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-actions">
|
|
||||||
<button type="submit" class="save-button">Speichern</button>
|
|
||||||
<button type="button" class="cancel-button" onclick="closeEditModal()">Abbrechen</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Schedule Appointment Modal -->
|
<!-- Schedule Appointment Modal -->
|
||||||
@@ -2889,58 +2698,6 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
function scanIntoEditCode() {
|
|
||||||
const qrReader = document.getElementById('qr-reader');
|
|
||||||
const editCodeInput = document.getElementById('edit-code4');
|
|
||||||
const scanEditBtn = document.getElementById('scan-edit-code-btn');
|
|
||||||
if (!qrReader || !editCodeInput || !scanEditBtn) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Toggle close if it's already running
|
|
||||||
if (isScanning && qrReader.style.display !== 'none') {
|
|
||||||
stopScanner();
|
|
||||||
scanEditBtn.textContent = 'Barcode scannen';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
scanEditBtn.textContent = 'Scanner schließen';
|
|
||||||
|
|
||||||
// Start scanner with custom logic mapping to the Code input field
|
|
||||||
startScanner(function(decodedText) {
|
|
||||||
editCodeInput.value = decodedText;
|
|
||||||
validateCodeField(editCodeInput, document.getElementById('edit-item-id')?.value || null);
|
|
||||||
scanEditBtn.textContent = 'Barcode scannen';
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function scanIntoEditIsbn() {
|
|
||||||
const qrReader = document.getElementById('qr-reader');
|
|
||||||
const editIsbnInput = document.getElementById('edit-isbn');
|
|
||||||
const scanIsbnBtn = document.getElementById('scan-edit-isbn-btn');
|
|
||||||
if (!qrReader || !editIsbnInput || !scanIsbnBtn) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Toggle close if it's already running
|
|
||||||
if (isScanning && qrReader.style.display !== 'none') {
|
|
||||||
stopScanner();
|
|
||||||
scanIsbnBtn.textContent = 'ISBN scannen';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
scanIsbnBtn.textContent = 'Scanner schließen';
|
|
||||||
|
|
||||||
// Start scanner with custom logic mapping to the ISBN input field
|
|
||||||
startScanner(function(decodedText) {
|
|
||||||
editIsbnInput.value = decodedText;
|
|
||||||
scanIsbnBtn.textContent = 'ISBN scannen';
|
|
||||||
if (typeof fetchBookInfo === 'function') {
|
|
||||||
fetchBookInfo('edit');
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function rebuildFilter3Options() {
|
function rebuildFilter3Options() {
|
||||||
if (!allItems) return;
|
if (!allItems) return;
|
||||||
|
|
||||||
@@ -3324,21 +3081,11 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
loadPredefinedFilterValues(1);
|
loadPredefinedFilterValues(1);
|
||||||
loadPredefinedFilterValues(2);
|
loadPredefinedFilterValues(2);
|
||||||
loadPredefinedFilterValues(3);
|
loadPredefinedFilterValues(3);
|
||||||
|
|
||||||
// Set up edit form submission
|
|
||||||
setupEditFormSubmission();
|
|
||||||
|
|
||||||
// Set up schedule form submission
|
// Set up schedule form submission
|
||||||
setupScheduleFormSubmission();
|
setupScheduleFormSubmission();
|
||||||
|
|
||||||
// Set up add new location buttons
|
|
||||||
const editAddLocationBtn = document.getElementById('edit-add-new-location-btn');
|
|
||||||
if (editAddLocationBtn) {
|
|
||||||
editAddLocationBtn.addEventListener('click', function() {
|
|
||||||
const container = document.getElementById('edit-new-location-container');
|
|
||||||
container.style.display = container.style.display === 'none' ? 'block' : 'none';
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Find and attach event listener to all logout links
|
// Find and attach event listener to all logout links
|
||||||
const logoutLinks = document.querySelectorAll('a[href*="logout"]');
|
const logoutLinks = document.querySelectorAll('a[href*="logout"]');
|
||||||
@@ -3391,35 +3138,11 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
// Close modals when clicking outside
|
// Close modals when clicking outside
|
||||||
window.onclick = function(event) {
|
window.onclick = function(event) {
|
||||||
const itemModal = document.getElementById('item-modal');
|
const itemModal = document.getElementById('item-modal');
|
||||||
const editModal = document.getElementById('edit-modal');
|
|
||||||
|
|
||||||
if (event.target === itemModal) {
|
if (event.target === itemModal) {
|
||||||
itemModal.style.display = 'none';
|
itemModal.style.display = 'none';
|
||||||
}
|
}
|
||||||
if (event.target === editModal) {
|
|
||||||
editModal.style.display = 'none';
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// Set up code validation for edit form
|
|
||||||
const editCodeField = document.getElementById('edit-code4');
|
|
||||||
if (editCodeField) {
|
|
||||||
editCodeField.addEventListener('blur', function() {
|
|
||||||
const itemIdField = document.getElementById('edit-item-id');
|
|
||||||
const excludeId = itemIdField ? itemIdField.value : null;
|
|
||||||
validateCodeField(this, excludeId);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const scanEditCodeBtn = document.getElementById('scan-edit-code-btn');
|
|
||||||
if (scanEditCodeBtn) {
|
|
||||||
scanEditCodeBtn.addEventListener('click', scanIntoEditCode);
|
|
||||||
}
|
|
||||||
|
|
||||||
const scanEditIsbnBtn = document.getElementById('scan-edit-isbn-btn');
|
|
||||||
if (scanEditIsbnBtn) {
|
|
||||||
scanEditIsbnBtn.addEventListener('click', scanIntoEditIsbn);
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// Function to load items from server
|
// Function to load items from server
|
||||||
@@ -4171,162 +3894,6 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function openEditModalForSelectedUnit(defaultItemId, selectId) {
|
|
||||||
let targetItemId = defaultItemId;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const selectedUnit = selectId ? document.getElementById(selectId) : null;
|
|
||||||
if (selectedUnit && selectedUnit.value) {
|
|
||||||
targetItemId = selectedUnit.value;
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
// Keep default item id as fallback.
|
|
||||||
}
|
|
||||||
|
|
||||||
openEditModalFromServer(targetItemId);
|
|
||||||
}
|
|
||||||
|
|
||||||
function closeEditModal() {
|
|
||||||
const editModal = document.getElementById('edit-modal');
|
|
||||||
if (editModal) {
|
|
||||||
editModal.style.display = 'none';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function openEditModalFromServer(itemId) {
|
|
||||||
const editModal = document.getElementById('edit-modal');
|
|
||||||
if (!editModal) {
|
|
||||||
console.error('Edit modal nicht gefunden');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log('DEBUG: openEditModal called with itemId:', itemId);
|
|
||||||
|
|
||||||
// Fetch the item data from the backend
|
|
||||||
fetch(`/get_item/${itemId}`)
|
|
||||||
.then(response => {
|
|
||||||
console.log('DEBUG: Response status:', response.status);
|
|
||||||
if (!response.ok) throw new Error(`HTTP ${response.status}`);
|
|
||||||
return response.json();
|
|
||||||
})
|
|
||||||
.then(data => {
|
|
||||||
console.log('DEBUG: Fetched data:', data);
|
|
||||||
// Backend returns the item directly or wrapped in error/success
|
|
||||||
const item = data.error ? null : (data.item || data);
|
|
||||||
|
|
||||||
console.log('DEBUG: Parsed item:', item);
|
|
||||||
|
|
||||||
if (!item || !item._id) {
|
|
||||||
console.error('DEBUG: Item not found or invalid');
|
|
||||||
alert('Item nicht gefunden');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fill in the form fields with the item data
|
|
||||||
document.getElementById('edit-item-id').value = item._id || '';
|
|
||||||
document.getElementById('edit-name').value = item.Name || '';
|
|
||||||
document.getElementById('edit-location').value = item.Ort || '';
|
|
||||||
document.getElementById('edit-description').value = item.Beschreibung || '';
|
|
||||||
document.getElementById('edit-year').value = item.Anschaffungsjahr || '';
|
|
||||||
document.getElementById('edit-cost').value = item.Anschaffungskosten || '';
|
|
||||||
document.getElementById('edit-code4').value = item.Code_4 || '';
|
|
||||||
document.getElementById('edit-isbn').value = item.ISBN || '';
|
|
||||||
document.getElementById('edit-reservierbar').checked = item.Reservierbar !== false;
|
|
||||||
|
|
||||||
// Fill in filter 1 (Unterrichtsfach)
|
|
||||||
const filter1Array = Array.isArray(item.Filter) ? item.Filter : (item.Filter ? [item.Filter] : []);
|
|
||||||
document.getElementById('edit-filter1-1').value = filter1Array[0] || '';
|
|
||||||
document.getElementById('edit-filter1-2').value = filter1Array[1] || '';
|
|
||||||
document.getElementById('edit-filter1-3').value = filter1Array[2] || '';
|
|
||||||
document.getElementById('edit-filter1-4').value = filter1Array[3] || '';
|
|
||||||
|
|
||||||
// Fill in filter 2 (Jahrgangsstufe)
|
|
||||||
const filter2Array = Array.isArray(item.Filter2) ? item.Filter2 : (item.Filter2 ? [item.Filter2] : []);
|
|
||||||
document.getElementById('edit-filter2-1').value = filter2Array[0] || '';
|
|
||||||
document.getElementById('edit-filter2-2').value = filter2Array[1] || '';
|
|
||||||
document.getElementById('edit-filter2-3').value = filter2Array[2] || '';
|
|
||||||
document.getElementById('edit-filter2-4').value = filter2Array[3] || '';
|
|
||||||
|
|
||||||
// Fill in filter 3 (Schlagwort)
|
|
||||||
const filter3Array = Array.isArray(item.Filter3) ? item.Filter3 : (item.Filter3 ? [item.Filter3] : []);
|
|
||||||
document.getElementById('edit-filter3-1').value = filter3Array[0] || '';
|
|
||||||
document.getElementById('edit-filter3-2').value = filter3Array[1] || '';
|
|
||||||
document.getElementById('edit-filter3-3').value = filter3Array[2] || '';
|
|
||||||
document.getElementById('edit-filter3-4').value = filter3Array[3] || '';
|
|
||||||
|
|
||||||
// Display existing images
|
|
||||||
const existingImagesContainer = document.getElementById('edit-existing-images');
|
|
||||||
const editForm = document.getElementById('edit-item-form');
|
|
||||||
existingImagesContainer.innerHTML = '';
|
|
||||||
if (editForm) {
|
|
||||||
editForm.querySelectorAll('input[name="existing_images"], input[name="removed_images"]').forEach(input => input.remove());
|
|
||||||
}
|
|
||||||
if (item.Images && Array.isArray(item.Images)) {
|
|
||||||
item.Images.forEach((image, index) => {
|
|
||||||
const isVideo = isVideoFile(image);
|
|
||||||
const imageDiv = document.createElement('div');
|
|
||||||
imageDiv.className = 'existing-image-item';
|
|
||||||
imageDiv.style.marginBottom = '10px';
|
|
||||||
|
|
||||||
const thumbnailInfo = item.ThumbnailInfo && item.ThumbnailInfo[index];
|
|
||||||
const imageSrc = thumbnailInfo && thumbnailInfo.has_preview ?
|
|
||||||
thumbnailInfo.preview_url :
|
|
||||||
(image.startsWith('/uploads/') || image.startsWith('http') ?
|
|
||||||
image :
|
|
||||||
`{{ url_for('uploaded_file', filename='') }}${image}`);
|
|
||||||
|
|
||||||
const row = document.createElement('div');
|
|
||||||
row.style.display = 'flex';
|
|
||||||
row.style.gap = '8px';
|
|
||||||
row.style.alignItems = 'center';
|
|
||||||
|
|
||||||
if (isVideo) {
|
|
||||||
const video = document.createElement('video');
|
|
||||||
video.src = imageSrc;
|
|
||||||
video.style.maxWidth = '100px';
|
|
||||||
video.style.maxHeight = '100px';
|
|
||||||
video.style.objectFit = 'contain';
|
|
||||||
video.controls = true;
|
|
||||||
row.appendChild(video);
|
|
||||||
} else {
|
|
||||||
const img = document.createElement('img');
|
|
||||||
img.src = imageSrc;
|
|
||||||
img.style.maxWidth = '100px';
|
|
||||||
img.style.maxHeight = '100px';
|
|
||||||
img.style.objectFit = 'contain';
|
|
||||||
img.alt = `Existierendes Bild ${index + 1}`;
|
|
||||||
row.appendChild(img);
|
|
||||||
}
|
|
||||||
|
|
||||||
const deleteButton = document.createElement('button');
|
|
||||||
deleteButton.type = 'button';
|
|
||||||
deleteButton.className = 'delete-image-button';
|
|
||||||
deleteButton.textContent = 'Löschen';
|
|
||||||
deleteButton.addEventListener('click', () => removeExistingImage(image, deleteButton));
|
|
||||||
row.appendChild(deleteButton);
|
|
||||||
|
|
||||||
imageDiv.appendChild(row);
|
|
||||||
existingImagesContainer.appendChild(imageDiv);
|
|
||||||
|
|
||||||
if (editForm) {
|
|
||||||
const hiddenInput = document.createElement('input');
|
|
||||||
hiddenInput.type = 'hidden';
|
|
||||||
hiddenInput.name = 'existing_images';
|
|
||||||
hiddenInput.value = image;
|
|
||||||
editForm.appendChild(hiddenInput);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Display the modal
|
|
||||||
editModal.style.display = 'block';
|
|
||||||
})
|
|
||||||
.catch(error => {
|
|
||||||
console.error('Fehler beim Laden des Items:', error);
|
|
||||||
alert('Fehler beim Laden des Items');
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function escapeHtml(value) {
|
function escapeHtml(value) {
|
||||||
return String(value ?? '').replace(/[&<>'"]/g, (char) => {
|
return String(value ?? '').replace(/[&<>'"]/g, (char) => {
|
||||||
const map = {
|
const map = {
|
||||||
@@ -4686,7 +4253,9 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
<button type="button" class="details-button" onclick="document.getElementById('item-modal').style.display='none';">Schließen</button>
|
<button type="button" class="details-button" onclick="document.getElementById('item-modal').style.display='none';">Schließen</button>
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
modal.style.display = 'block';
|
modal.style.display = 'block';
|
||||||
|
|
||||||
const closeButton = modal.querySelector('.close-modal');
|
const closeButton = modal.querySelector('.close-modal');
|
||||||
@@ -4923,6 +4492,13 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function openEditModalForSelectedUnit(itemId, selectId) {
|
||||||
|
const select = document.getElementById(selectId);
|
||||||
|
const targetId = (select && select.value) ? select.value : itemId;
|
||||||
|
// Leitet auf die Bearbeiten-Seite weiter und übergibt die aktuelle URL für den Redirect nach dem Speichern
|
||||||
|
window.location.href = `/item_edit/${targetId}`;
|
||||||
|
}
|
||||||
|
|
||||||
function changeModalImage(direction) {
|
function changeModalImage(direction) {
|
||||||
const currentIndex = window.currentModalImageIndex;
|
const currentIndex = window.currentModalImageIndex;
|
||||||
const total = window.totalModalImages;
|
const total = window.totalModalImages;
|
||||||
@@ -5349,8 +4925,6 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load location options for edit modal
|
|
||||||
// Edit-related functions moved to edit_item_functions.html
|
|
||||||
|
|
||||||
// Schedule modal functions
|
// Schedule modal functions
|
||||||
function openScheduleModal(itemId) {
|
function openScheduleModal(itemId) {
|
||||||
@@ -5470,50 +5044,6 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup edit form submission
|
|
||||||
function setupEditFormSubmission() {
|
|
||||||
const editForm = document.getElementById('edit-item-form');
|
|
||||||
if (editForm) {
|
|
||||||
editForm.addEventListener('submit', function(e) {
|
|
||||||
e.preventDefault();
|
|
||||||
|
|
||||||
const itemId = document.getElementById('edit-item-id').value;
|
|
||||||
const formData = new FormData(this);
|
|
||||||
|
|
||||||
fetch(`/edit_item/${itemId}`, {
|
|
||||||
method: 'POST',
|
|
||||||
body: formData
|
|
||||||
})
|
|
||||||
.then(response => {
|
|
||||||
if (response.ok) {
|
|
||||||
closeEditModal();
|
|
||||||
// Reload items to show updated information
|
|
||||||
loadItems();
|
|
||||||
// Show success message
|
|
||||||
const successMsg = document.createElement('div');
|
|
||||||
successMsg.className = 'alert alert-success';
|
|
||||||
successMsg.textContent = 'Item wurde erfolgreich aktualisiert!';
|
|
||||||
successMsg.style.position = 'fixed';
|
|
||||||
successMsg.style.top = '20px';
|
|
||||||
successMsg.style.right = '20px';
|
|
||||||
successMsg.style.zIndex = '9999';
|
|
||||||
document.body.appendChild(successMsg);
|
|
||||||
setTimeout(() => {
|
|
||||||
if (successMsg.parentNode) {
|
|
||||||
successMsg.parentNode.removeChild(successMsg);
|
|
||||||
}
|
|
||||||
}, 3000);
|
|
||||||
} else {
|
|
||||||
alert('Fehler beim Aktualisieren des Items');
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.catch(error => {
|
|
||||||
console.error('Error updating item:', error);
|
|
||||||
alert('Fehler beim Aktualisieren des Items');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Duplication function
|
// Duplication function
|
||||||
function duplicateItem(itemId) {
|
function duplicateItem(itemId) {
|
||||||
@@ -5632,10 +5162,62 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
futureAppointments.sort((a, b) => new Date(a.date) - new Date(b.date));
|
futureAppointments.sort((a, b) => new Date(a.date) - new Date(b.date));
|
||||||
return futureAppointments[0];
|
return futureAppointments[0];
|
||||||
}
|
}
|
||||||
</script>
|
|
||||||
|
|
||||||
<!-- Include edit item functions -->
|
// Load location options
|
||||||
{% include "edit_item_functions.html" %}
|
function loadLocationOptions() {
|
||||||
|
fetch('/get_predefined_locations')
|
||||||
|
.then(response => response.json())
|
||||||
|
.then(data => {
|
||||||
|
const ortSelect = document.getElementById('ort');
|
||||||
|
if (ortSelect) {
|
||||||
|
// Clear existing options except the first one
|
||||||
|
while (ortSelect.children.length > 1) {
|
||||||
|
ortSelect.removeChild(ortSelect.lastChild);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add new options - data.locations contains the array
|
||||||
|
data.locations.forEach(location => {
|
||||||
|
const option = document.createElement('option');
|
||||||
|
option.value = location;
|
||||||
|
option.textContent = location;
|
||||||
|
ortSelect.appendChild(option);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
console.error('Error loading location options:', error);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Function to add new location
|
||||||
|
function addNewLocation() {
|
||||||
|
const newLocationInput = document.getElementById('new-location-input');
|
||||||
|
const newLocation = newLocationInput.value.trim();
|
||||||
|
|
||||||
|
if (!newLocation) {
|
||||||
|
alert('Bitte geben Sie einen Ort ein.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add to dropdown
|
||||||
|
const ortSelect = document.getElementById('ort');
|
||||||
|
const option = document.createElement('option');
|
||||||
|
option.value = newLocation;
|
||||||
|
option.textContent = newLocation;
|
||||||
|
option.selected = true;
|
||||||
|
ortSelect.appendChild(option);
|
||||||
|
|
||||||
|
// Hide the input container
|
||||||
|
document.getElementById('new-location-container').style.display = 'none';
|
||||||
|
newLocationInput.value = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Function to cancel adding new location
|
||||||
|
function cancelAddLocation() {
|
||||||
|
document.getElementById('new-location-container').style.display = 'none';
|
||||||
|
document.getElementById('new-location-input').value = '';
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
<!-- Include reset item functions -->
|
<!-- Include reset item functions -->
|
||||||
{% include "reset_item_functions.html" %}
|
{% include "reset_item_functions.html" %}
|
||||||
@@ -5864,16 +5446,4 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
{% if open_item %}
|
|
||||||
<script>
|
|
||||||
document.addEventListener("DOMContentLoaded", function() {
|
|
||||||
if (typeof openEditModalFromServer === 'function') {
|
|
||||||
setTimeout(function() {
|
|
||||||
openEditModalFromServer('{{ open_item }}');
|
|
||||||
}, 500);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
{% endif %}
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
+463
-335
@@ -6,7 +6,7 @@
|
|||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="header-section">
|
<div class="header-section">
|
||||||
<h1>Neuen Benutzer registrieren</h1>
|
<h1>Neuen Benutzer registrieren</h1>
|
||||||
<p class="subtitle">Erstellen Sie ein neues Benutzerkonto und legen Sie Zugriffsrechte fest</p>
|
<p class="subtitle">Erstellen Sie ein neues Benutzerkonto oder importieren Sie mehrere Benutzer per CSV</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="flash-container">
|
<div class="flash-container">
|
||||||
@@ -23,7 +23,43 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="content">
|
<div class="content">
|
||||||
|
<!-- 1. CSV BULK IMPORT CARD -->
|
||||||
|
<div class="form-card" style="margin-bottom: 2rem; border-top: 4px solid #059669;">
|
||||||
|
<div class="card-header" style="margin-bottom: 1rem;">
|
||||||
|
<h2>Massenregistrierung via CSV</h2>
|
||||||
|
<p class="subtitle" style="color: #4b5563;">
|
||||||
|
Laden Sie eine CSV-Datei hoch (Format: <code>Vorname, Nachname</code>).
|
||||||
|
Benutzernamen und sichere Passwörter werden serverseitig generiert. Nach dem Upload erhalten Sie direkt ein PDF mit Zugangsdaten (2 pro Seite zum Ausschneiden).
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<form method="POST" action="{{ url_for('register_csv') }}" enctype="multipart/form-data">
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="permission-preset-csv">Berechtigungs-Preset für alle CSV-Benutzer</label>
|
||||||
|
<select id="permission-preset-csv" name="permission_preset" class="form-select" style="margin-bottom: 1rem;">
|
||||||
|
{% for preset_key, preset in permission_presets.items() %}
|
||||||
|
<option value="{{ preset_key }}">{{ preset.label }}</option>
|
||||||
|
{% endfor %}
|
||||||
|
</select>
|
||||||
|
|
||||||
|
<label for="csv_file">CSV-Datei auswählen</label>
|
||||||
|
<div class="input-container">
|
||||||
|
<span class="input-icon">📄</span>
|
||||||
|
<input type="file" id="csv_file" name="csv_file" accept=".csv" required style="padding: 10px;">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group form-actions" style="margin-top: 1.5rem;">
|
||||||
|
<button type="submit" class="action-button" style="background-color: #059669; color: white;">
|
||||||
|
📥 CSV Importieren & Zugangsdaten-PDF Herunterladen
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 2. SINGLE USER REGISTRATION CARD -->
|
||||||
<div class="form-card">
|
<div class="form-card">
|
||||||
|
<h2>Einzelnen Benutzer registrieren</h2>
|
||||||
<form method="POST" action="{{ url_for('register') }}">
|
<form method="POST" action="{{ url_for('register') }}">
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
@@ -32,11 +68,13 @@
|
|||||||
<span class="input-icon">👤</span>
|
<span class="input-icon">👤</span>
|
||||||
<input type="text" id="name" name="name" placeholder="Geben Sie den Vornamen ein" required onchange="generateUsername()" oninput="generateUsername()">
|
<input type="text" id="name" name="name" placeholder="Geben Sie den Vornamen ein" required onchange="generateUsername()" oninput="generateUsername()">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<label for="last-name">Nachname</label>
|
<label for="last-name">Nachname</label>
|
||||||
<div class="input-container">
|
<div class="input-container">
|
||||||
<span class="input-icon">👤</span>
|
<span class="input-icon">👤</span>
|
||||||
<input type="text" id="last-name" name="last-name" placeholder="Geben Sie den Nachnamen ein" required onchange="generateUsername()" oninput="generateUsername()">
|
<input type="text" id="last-name" name="last-name" placeholder="Geben Sie den Nachnamen ein" required onchange="generateUsername()" oninput="generateUsername()">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<label for="username">Benutzername <span style="color: #9ca3af;">(Vorschau - wird serverseitig finalisiert)</span></label>
|
<label for="username">Benutzername <span style="color: #9ca3af;">(Vorschau - wird serverseitig finalisiert)</span></label>
|
||||||
<div class="input-container">
|
<div class="input-container">
|
||||||
<span class="input-icon">👤</span>
|
<span class="input-icon">👤</span>
|
||||||
@@ -44,7 +82,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<p class="anonymize-hint">Klarnamen werden nur zur Erzeugung des Benutzernamens als Kürzel (z.B. SimFri) verwendet; bei Kollision wird automatisch ein Buchstabe mehr genommen.</p>
|
<p class="anonymize-hint">Klarnamen werden nur zur Erzeugung des Benutzernamens als Kürzel (z.B. SimFri) verwendet; bei Kollision wird automatisch ein Buchstabe mehr genommen.</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="password">Passwort</label>
|
<label for="password">Passwort</label>
|
||||||
<div class="password-rules" id="password-rules" aria-live="polite">
|
<div class="password-rules" id="password-rules" aria-live="polite">
|
||||||
@@ -57,20 +95,21 @@
|
|||||||
<li id="pw-rule-symbol" class="pw-rule">Mindestens ein Sonderzeichen</li>
|
<li id="pw-rule-symbol" class="pw-rule">Mindestens ein Sonderzeichen</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="input-wrapper">
|
<div class="input-wrapper">
|
||||||
<div class="input-container">
|
<div class="input-container">
|
||||||
<span class="input-icon">🔒</span>
|
<span class="input-icon">🔒</span>
|
||||||
<!-- HTML5 Pattern blockiert unsichere Passwörter vor dem Absenden -->
|
<input
|
||||||
<input
|
type="password"
|
||||||
id="password"
|
id="password"
|
||||||
name="password"
|
name="password"
|
||||||
placeholder="Geben Sie ein sicheres Passwort ein"
|
placeholder="Geben Sie ein sicheres Passwort ein"
|
||||||
required
|
required
|
||||||
pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9]).{12,}">
|
pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9]).{12,}">
|
||||||
|
<button type="button" id="toggle-pw-btn" class="toggle-pw-btn" onclick="togglePasswordVisibility()" style="background:none; border:none; cursor:pointer; padding-right:10px;">👁️</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="pw-actions">
|
<div class="pw-actions" style="margin-top: 8px;">
|
||||||
<button type="button" class="btn-secondary" onclick="generateSecurePassword()">Passwort generieren</button>
|
<button type="button" class="btn-secondary" onclick="generateSecurePassword()">Passwort generieren</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -120,323 +159,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<style>
|
|
||||||
:root {
|
|
||||||
--primary-color: #3498db;
|
|
||||||
--primary-dark: #2980b9;
|
|
||||||
--success-color: #2ecc71;
|
|
||||||
--error-color: #e74c3c;
|
|
||||||
--text-color: var(--ui-text);
|
|
||||||
--light-bg: #f9f9f9;
|
|
||||||
--border-radius: 8px;
|
|
||||||
--shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
|
|
||||||
--transition: all 0.3s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
|
|
||||||
background-color: var(--light-bg);
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
color: var(--text-color);
|
|
||||||
line-height: 1.6;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container {
|
|
||||||
max-width: 800px;
|
|
||||||
margin: 2rem auto;
|
|
||||||
padding: 0 1.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.header-section {
|
|
||||||
text-align: center;
|
|
||||||
margin-bottom: 2rem;
|
|
||||||
padding-bottom: 1.5rem;
|
|
||||||
border-bottom: 1px solid #eee;
|
|
||||||
}
|
|
||||||
|
|
||||||
.header-section h1 {
|
|
||||||
font-size: 2.5rem;
|
|
||||||
margin-bottom: 0.5rem;
|
|
||||||
color: var(--primary-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
.subtitle {
|
|
||||||
font-size: 1.1rem;
|
|
||||||
color: #777;
|
|
||||||
margin-top: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.content {
|
|
||||||
background-color: var(--ui-surface);
|
|
||||||
padding: 2rem;
|
|
||||||
border-radius: var(--border-radius);
|
|
||||||
box-shadow: var(--shadow);
|
|
||||||
margin-bottom: 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.form-card {
|
|
||||||
max-width: 500px;
|
|
||||||
margin: 0 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.form-group {
|
|
||||||
margin-bottom: 1.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.form-group label {
|
|
||||||
display: block;
|
|
||||||
margin-bottom: 0.5rem;
|
|
||||||
font-weight: 500;
|
|
||||||
color: var(--primary-dark);
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-container {
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-icon {
|
|
||||||
position: absolute;
|
|
||||||
left: 1rem;
|
|
||||||
top: 50%;
|
|
||||||
transform: translateY(-50%);
|
|
||||||
color: #aaa;
|
|
||||||
font-size: 1.2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
input[type="text"],
|
|
||||||
input[type="password"],
|
|
||||||
.form-select {
|
|
||||||
width: 100%;
|
|
||||||
padding: 0.8rem 1rem 0.8rem 3rem;
|
|
||||||
border: 1px solid #ddd;
|
|
||||||
border-radius: var(--border-radius);
|
|
||||||
font-size: 1rem;
|
|
||||||
transition: var(--transition);
|
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
|
||||||
|
|
||||||
input[type="text"]:focus,
|
|
||||||
input[type="password"]:focus,
|
|
||||||
.form-select:focus {
|
|
||||||
border-color: var(--primary-color);
|
|
||||||
box-shadow: 0 0 0 3px rgba(52, 152, 219, 0.2);
|
|
||||||
outline: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.form-select {
|
|
||||||
padding-left: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
input::placeholder {
|
|
||||||
color: #aaa;
|
|
||||||
}
|
|
||||||
|
|
||||||
.form-actions {
|
|
||||||
margin-top: 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.action-button {
|
|
||||||
background-color: var(--primary-color);
|
|
||||||
color: white;
|
|
||||||
border: none;
|
|
||||||
padding: 0.8rem 1.5rem;
|
|
||||||
border-radius: 30px;
|
|
||||||
cursor: pointer;
|
|
||||||
font-weight: 600;
|
|
||||||
transition: var(--transition);
|
|
||||||
width: 100%;
|
|
||||||
font-size: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.action-button:hover {
|
|
||||||
background-color: var(--primary-dark);
|
|
||||||
transform: translateY(-2px);
|
|
||||||
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
|
|
||||||
}
|
|
||||||
|
|
||||||
.register-button {
|
|
||||||
background-color: var(--success-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
.register-button:hover {
|
|
||||||
background-color: #27ae60;
|
|
||||||
}
|
|
||||||
|
|
||||||
.flash-container {
|
|
||||||
margin-bottom: 1.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.flash {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
padding: 1rem;
|
|
||||||
margin-bottom: 1rem;
|
|
||||||
border-radius: var(--border-radius);
|
|
||||||
animation: fadeIn 0.3s ease-in-out;
|
|
||||||
}
|
|
||||||
|
|
||||||
.flash-icon {
|
|
||||||
margin-right: 0.8rem;
|
|
||||||
font-size: 1.2rem;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
width: 24px;
|
|
||||||
height: 24px;
|
|
||||||
border-radius: 50%;
|
|
||||||
background-color: rgba(255, 255, 255, 0.3);
|
|
||||||
}
|
|
||||||
|
|
||||||
.flash.success {
|
|
||||||
background-color: #d4edda;
|
|
||||||
color: #155724;
|
|
||||||
border-left: 4px solid var(--success-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
.flash.error {
|
|
||||||
background-color: #f8d7da;
|
|
||||||
color: #721c24;
|
|
||||||
border-left: 4px solid var(--error-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes fadeIn {
|
|
||||||
from { opacity: 0; transform: translateY(-10px); }
|
|
||||||
to { opacity: 1; transform: translateY(0); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (max-width: 768px) {
|
|
||||||
.container {
|
|
||||||
padding: 0 1rem;
|
|
||||||
margin: 1rem auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.content {
|
|
||||||
padding: 1.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.header-section h1 {
|
|
||||||
font-size: 2rem;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.password-rules {
|
|
||||||
margin-bottom: 10px;
|
|
||||||
padding: 10px 12px;
|
|
||||||
border: 1px solid #e5e7eb;
|
|
||||||
border-radius: 8px;
|
|
||||||
background: var(--ui-surface-soft);
|
|
||||||
}
|
|
||||||
|
|
||||||
.password-rules-title {
|
|
||||||
margin: 0 0 8px;
|
|
||||||
font-weight: 700;
|
|
||||||
color: #1f2937;
|
|
||||||
font-size: 0.92rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.password-rules ul {
|
|
||||||
list-style: none;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pw-rule {
|
|
||||||
position: relative;
|
|
||||||
padding-left: 22px;
|
|
||||||
margin: 5px 0;
|
|
||||||
color: #b91c1c;
|
|
||||||
font-size: 0.9rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pw-rule::before {
|
|
||||||
content: '✗';
|
|
||||||
position: absolute;
|
|
||||||
left: 0;
|
|
||||||
top: 0;
|
|
||||||
font-weight: 700;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pw-rule.ok {
|
|
||||||
color: #166534;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pw-rule.ok::before {
|
|
||||||
content: '✓';
|
|
||||||
}
|
|
||||||
|
|
||||||
.anonymize-hint {
|
|
||||||
margin-top: 10px;
|
|
||||||
margin-bottom: 0;
|
|
||||||
background: #f0f9ff;
|
|
||||||
border: 1px solid #bae6fd;
|
|
||||||
border-radius: 8px;
|
|
||||||
padding: 10px 12px;
|
|
||||||
color: #0c4a6e;
|
|
||||||
font-size: 0.92rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.permission-panels {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
|
|
||||||
gap: 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.permission-panel {
|
|
||||||
border: 1px solid #d1d5db;
|
|
||||||
border-radius: 8px;
|
|
||||||
padding: 10px;
|
|
||||||
background: var(--ui-surface-soft);
|
|
||||||
}
|
|
||||||
|
|
||||||
.permission-panel h4 {
|
|
||||||
margin: 0 0 8px;
|
|
||||||
font-size: 1rem;
|
|
||||||
color: #1f2937;
|
|
||||||
}
|
|
||||||
|
|
||||||
.permission-check {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 8px;
|
|
||||||
margin: 4px 0;
|
|
||||||
color: #1f2937;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Neue Styles für die Passwort-Erweiterungen */
|
|
||||||
.pw-actions {
|
|
||||||
display: flex;
|
|
||||||
gap: 8px;
|
|
||||||
margin-top: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn-secondary {
|
|
||||||
padding: 8px 12px;
|
|
||||||
border: 1px solid #d1d5db;
|
|
||||||
background-color: #f3f4f6;
|
|
||||||
border-radius: 4px;
|
|
||||||
cursor: pointer;
|
|
||||||
font-size: 0.9em;
|
|
||||||
transition: background-color 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn-secondary:hover {
|
|
||||||
background-color: #e5e7eb;
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-wrapper {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 8px;
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-wrapper .input-container {
|
|
||||||
flex-grow: 1;
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
// Hilfsfunktion: Umlaute auflösen und Sonderzeichen entfernen
|
// Hilfsfunktion: Umlaute auflösen und Sonderzeichen entfernen
|
||||||
function cleanNameForUsername(text) {
|
function cleanNameForUsername(text) {
|
||||||
@@ -462,7 +184,7 @@ function generateUsername() {
|
|||||||
const firstName = cleanNameForUsername(document.getElementById('name').value);
|
const firstName = cleanNameForUsername(document.getElementById('name').value);
|
||||||
const lastName = cleanNameForUsername(document.getElementById('last-name').value);
|
const lastName = cleanNameForUsername(document.getElementById('last-name').value);
|
||||||
let username = '';
|
let username = '';
|
||||||
|
|
||||||
if (firstName && lastName) {
|
if (firstName && lastName) {
|
||||||
username = formatPart(firstName, 3) + formatPart(lastName, 3);
|
username = formatPart(firstName, 3) + formatPart(lastName, 3);
|
||||||
} else if (firstName) {
|
} else if (firstName) {
|
||||||
@@ -470,7 +192,7 @@ function generateUsername() {
|
|||||||
} else if (lastName) {
|
} else if (lastName) {
|
||||||
username = formatPart(lastName, 6);
|
username = formatPart(lastName, 6);
|
||||||
}
|
}
|
||||||
|
|
||||||
const usernameField = document.getElementById('username');
|
const usernameField = document.getElementById('username');
|
||||||
if (usernameField) {
|
if (usernameField) {
|
||||||
usernameField.value = username || '';
|
usernameField.value = username || '';
|
||||||
@@ -503,11 +225,12 @@ function generateSecurePassword() {
|
|||||||
|
|
||||||
const pwField = document.getElementById('password');
|
const pwField = document.getElementById('password');
|
||||||
pwField.value = password;
|
pwField.value = password;
|
||||||
|
|
||||||
// Automatisch sichtbar machen, damit der User es kopieren kann
|
// Automatisch sichtbar machen
|
||||||
pwField.type = 'text';
|
pwField.type = 'text';
|
||||||
document.getElementById('toggle-pw-btn').textContent = '🙈';
|
const toggleBtn = document.getElementById('toggle-pw-btn');
|
||||||
|
if (toggleBtn) toggleBtn.textContent = '🙈';
|
||||||
|
|
||||||
updatePasswordRules();
|
updatePasswordRules();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -517,10 +240,10 @@ function togglePasswordVisibility() {
|
|||||||
const toggleBtn = document.getElementById('toggle-pw-btn');
|
const toggleBtn = document.getElementById('toggle-pw-btn');
|
||||||
if (pwField.type === "password") {
|
if (pwField.type === "password") {
|
||||||
pwField.type = "text";
|
pwField.type = "text";
|
||||||
toggleBtn.textContent = '🙈';
|
if (toggleBtn) toggleBtn.textContent = '🙈';
|
||||||
} else {
|
} else {
|
||||||
pwField.type = "password";
|
pwField.type = "password";
|
||||||
toggleBtn.textContent = '👁️';
|
if (toggleBtn) toggleBtn.textContent = '👁️';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -530,7 +253,7 @@ function updatePasswordRules() {
|
|||||||
if (!passwordInput) return;
|
if (!passwordInput) return;
|
||||||
|
|
||||||
const value = String(passwordInput.value || '');
|
const value = String(passwordInput.value || '');
|
||||||
|
|
||||||
const setRuleState = (id, ok) => {
|
const setRuleState = (id, ok) => {
|
||||||
const node = document.getElementById(id);
|
const node = document.getElementById(id);
|
||||||
if (node) node.classList.toggle('ok', !!ok);
|
if (node) node.classList.toggle('ok', !!ok);
|
||||||
@@ -592,4 +315,409 @@ document.addEventListener('DOMContentLoaded', function () {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
:root {
|
||||||
|
--primary-color: #3498db;
|
||||||
|
--primary-dark: #2980b9;
|
||||||
|
--success-color: #2ecc71;
|
||||||
|
--success-dark: #27ae60;
|
||||||
|
--csv-color: #059669;
|
||||||
|
--csv-dark: #047857;
|
||||||
|
--error-color: #e74c3c;
|
||||||
|
--text-color: var(--ui-text, #1f2937);
|
||||||
|
--light-bg: #f9f9f9;
|
||||||
|
--border-radius: 8px;
|
||||||
|
--shadow: 0 4px 6px rgba(0, 0, 0, 0.05);
|
||||||
|
--transition: all 0.3s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
|
||||||
|
background-color: var(--light-bg);
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
color: var(--text-color);
|
||||||
|
line-height: 1.6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.container {
|
||||||
|
max-width: 800px;
|
||||||
|
margin: 2rem auto;
|
||||||
|
padding: 0 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-section {
|
||||||
|
text-align: center;
|
||||||
|
margin-bottom: 2rem;
|
||||||
|
padding-bottom: 1.5rem;
|
||||||
|
border-bottom: 1px solid #eee;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-section h1 {
|
||||||
|
font-size: 2.5rem;
|
||||||
|
margin-bottom: 0.5rem;
|
||||||
|
color: var(--primary-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.subtitle {
|
||||||
|
font-size: 1.05rem;
|
||||||
|
color: #6b7280;
|
||||||
|
margin-top: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.content {
|
||||||
|
background-color: var(--ui-surface, #ffffff);
|
||||||
|
padding: 2rem;
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
box-shadow: var(--shadow);
|
||||||
|
margin-bottom: 2rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Karten-Layout für Einzel- & Massenregistrierung */
|
||||||
|
.form-card {
|
||||||
|
max-width: 620px;
|
||||||
|
margin: 0 auto 2.5rem auto;
|
||||||
|
padding: 1.5rem;
|
||||||
|
background: var(--ui-surface-soft, #f9fafb);
|
||||||
|
border: 1px solid #e5e7eb;
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-card:last-child {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-card h2 {
|
||||||
|
font-size: 1.4rem;
|
||||||
|
margin-top: 0;
|
||||||
|
margin-bottom: 0.5rem;
|
||||||
|
color: #111827;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-group {
|
||||||
|
margin-bottom: 1.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-group label {
|
||||||
|
display: block;
|
||||||
|
margin-bottom: 0.4rem;
|
||||||
|
font-weight: 600;
|
||||||
|
font-size: 0.95rem;
|
||||||
|
color: #374151;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-container {
|
||||||
|
position: relative;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-icon {
|
||||||
|
position: absolute;
|
||||||
|
left: 1rem;
|
||||||
|
top: 50%;
|
||||||
|
transform: translateY(-50%);
|
||||||
|
color: #9ca3af;
|
||||||
|
font-size: 1.1rem;
|
||||||
|
pointer-events: none;
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Eingabefelder & Selects */
|
||||||
|
input[type="text"],
|
||||||
|
input[type="password"],
|
||||||
|
input[type="file"],
|
||||||
|
.form-select {
|
||||||
|
width: 100%;
|
||||||
|
padding: 0.75rem 1rem 0.75rem 2.8rem;
|
||||||
|
border: 1px solid #d1d5db;
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
font-size: 0.95rem;
|
||||||
|
background-color: #ffffff;
|
||||||
|
transition: var(--transition);
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
input[type="text"]:focus,
|
||||||
|
input[type="password"]:focus,
|
||||||
|
input[type="file"]:focus,
|
||||||
|
.form-select:focus {
|
||||||
|
border-color: var(--primary-color);
|
||||||
|
box-shadow: 0 0 0 3px rgba(52, 152, 219, 0.2);
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-select {
|
||||||
|
padding-left: 1rem;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Stylings für den CSV-Datei-Upload */
|
||||||
|
input[type="file"] {
|
||||||
|
padding-left: 2.8rem;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
input[type="file"]::file-selector-button {
|
||||||
|
padding: 0.35rem 0.75rem;
|
||||||
|
border-radius: 4px;
|
||||||
|
border: 1px solid #d1d5db;
|
||||||
|
background: #f3f4f6;
|
||||||
|
color: #374151;
|
||||||
|
cursor: pointer;
|
||||||
|
margin-right: 12px;
|
||||||
|
font-weight: 500;
|
||||||
|
transition: var(--transition);
|
||||||
|
}
|
||||||
|
|
||||||
|
input[type="file"]::file-selector-button:hover {
|
||||||
|
background: #e5e7eb;
|
||||||
|
}
|
||||||
|
|
||||||
|
input::placeholder {
|
||||||
|
color: #9ca3af;
|
||||||
|
}
|
||||||
|
|
||||||
|
code {
|
||||||
|
background: #e0f2fe;
|
||||||
|
color: #0369a1;
|
||||||
|
padding: 2px 6px;
|
||||||
|
border-radius: 4px;
|
||||||
|
font-family: monospace;
|
||||||
|
font-size: 0.9em;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Buttons */
|
||||||
|
.form-actions {
|
||||||
|
margin-top: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.action-button {
|
||||||
|
background-color: var(--primary-color);
|
||||||
|
color: white;
|
||||||
|
border: none;
|
||||||
|
padding: 0.8rem 1.5rem;
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
cursor: pointer;
|
||||||
|
font-weight: 600;
|
||||||
|
transition: var(--transition);
|
||||||
|
width: 100%;
|
||||||
|
font-size: 1rem;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.action-button:hover {
|
||||||
|
background-color: var(--primary-dark);
|
||||||
|
transform: translateY(-1px);
|
||||||
|
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.register-button {
|
||||||
|
background-color: var(--success-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.register-button:hover {
|
||||||
|
background-color: var(--success-dark);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Toggle-Button für Passwort-Auge */
|
||||||
|
.input-wrapper {
|
||||||
|
position: relative;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.toggle-pw-btn {
|
||||||
|
position: absolute;
|
||||||
|
right: 0.75rem;
|
||||||
|
top: 50%;
|
||||||
|
transform: translateY(-50%);
|
||||||
|
background: none;
|
||||||
|
border: none;
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 1.1rem;
|
||||||
|
padding: 4px;
|
||||||
|
z-index: 2;
|
||||||
|
opacity: 0.7;
|
||||||
|
transition: opacity 0.2s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.toggle-pw-btn:hover {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Passwort-Regeln Box */
|
||||||
|
.password-rules {
|
||||||
|
margin-bottom: 10px;
|
||||||
|
padding: 10px 12px;
|
||||||
|
border: 1px solid #e5e7eb;
|
||||||
|
border-radius: 8px;
|
||||||
|
background: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.password-rules-title {
|
||||||
|
margin: 0 0 6px;
|
||||||
|
font-weight: 700;
|
||||||
|
color: #1f2937;
|
||||||
|
font-size: 0.88rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.password-rules ul {
|
||||||
|
list-style: none;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.pw-rule {
|
||||||
|
position: relative;
|
||||||
|
padding-left: 20px;
|
||||||
|
margin: 4px 0;
|
||||||
|
color: #dc2626;
|
||||||
|
font-size: 0.85rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.pw-rule::before {
|
||||||
|
content: '✗';
|
||||||
|
position: absolute;
|
||||||
|
left: 0;
|
||||||
|
top: 0;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.pw-rule.ok {
|
||||||
|
color: #166534;
|
||||||
|
}
|
||||||
|
|
||||||
|
.pw-rule.ok::before {
|
||||||
|
content: '✓';
|
||||||
|
}
|
||||||
|
|
||||||
|
.pw-actions {
|
||||||
|
display: flex;
|
||||||
|
gap: 8px;
|
||||||
|
margin-top: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-secondary {
|
||||||
|
padding: 6px 12px;
|
||||||
|
border: 1px solid #d1d5db;
|
||||||
|
background-color: #ffffff;
|
||||||
|
color: #374151;
|
||||||
|
border-radius: 6px;
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 0.88rem;
|
||||||
|
font-weight: 500;
|
||||||
|
transition: var(--transition);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-secondary:hover {
|
||||||
|
background-color: #f3f4f6;
|
||||||
|
border-color: #9ca3af;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Hinweise & Rechte-Panels */
|
||||||
|
.anonymize-hint {
|
||||||
|
margin-top: 8px;
|
||||||
|
margin-bottom: 0;
|
||||||
|
background: #f0f9ff;
|
||||||
|
border: 1px solid #bae6fd;
|
||||||
|
border-radius: 6px;
|
||||||
|
padding: 8px 12px;
|
||||||
|
color: #0369a1;
|
||||||
|
font-size: 0.88rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.permission-panels {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
|
||||||
|
gap: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.permission-panel {
|
||||||
|
border: 1px solid #d1d5db;
|
||||||
|
border-radius: 8px;
|
||||||
|
padding: 12px;
|
||||||
|
background: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.permission-panel h4 {
|
||||||
|
margin: 0 0 8px;
|
||||||
|
font-size: 0.95rem;
|
||||||
|
color: #1f2937;
|
||||||
|
}
|
||||||
|
|
||||||
|
.permission-check {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
margin: 6px 0;
|
||||||
|
color: #374151;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Flash Nachrichten */
|
||||||
|
.flash-container {
|
||||||
|
margin-bottom: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.flash {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
padding: 0.9rem 1rem;
|
||||||
|
margin-bottom: 1rem;
|
||||||
|
border-radius: var(--border-radius);
|
||||||
|
animation: fadeIn 0.3s ease-in-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
.flash-icon {
|
||||||
|
margin-right: 0.8rem;
|
||||||
|
font-size: 1rem;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 22px;
|
||||||
|
height: 22px;
|
||||||
|
border-radius: 50%;
|
||||||
|
background-color: rgba(255, 255, 255, 0.4);
|
||||||
|
}
|
||||||
|
|
||||||
|
.flash.success {
|
||||||
|
background-color: #d1fae5;
|
||||||
|
color: #065f46;
|
||||||
|
border-left: 4px solid var(--csv-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.flash.error {
|
||||||
|
background-color: #fee2e2;
|
||||||
|
color: #991b1b;
|
||||||
|
border-left: 4px solid var(--error-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes fadeIn {
|
||||||
|
from { opacity: 0; transform: translateY(-8px); }
|
||||||
|
to { opacity: 1; transform: translateY(0); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 768px) {
|
||||||
|
.container {
|
||||||
|
padding: 0 0.75rem;
|
||||||
|
margin: 1rem auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.content {
|
||||||
|
padding: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-card {
|
||||||
|
padding: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-section h1 {
|
||||||
|
font-size: 1.8rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
@@ -954,8 +954,10 @@
|
|||||||
<label for="anschaffungskosten">Anschaffungskosten (€)</label>
|
<label for="anschaffungskosten">Anschaffungskosten (€)</label>
|
||||||
<input id="anschaffungskosten" name="anschaffungskosten">
|
<input id="anschaffungskosten" name="anschaffungskosten">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<!-- Image upload (hidden for library mode) -->
|
<!-- Image upload (hidden for library mode) -->
|
||||||
<div class="form-group" {% if show_library_features %}style="display:none;"{% endif %}>
|
<div class="form-group">
|
||||||
<label for="images">Bilder/Videos:</label>
|
<label for="images">Bilder/Videos:</label>
|
||||||
<input type="file" id="images" name="images" accept=".jpg, .jpeg, .png, .gif, .mp4, .mov, .avi, .mkv, .webm, .flv, .m4v, .3gp" multiple>
|
<input type="file" id="images" name="images" accept=".jpg, .jpeg, .png, .gif, .mp4, .mov, .avi, .mkv, .webm, .flv, .m4v, .3gp" multiple>
|
||||||
<div class="allowed-formats">Erlaubte Formate: JPG, JPEG, PNG, GIF, MP4, MOV, AVI, MKV, WEBM, FLV, M4V, 3GP</div>
|
<div class="allowed-formats">Erlaubte Formate: JPG, JPEG, PNG, GIF, MP4, MOV, AVI, MKV, WEBM, FLV, M4V, 3GP</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user