Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b1ca358d41 | |||
| 47cba5865d | |||
| 4a776872e0 | |||
| 55a74654db | |||
| 7473334714 |
+37
-342
@@ -3927,7 +3927,6 @@ def upload_admin():
|
||||
"""
|
||||
Upload page route for inventory items.
|
||||
Accessible to users with insert permission.
|
||||
Supports duplication by passing duplicate_from parameter.
|
||||
|
||||
Returns:
|
||||
flask.Response: Rendered template or redirect
|
||||
@@ -3940,54 +3939,9 @@ def upload_admin():
|
||||
flash('Ihnen ist es nicht gestattet auf dieser Internetanwendung, die eben besuchte Adrrese zu nutzen, versuchen sie es erneut nach dem sie sich mit einem berechtigten Nutzer angemeldet haben!', 'error')
|
||||
return redirect(url_for('login'))
|
||||
|
||||
# Check if this is a duplication request
|
||||
duplicate_from = request.args.get('duplicate_from')
|
||||
duplicate_flag = request.args.get('duplicate') # Check for sessionStorage-based duplication
|
||||
duplicate_data = None
|
||||
|
||||
# Handle the old method (duplicate_from parameter with item ID)
|
||||
if duplicate_from:
|
||||
try:
|
||||
original_item = it.get_item(duplicate_from)
|
||||
if original_item:
|
||||
duplicate_data = {
|
||||
'name': original_item.get('Name', ''),
|
||||
'description': original_item.get('Beschreibung', ''),
|
||||
'location': original_item.get('Ort', ''),
|
||||
'room': original_item.get('Raum', ''),
|
||||
'category': original_item.get('Kategorie', ''),
|
||||
'year': original_item.get('Anschaffungsjahr', ''),
|
||||
'cost': original_item.get('Anschaffungskosten', ''),
|
||||
'filter1': original_item.get('Filter1', ''),
|
||||
'filter2': original_item.get('Filter2', ''),
|
||||
'filter3': original_item.get('Filter3', ''),
|
||||
'images': original_item.get('Images', []),
|
||||
'original_id': duplicate_from
|
||||
}
|
||||
# Copy all filter fields (Filter1_1 through Filter3_5)
|
||||
for i in range(1, 4): # Filter1, Filter2, Filter3
|
||||
for j in range(1, 6): # _1 through _5
|
||||
filter_key = f'Filter{i}_{j}'
|
||||
if filter_key in original_item:
|
||||
duplicate_data[f'filter{i}_{j}'] = original_item[filter_key]
|
||||
|
||||
flash('Element wird dupliziert. Bitte überprüfen Sie die Daten und passen Sie sie bei Bedarf an.', 'info')
|
||||
else:
|
||||
flash('Ursprungs-Element für Duplizierung nicht gefunden.', 'error')
|
||||
except Exception as e:
|
||||
app.logger.warning(f"Error loading item for duplication: {e}")
|
||||
flash('Fehler beim Laden der Duplizierungsdaten.', 'error')
|
||||
|
||||
# Handle the new method (sessionStorage-based duplication)
|
||||
elif duplicate_flag == 'true':
|
||||
# No server-side processing needed - JavaScript will handle sessionStorage data
|
||||
# Just indicate that duplication mode is active
|
||||
flash('Element wird dupliziert. Die Daten werden aus dem Session-Speicher geladen.', 'info')
|
||||
|
||||
return render_template(
|
||||
'upload_admin.html',
|
||||
username=session['username'],
|
||||
duplicate_data=duplicate_data,
|
||||
library_module_enabled=cfg.MODULES.is_enabled('library'),
|
||||
student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
|
||||
show_library_features=False,
|
||||
@@ -4014,46 +3968,9 @@ def library_admin():
|
||||
flash('Bibliotheks-Modul ist deaktiviert.', 'error')
|
||||
return redirect(url_for('home_admin'))
|
||||
|
||||
duplicate_from = request.args.get('duplicate_from')
|
||||
duplicate_flag = request.args.get('duplicate')
|
||||
duplicate_data = None
|
||||
|
||||
if duplicate_from:
|
||||
try:
|
||||
original_item = it.get_item(duplicate_from)
|
||||
if original_item:
|
||||
duplicate_data = {
|
||||
'name': original_item.get('Name', ''),
|
||||
'description': original_item.get('Beschreibung', ''),
|
||||
'location': original_item.get('Ort', ''),
|
||||
'room': original_item.get('Raum', ''),
|
||||
'category': original_item.get('Kategorie', ''),
|
||||
'year': original_item.get('Anschaffungsjahr', ''),
|
||||
'cost': original_item.get('Anschaffungskosten', ''),
|
||||
'filter1': original_item.get('Filter1', ''),
|
||||
'filter2': original_item.get('Filter2', ''),
|
||||
'filter3': original_item.get('Filter3', ''),
|
||||
'images': original_item.get('Images', []),
|
||||
'original_id': duplicate_from
|
||||
}
|
||||
for i in range(1, 4):
|
||||
for j in range(1, 6):
|
||||
filter_key = f'Filter{i}_{j}'
|
||||
if filter_key in original_item:
|
||||
duplicate_data[f'filter{i}_{j}'] = original_item[filter_key]
|
||||
flash('Buch wird dupliziert. Bitte überprüfen Sie die Daten und passen Sie sie bei Bedarf an.', 'info')
|
||||
else:
|
||||
flash('Ursprungs-Element für Duplizierung nicht gefunden.', 'error')
|
||||
except Exception as e:
|
||||
app.logger.warning(f"Error loading item for duplication: {e}")
|
||||
flash('Fehler beim Laden der Duplizierungsdaten.', 'error')
|
||||
elif duplicate_flag == 'true':
|
||||
flash('Buch wird dupliziert. Die Daten werden aus dem Session-Speicher geladen.', 'info')
|
||||
|
||||
return render_template(
|
||||
'upload_admin.html',
|
||||
username=session['username'],
|
||||
duplicate_data=duplicate_data,
|
||||
library_module_enabled=cfg.MODULES.is_enabled('library'),
|
||||
student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
|
||||
show_library_features=True,
|
||||
@@ -5322,15 +5239,15 @@ def debug_favorites():
|
||||
def upload_item():
|
||||
"""
|
||||
Route for adding new items to the inventory.
|
||||
Handles file uploads and creates QR codes.
|
||||
Handles image file uploads and creates QR codes.
|
||||
Enhanced for mobile browser compatibility.
|
||||
|
||||
|
||||
Returns:
|
||||
flask.Response: Redirect to admin homepage
|
||||
"""
|
||||
if 'username' not in session:
|
||||
return jsonify({'success': False, 'message': 'Nicht angemeldet'}), 401
|
||||
|
||||
|
||||
item_is_library = False
|
||||
|
||||
# Check if user may insert items
|
||||
@@ -5348,20 +5265,20 @@ def upload_item():
|
||||
|
||||
# Detect if request is from mobile device
|
||||
is_mobile = 'Mobile' in request.headers.get('User-Agent', '')
|
||||
|
||||
# Log mobile request for debugging
|
||||
|
||||
if is_mobile:
|
||||
app.logger.info(f"Mobile upload from {request.headers.get('User-Agent', 'unknown')} by {encrypt_text(username)}")
|
||||
|
||||
app.logger.info(
|
||||
f"Mobile upload from {request.headers.get('User-Agent', 'unknown')} by {encrypt_text(username)}")
|
||||
|
||||
try:
|
||||
# Strip whitespace from all text fields
|
||||
name = sanitize_form_value(request.form['name'])
|
||||
ort = sanitize_form_value(request.form['ort'])
|
||||
beschreibung = sanitize_form_value(request.form['beschreibung'])
|
||||
|
||||
|
||||
# Check both possible image field names
|
||||
images = request.files.getlist('images') or request.files.getlist('new_images')
|
||||
|
||||
|
||||
filter_upload = sanitize_form_value(request.form.getlist('filter'))
|
||||
filter_upload2 = sanitize_form_value(request.form.getlist('filter2'))
|
||||
filter_upload3 = sanitize_form_value(request.form.getlist('filter3'))
|
||||
@@ -5374,7 +5291,7 @@ def upload_item():
|
||||
item_count_raw = sanitize_form_value(request.form.get('item_count', '1'))
|
||||
item_type_input = sanitize_form_value(request.form.get('item_type_input', ''))
|
||||
library_category = sanitize_form_value(request.form.get('library_category', ''))
|
||||
|
||||
|
||||
if library_category != '':
|
||||
item_is_library = True
|
||||
|
||||
@@ -5384,46 +5301,30 @@ def upload_item():
|
||||
item_count = 1
|
||||
item_count = max(1, min(item_count, 100))
|
||||
|
||||
# Optional list of per-item codes (one code per line)
|
||||
# Optional list of per-item codes
|
||||
individual_codes = []
|
||||
if individual_codes_raw:
|
||||
individual_codes = [c.strip() for c in str(individual_codes_raw).replace(',', '\n').splitlines() if c.strip()]
|
||||
|
||||
individual_codes = [c.strip() for c in str(individual_codes_raw).replace(',', '\n').splitlines() if
|
||||
c.strip()]
|
||||
|
||||
# Check if this is a duplication
|
||||
is_duplicating = request.form.get('is_duplicating') == 'true'
|
||||
|
||||
# Get duplicate_images if duplicating
|
||||
duplicate_images = request.form.getlist('duplicate_images') if is_duplicating else []
|
||||
|
||||
# Make sure duplicate_images is always a list, even if there's only one
|
||||
if is_duplicating and duplicate_images and not isinstance(duplicate_images, list):
|
||||
duplicate_images = [duplicate_images]
|
||||
|
||||
# Log details about each image
|
||||
if is_duplicating and duplicate_images:
|
||||
for i, img in enumerate(duplicate_images):
|
||||
print(f"DEBUG: Duplicate image {i+1}/{len(duplicate_images)}: {img}")
|
||||
|
||||
# Get book cover image if downloaded
|
||||
book_cover_image = request.form.get('book_cover_image')
|
||||
|
||||
# Special handling for mobile browsers that might send data differently
|
||||
|
||||
# Special handling for mobile browsers
|
||||
if is_mobile and 'mobile_data' in request.form:
|
||||
try:
|
||||
mobile_data = json.loads(request.form['mobile_data'])
|
||||
# Override values with mobile data if available
|
||||
if 'filters' in mobile_data:
|
||||
filter_upload = mobile_data.get('filters', [])
|
||||
if 'filters2' in mobile_data:
|
||||
filter_upload2 = mobile_data.get('filters2', [])
|
||||
if 'filters3' in mobile_data:
|
||||
filter_upload3 = mobile_data.get('filters3', [])
|
||||
if 'duplicate_images' in mobile_data and mobile_data['duplicate_images']:
|
||||
duplicate_images = mobile_data.get('duplicate_images', [])
|
||||
except json.JSONDecodeError as e:
|
||||
app.logger.error(f"Error parsing mobile data: {str(e)}")
|
||||
except:
|
||||
|
||||
except Exception as e:
|
||||
app.logger.error(f"Upload Form Data Parsing Error: {str(e)}")
|
||||
flash('Fehler beim Verarbeiten der Formulardaten. Bitte versuchen Sie es erneut.', 'error')
|
||||
return redirect(url_for(success_redirect_endpoint))
|
||||
|
||||
@@ -5431,7 +5332,7 @@ def upload_item():
|
||||
filter_upload = expand_filter_selection(filter_upload, 1)
|
||||
filter_upload2 = expand_filter_selection(filter_upload2, 2)
|
||||
|
||||
# Validation
|
||||
# Base Validation
|
||||
if not name or not ort or not beschreibung:
|
||||
error_msg = 'Bitte füllen Sie alle erforderlichen Felder aus'
|
||||
if is_mobile:
|
||||
@@ -5467,9 +5368,8 @@ def upload_item():
|
||||
flash(error_msg, 'error')
|
||||
return redirect(url_for('library_admin'))
|
||||
|
||||
# Only check for images if not duplicating and no duplicate images provided and no book cover
|
||||
# For library mode, skip this check as images come only from ISBN fetch
|
||||
if upload_mode != 'library' and not is_duplicating and not images and not duplicate_images and not book_cover_image:
|
||||
# Strict Image Validation (Since duplication is removed)
|
||||
if upload_mode != 'library' and not images and not book_cover_image:
|
||||
error_msg = 'Bitte laden Sie mindestens ein Bild hoch'
|
||||
if is_mobile:
|
||||
return jsonify({'success': False, 'message': error_msg}), 400
|
||||
@@ -5478,36 +5378,20 @@ def upload_item():
|
||||
return redirect(url_for(success_redirect_endpoint))
|
||||
|
||||
primary_code_raw = request.form.get('code_4', '').strip()
|
||||
individual_codes_raw = request.form.get('individual_codes', '').strip()
|
||||
|
||||
|
||||
all_item_codes = []
|
||||
|
||||
if primary_code_raw:
|
||||
all_item_codes.append(primary_code_raw)
|
||||
|
||||
if individual_codes_raw:
|
||||
extra_codes = [c.strip() for c in individual_codes_raw.replace('\r', '').split('\n') if c.strip()]
|
||||
|
||||
for c in extra_codes:
|
||||
if individual_codes:
|
||||
for c in individual_codes:
|
||||
if c not in all_item_codes:
|
||||
all_item_codes.append(c)
|
||||
|
||||
if len(all_item_codes) > 0:
|
||||
item_count = len(all_item_codes)
|
||||
else:
|
||||
try:
|
||||
item_count = int(request.form.get('item_count', 1))
|
||||
except ValueError:
|
||||
item_count = 1
|
||||
|
||||
if upload_mode != 'library' and not is_duplicating and not images and not duplicate_images and not book_cover_image:
|
||||
error_msg = 'Bitte laden Sie mindestens ein Bild hoch'
|
||||
if is_mobile:
|
||||
return jsonify({'success': False, 'message': error_msg}), 400
|
||||
else:
|
||||
flash(error_msg, 'error')
|
||||
return redirect(url_for(success_redirect_endpoint))
|
||||
|
||||
# Check unique codes
|
||||
for code in all_item_codes:
|
||||
if not it.is_code_unique(code):
|
||||
app.logger.info(f"DEBUG: Code '{code}' is not unique.")
|
||||
@@ -5517,12 +5401,12 @@ def upload_item():
|
||||
error_msg = 'Der Code wird bereits verwendet. Umleitung zum Eintrag.'
|
||||
if is_mobile:
|
||||
return jsonify({
|
||||
'success': False,
|
||||
'success': False,
|
||||
'message': error_msg,
|
||||
'existing_item_id': str(existing_item['_id']),
|
||||
'redirect_to_item': True
|
||||
}), 400
|
||||
|
||||
|
||||
flash(error_msg, 'info')
|
||||
return redirect(url_for(success_redirect_endpoint, open_item=str(existing_item['_id'])))
|
||||
|
||||
@@ -5534,14 +5418,11 @@ def upload_item():
|
||||
return redirect(url_for(success_redirect_endpoint))
|
||||
|
||||
def generate_unique_batch_code(base_code, position):
|
||||
"""Generate a unique code for every item in a batch if no specific code is provided."""
|
||||
if not base_code:
|
||||
return None
|
||||
|
||||
candidate = base_code if position == 1 else f"{base_code}"
|
||||
if it.is_code_unique(candidate):
|
||||
return candidate
|
||||
|
||||
suffix = 1
|
||||
while suffix <= 1000:
|
||||
alternative = f"{candidate}"
|
||||
@@ -5556,14 +5437,11 @@ def upload_item():
|
||||
skipped_count = 0
|
||||
|
||||
upload_session_id = str(uuid.uuid4())[:8]
|
||||
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)}")
|
||||
|
||||
# 1. Process Manual Image Uploads
|
||||
for index, image in enumerate(images):
|
||||
#if upload_mode == 'library':
|
||||
# app.logger.info(f"[Upload {upload_session_id}] Skipping manual upload (Library Mode)")
|
||||
# skipped_count += 1
|
||||
# continue
|
||||
|
||||
if not image or not image.filename:
|
||||
skipped_count += 1
|
||||
continue
|
||||
@@ -5581,9 +5459,7 @@ def upload_item():
|
||||
continue
|
||||
|
||||
secure_name = secure_filename(image.filename)
|
||||
|
||||
image.seek(0)
|
||||
|
||||
image_bytes = image.read()
|
||||
|
||||
if not image_bytes:
|
||||
@@ -5618,7 +5494,6 @@ def upload_item():
|
||||
)
|
||||
|
||||
image_filenames.append(new_filename)
|
||||
|
||||
processed_count += 1
|
||||
final_size_kb = len(optimized_io.getvalue()) / 1024
|
||||
app.logger.info(
|
||||
@@ -5628,79 +5503,13 @@ def upload_item():
|
||||
app.logger.error(f"{image_log_prefix} Processing failed: {str(e)}")
|
||||
error_count += 1
|
||||
|
||||
app.logger.info(f"Upload session {upload_session_id} completed: {processed_count} processed, {error_count} errors, {skipped_count} skipped")
|
||||
|
||||
# 1. Duplikate verarbeiten (Direkt via MongoDB / GridFS)
|
||||
if duplicate_images:
|
||||
app.logger.info(f"Processing {len(duplicate_images)} duplicate images from GridFS: {duplicate_images}")
|
||||
duplicate_image_copies = []
|
||||
placeholder_used = False
|
||||
|
||||
for i, dup_img in enumerate(duplicate_images):
|
||||
try:
|
||||
# Suche das Originalbild direkt in der GridFS-Datenbank
|
||||
existing_file = fs.find_one({"filename": dup_img})
|
||||
|
||||
# Fallback: Falls der exakte Name nicht gefunden wird, suche über Regex nach dem Basisnamen
|
||||
if not existing_file:
|
||||
base_name = re.sub(r'_\d+(?=\.[^.]+$)', '', dup_img) # Entfernt Suffixe wie _800
|
||||
base_name_no_ext = os.path.splitext(base_name)[0]
|
||||
|
||||
if len(base_name_no_ext) > 5:
|
||||
app.logger.info(f"Trying regex search for base name: {base_name_no_ext}")
|
||||
existing_file = fs.find_one({"filename": {"$regex": f"^{re.escape(base_name_no_ext)}"}})
|
||||
|
||||
new_filename = f"{uuid.uuid4().hex}_{int(time.time())}.webp"
|
||||
|
||||
if existing_file:
|
||||
app.logger.info(f"Found image in GridFS for {dup_img}. Duplicating...")
|
||||
# Bilddaten in den Speicher laden und direkt als neue Datei in GridFS ablegen
|
||||
image_data = existing_file.read()
|
||||
|
||||
fs.put(
|
||||
image_data,
|
||||
filename=new_filename,
|
||||
content_type=existing_file.content_type,
|
||||
metadata={'original_duplicate_of': dup_img}
|
||||
)
|
||||
duplicate_image_copies.append(new_filename)
|
||||
processed_count += 1
|
||||
else:
|
||||
app.logger.warning(f"Could not find {dup_img} in GridFS. Using placeholder.")
|
||||
placeholder_path = os.path.join(app.static_folder, 'img', 'no-image.png')
|
||||
|
||||
if os.path.exists(placeholder_path):
|
||||
with open(placeholder_path, 'rb') as pf:
|
||||
placeholder_data = pf.read()
|
||||
|
||||
fs.put(
|
||||
placeholder_data,
|
||||
filename=new_filename,
|
||||
content_type='image/png',
|
||||
metadata={'is_placeholder': True}
|
||||
)
|
||||
duplicate_image_copies.append(new_filename)
|
||||
placeholder_used = True
|
||||
|
||||
except Exception as e:
|
||||
app.logger.error(f"Error duplicating image {dup_img}: {str(e)}")
|
||||
error_count += 1
|
||||
|
||||
if placeholder_used:
|
||||
app.logger.warning("Used placeholders for some missing images during duplication")
|
||||
|
||||
image_filenames.extend(duplicate_image_copies)
|
||||
|
||||
# 2. Buchcover verarbeiten
|
||||
# 2. Process Book Cover
|
||||
if book_cover_image:
|
||||
new_filename = f"{uuid.uuid4().hex}_{int(time.time())}_book_cover.webp"
|
||||
|
||||
# Prüfen, ob das Cover noch als lokale temporäre Datei existiert (z.B. von einer API geladen)
|
||||
local_path = os.path.join(app.config.get('UPLOAD_FOLDER', ''), book_cover_image)
|
||||
|
||||
try:
|
||||
if os.path.exists(local_path):
|
||||
# Lokales Bild einlesen, zu WebP optimieren und in GridFS schieben
|
||||
with Image.open(local_path) as img:
|
||||
if img.mode not in ('RGB', 'RGBA'):
|
||||
img = img.convert('RGBA')
|
||||
@@ -5718,7 +5527,6 @@ def upload_item():
|
||||
image_filenames.append(new_filename)
|
||||
app.logger.info(f"Processed local book cover and saved to GridFS: {new_filename}")
|
||||
else:
|
||||
# Falls es bereits in GridFS liegt, einfach duplizieren
|
||||
existing_cover = fs.find_one({"filename": book_cover_image})
|
||||
if existing_cover:
|
||||
fs.put(
|
||||
@@ -5734,7 +5542,10 @@ def upload_item():
|
||||
except Exception as e:
|
||||
app.logger.error(f"Error processing book cover {book_cover_image}: {str(e)}")
|
||||
|
||||
# 3. Item-Erstellung (Logik bleibt identisch, da it.add_item nun die GridFS-Filenames erhält)
|
||||
app.logger.info(
|
||||
f"Upload session {upload_session_id} completed: {processed_count} processed, {error_count} errors, {skipped_count} skipped")
|
||||
|
||||
# 3. Item Creation
|
||||
predefined_locations = it.get_predefined_locations()
|
||||
if ort and ort not in predefined_locations:
|
||||
it.add_predefined_location(ort)
|
||||
@@ -5760,7 +5571,6 @@ def upload_item():
|
||||
|
||||
parent_item_id = str(created_item_ids[0]) if created_item_ids else None
|
||||
|
||||
# image_filenames enthält jetzt ausschließlich GridFS-Filenames (oder ObjectIds, je nach deinem Setup)
|
||||
item_id = it.add_item(
|
||||
name, ort, beschreibung, image_filenames, filter_upload,
|
||||
filter_upload2, filter_upload3,
|
||||
@@ -5806,8 +5616,8 @@ def upload_item():
|
||||
'codes': created_item_ids and [it.get_item(cid).get('Code_4') for cid in created_item_ids] or []
|
||||
}
|
||||
)
|
||||
except Exception:
|
||||
app.logger.warning('Audit write failed for library_item_created')
|
||||
except Exception as e:
|
||||
app.logger.warning(f"Audit write failed for library_item_created: {str(e)}")
|
||||
|
||||
flash(success_msg, 'success')
|
||||
return redirect(url_for(success_redirect_endpoint))
|
||||
@@ -5819,121 +5629,6 @@ def upload_item():
|
||||
flash(error_msg, 'error')
|
||||
return redirect(url_for(success_redirect_endpoint))
|
||||
|
||||
|
||||
@app.route('/duplicate_item', methods=['POST'])
|
||||
def duplicate_item():
|
||||
"""
|
||||
Route for duplicating an existing item.
|
||||
Returns JSON response with success status.
|
||||
Enhanced for mobile browser compatibility.
|
||||
|
||||
Returns:
|
||||
flask.Response: JSON response with success status and data
|
||||
"""
|
||||
try:
|
||||
# Check authentication
|
||||
if 'username' not in session:
|
||||
return jsonify({'success': False, 'message': 'Nicht angemeldet'}), 401
|
||||
|
||||
# Check if user is admin
|
||||
username = session['username']
|
||||
current_permissions = us.get_effective_permissions(session['username'])
|
||||
|
||||
if not current_permissions['actions'].get('can_edit', False):
|
||||
flash('Ihnen fehlen die nötigen Berechtigungen, um diese Aktion auszuführen.', 'error')
|
||||
return redirect(url_for('home_admin'))
|
||||
|
||||
# Detect if request is from mobile device
|
||||
is_mobile = 'Mobile' in request.headers.get('User-Agent', '')
|
||||
is_ios = 'iPhone' in request.headers.get('User-Agent', '') or 'iPad' in request.headers.get('User-Agent', '')
|
||||
|
||||
# Log mobile duplication for debugging
|
||||
if is_mobile:
|
||||
app.logger.info(f"Mobile duplication from {request.headers.get('User-Agent', 'unknown')} by {encrypt_text(username)}")
|
||||
|
||||
# Get original item ID
|
||||
original_item_id = request.form.get('original_item_id')
|
||||
if not original_item_id:
|
||||
return jsonify({'success': False, 'message': 'Ursprungs-Element-ID fehlt'}), 400
|
||||
|
||||
# Fetch original item data
|
||||
original_item = it.get_item(original_item_id)
|
||||
if not original_item:
|
||||
return jsonify({'success': False, 'message': 'Ursprungs-Element nicht gefunden'}), 404
|
||||
|
||||
# Process filters as arrays (same as stored in database)
|
||||
filter1_array = original_item.get('Filter', [])
|
||||
filter2_array = original_item.get('Filter2', [])
|
||||
filter3_array = original_item.get('Filter3', [])
|
||||
|
||||
# Ensure filters are arrays
|
||||
if not isinstance(filter1_array, list):
|
||||
filter1_array = [filter1_array] if filter1_array else []
|
||||
if not isinstance(filter2_array, list):
|
||||
filter2_array = [filter2_array] if filter2_array else []
|
||||
if not isinstance(filter3_array, list):
|
||||
filter3_array = [filter3_array] if filter3_array else []
|
||||
|
||||
# Verify image paths for mobile devices to avoid issues with non-existent images
|
||||
images = original_item.get('Images', [])
|
||||
verified_images = []
|
||||
|
||||
if is_mobile:
|
||||
for img in images:
|
||||
img_path = os.path.join(app.config['UPLOAD_FOLDER'], img)
|
||||
if os.path.exists(img_path) and os.path.isfile(img_path):
|
||||
verified_images.append(img)
|
||||
else:
|
||||
app.logger.warning(f"Image not found for duplication: {img}")
|
||||
|
||||
# If we lost images in verification, log it
|
||||
if len(verified_images) < len(images):
|
||||
app.logger.warning(f"Only {len(verified_images)} of {len(images)} images verified for mobile duplication")
|
||||
else:
|
||||
verified_images = images
|
||||
|
||||
# For iOS devices, add more diagnostics and reduce data size if needed
|
||||
if is_ios:
|
||||
# Check if images exist (we now use main images as thumbnails)
|
||||
images_exist = []
|
||||
for img in verified_images[:5]: # Only check first 5 to save time
|
||||
img_path = os.path.join(app.config['UPLOAD_FOLDER'], img)
|
||||
if os.path.exists(img_path):
|
||||
images_exist.append(True)
|
||||
else:
|
||||
images_exist.append(False)
|
||||
|
||||
# Log detailed diagnostics
|
||||
app.logger.info(f"iOS duplication details: {len(verified_images)} images, "
|
||||
f"images available: {all(images_exist)}, "
|
||||
f"filter sizes: {len(filter1_array)}, {len(filter2_array)}, {len(filter3_array)}")
|
||||
|
||||
return jsonify({
|
||||
'success': True,
|
||||
'message': 'Duplizierungsdaten erfolgreich vorbereitet',
|
||||
'item_data': {
|
||||
'name': original_item.get('Name', ''),
|
||||
'description': original_item.get('Beschreibung', ''),
|
||||
'location': original_item.get('Ort', ''),
|
||||
'room': original_item.get('Raum', ''),
|
||||
'category': original_item.get('Kategorie', ''),
|
||||
'year': original_item.get('Anschaffungsjahr', ''),
|
||||
'cost': original_item.get('Anschaffungskosten', ''),
|
||||
'filter1': filter1_array,
|
||||
'filter2': filter2_array,
|
||||
'filter3': filter3_array,
|
||||
'images': verified_images, # Using verified images instead of original
|
||||
'isMobile': is_mobile,
|
||||
'isIOS': is_ios
|
||||
}
|
||||
})
|
||||
|
||||
except Exception as e:
|
||||
print(f"Error in duplicate_item: {e}")
|
||||
|
||||
return jsonify({'success': False, 'message': 'Serverfehler beim Duplizieren'}), 500
|
||||
|
||||
|
||||
def _soft_delete_item_groups(db, root_item_ids, username):
|
||||
"""Soft-delete one or more item groups and their borrow records."""
|
||||
now = datetime.datetime.now()
|
||||
|
||||
+100
-160
@@ -4,59 +4,60 @@
|
||||
|
||||
{% block content %}
|
||||
<style>
|
||||
/* The Dark Background Overlay */
|
||||
/* =========================================
|
||||
1. Modals & Overlays
|
||||
========================================= */
|
||||
.modal {
|
||||
display: none; /* Managed by JS (none/flex) */
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100vw;
|
||||
height: 100vh;
|
||||
background-color: rgba(0, 0, 0, 0.6);
|
||||
/* Display is managed by JS (none/flex) */
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
inset: 0; /* Modern shorthand for top: 0, right: 0, bottom: 0, left: 0 */
|
||||
z-index: 1000;
|
||||
background-color: rgba(0, 0, 0, 0.6);
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
/* The White Modal Box */
|
||||
.modal-content {
|
||||
background-color: #fff;
|
||||
padding: 20px;
|
||||
width: 80%;
|
||||
max-width: 600px;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 4px 15px rgba(0, 0, 0, 0.2);
|
||||
|
||||
/* Flexbox allows the header to stay fixed while the body scrolls */
|
||||
position: relative;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
max-height: 85vh;
|
||||
width: 100%;
|
||||
max-width: 900px; /* Consolidated from conflicting 600px/900px rules */
|
||||
max-height: 90vh;
|
||||
background-color: var(--ui-surface, #fff);
|
||||
border-radius: 8px;
|
||||
padding: 20px;
|
||||
box-shadow: 0 4px 20px rgba(0, 0, 0, 0.3);
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
/* The Close Button */
|
||||
.close {
|
||||
align-self: flex-end;
|
||||
position: absolute;
|
||||
top: 15px;
|
||||
right: 20px;
|
||||
color: #aaa;
|
||||
font-size: 28px;
|
||||
font-weight: bold;
|
||||
cursor: pointer;
|
||||
line-height: 1;
|
||||
margin-bottom: 10px;
|
||||
cursor: pointer;
|
||||
transition: color 0.2s ease;
|
||||
}
|
||||
|
||||
.close:hover,
|
||||
.close:focus {
|
||||
color: #000;
|
||||
color: var(--ui-text, #000);
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
/* The Scrollable Content Area */
|
||||
#detailContent {
|
||||
overflow-y: auto;
|
||||
padding-right: 10px;
|
||||
}
|
||||
|
||||
/* Library table-only view styles */
|
||||
/* =========================================
|
||||
2. Layout & Headers
|
||||
========================================= */
|
||||
.library-table-container {
|
||||
max-width: 1400px;
|
||||
margin: 0 auto;
|
||||
@@ -79,13 +80,15 @@
|
||||
font-size: 0.95em;
|
||||
}
|
||||
|
||||
/* Library search bar */
|
||||
/* =========================================
|
||||
3. Search, Filter & Scan Panels
|
||||
========================================= */
|
||||
.library-search-bar {
|
||||
margin-bottom: 20px;
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.library-search-input {
|
||||
@@ -95,10 +98,9 @@
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 6px;
|
||||
font-size: 16px;
|
||||
background: white;
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
/* Scanner panel */
|
||||
.library-scan-panel {
|
||||
background: var(--ui-surface);
|
||||
border: 1px solid #d9dde4;
|
||||
@@ -129,26 +131,18 @@
|
||||
color: #4b5563;
|
||||
}
|
||||
|
||||
.library-scan-status.ok {
|
||||
color: #1f7a38;
|
||||
}
|
||||
|
||||
.library-scan-status.warn {
|
||||
color: #9a6700;
|
||||
}
|
||||
|
||||
.library-scan-status.error {
|
||||
color: #b42318;
|
||||
}
|
||||
.library-scan-status.ok { color: #1f7a38; }
|
||||
.library-scan-status.warn { color: #9a6700; }
|
||||
.library-scan-status.error { color: #b42318; }
|
||||
|
||||
.library-scan-reader-wrap {
|
||||
display: none;
|
||||
margin-top: 12px;
|
||||
max-width: 460px;
|
||||
background: var(--ui-surface);
|
||||
border: 1px solid #d9dde4;
|
||||
border-radius: 8px;
|
||||
overflow: hidden;
|
||||
background: var(--ui-surface);
|
||||
max-width: 460px;
|
||||
}
|
||||
|
||||
.library-scan-reader {
|
||||
@@ -156,14 +150,15 @@
|
||||
min-height: 280px;
|
||||
}
|
||||
|
||||
/* Filters */
|
||||
.library-filter-toggle-btn {
|
||||
padding: 10px 16px;
|
||||
background: #f0f2f5;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 6px;
|
||||
cursor: pointer;
|
||||
font-weight: 500;
|
||||
color: var(--ui-text);
|
||||
cursor: pointer;
|
||||
transition: all 0.2s ease;
|
||||
}
|
||||
|
||||
@@ -178,10 +173,9 @@
|
||||
color: #4f46e5;
|
||||
}
|
||||
|
||||
/* Filter panel */
|
||||
.library-filter-panel {
|
||||
display: none;
|
||||
background: white;
|
||||
background: #fff;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 8px;
|
||||
padding: 20px;
|
||||
@@ -210,10 +204,10 @@
|
||||
}
|
||||
|
||||
.filter-item label {
|
||||
margin-bottom: 6px;
|
||||
font-weight: 600;
|
||||
font-size: 0.9em;
|
||||
color: var(--ui-text);
|
||||
margin-bottom: 6px;
|
||||
}
|
||||
|
||||
.filter-item input,
|
||||
@@ -222,7 +216,8 @@
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 4px;
|
||||
font-size: 14px;
|
||||
background: white;
|
||||
background: #fff;
|
||||
transition: border-color 0.2s ease, box-shadow 0.2s ease;
|
||||
}
|
||||
|
||||
.filter-item input:focus,
|
||||
@@ -236,8 +231,8 @@
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
margin-top: 15px;
|
||||
border-top: 1px solid #eee;
|
||||
padding-top: 15px;
|
||||
border-top: 1px solid #eee;
|
||||
}
|
||||
|
||||
.filter-buttons .button {
|
||||
@@ -246,11 +241,13 @@
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
/* Library table */
|
||||
/* =========================================
|
||||
4. Tables & Data Display
|
||||
========================================= */
|
||||
.library-items-table {
|
||||
width: 100%;
|
||||
background: #fff;
|
||||
border-collapse: collapse;
|
||||
background: white;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 8px;
|
||||
overflow: hidden;
|
||||
@@ -266,8 +263,8 @@
|
||||
padding: 14px 16px;
|
||||
text-align: left;
|
||||
font-weight: 600;
|
||||
color: var(--ui-text);
|
||||
font-size: 0.9em;
|
||||
color: var(--ui-text);
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.5px;
|
||||
}
|
||||
@@ -288,7 +285,6 @@
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
/* Table cells */
|
||||
.table-title {
|
||||
font-weight: 600;
|
||||
color: var(--ui-text);
|
||||
@@ -302,26 +298,14 @@
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.status-available {
|
||||
background: #e8f5e9;
|
||||
color: #2e7d32;
|
||||
}
|
||||
.status-available { background: #e8f5e9; color: #2e7d32; }
|
||||
.status-borrowed { background: #fff3e0; color: #e65100; }
|
||||
.status-damaged { background: #fee2e2; color: #991b1b; }
|
||||
|
||||
.status-borrowed {
|
||||
background: #fff3e0;
|
||||
color: #e65100;
|
||||
}
|
||||
|
||||
.status-damaged {
|
||||
background: #fee2e2;
|
||||
color: #991b1b;
|
||||
}
|
||||
|
||||
/* Actions */
|
||||
.table-actions {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
flex-wrap: wrap;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.table-actions .button {
|
||||
@@ -330,26 +314,25 @@
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
/* Empty state */
|
||||
.library-empty-state {
|
||||
text-align: center;
|
||||
padding: 60px 20px;
|
||||
text-align: center;
|
||||
color: #999;
|
||||
}
|
||||
|
||||
.library-empty-state h3 {
|
||||
font-size: 1.3em;
|
||||
margin-bottom: 10px;
|
||||
font-size: 1.3em;
|
||||
color: #666;
|
||||
}
|
||||
|
||||
.library-load-row {
|
||||
margin-top: 12px;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
flex-wrap: wrap;
|
||||
margin-top: 12px;
|
||||
}
|
||||
|
||||
.library-load-hint {
|
||||
@@ -357,54 +340,9 @@
|
||||
color: #6b7280;
|
||||
}
|
||||
|
||||
/* Small confirmation popup (toast) */
|
||||
.small-popup {
|
||||
position: fixed;
|
||||
bottom: 24px;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
background: rgba(17, 24, 39, 0.96);
|
||||
color: #fff;
|
||||
padding: 12px 16px;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 6px 24px rgba(2,6,23,0.6);
|
||||
z-index: 2000;
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
align-items: center;
|
||||
max-width: 90%;
|
||||
font-size: 0.95em;
|
||||
}
|
||||
.small-popup.ok { background: rgba(16,185,129,0.95); color: #032; }
|
||||
.small-popup.error { background: rgba(239,68,68,0.95); color: #210; }
|
||||
.small-popup .close-x { margin-left: 8px; cursor: pointer; font-weight: 700; }
|
||||
|
||||
/* Modal styles */
|
||||
.modal {
|
||||
display: none;
|
||||
position: fixed;
|
||||
z-index: 1000;
|
||||
left: 0;
|
||||
top: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-color: rgba(0, 0, 0, 0.5);
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
.modal-content {
|
||||
background-color: var(--ui-surface);
|
||||
border-radius: 8px;
|
||||
padding: 20px;
|
||||
max-width: 900px;
|
||||
max-height: 90vh;
|
||||
overflow-y: auto;
|
||||
box-shadow: 0 4px 20px rgba(0, 0, 0, 0.3);
|
||||
position: relative;
|
||||
}
|
||||
|
||||
/* =========================================
|
||||
5. Edit Grid Forms
|
||||
========================================= */
|
||||
.edit-grid {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
@@ -416,10 +354,10 @@
|
||||
}
|
||||
|
||||
.edit-grid label {
|
||||
display: block;
|
||||
margin-bottom: 4px;
|
||||
font-weight: 600;
|
||||
font-size: 0.9em;
|
||||
margin-bottom: 4px;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.edit-grid input,
|
||||
@@ -437,37 +375,44 @@
|
||||
margin-top: 14px;
|
||||
}
|
||||
|
||||
.close {
|
||||
position: absolute;
|
||||
right: 20px;
|
||||
top: 10px;
|
||||
font-size: 28px;
|
||||
font-weight: bold;
|
||||
color: #999;
|
||||
/* =========================================
|
||||
6. Notifications / Toasts
|
||||
========================================= */
|
||||
.small-popup {
|
||||
position: fixed;
|
||||
bottom: 24px;
|
||||
left: 50%;
|
||||
z-index: 2000;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
max-width: 90%;
|
||||
padding: 12px 16px;
|
||||
background: rgba(17, 24, 39, 0.96);
|
||||
color: #fff;
|
||||
border-radius: 8px;
|
||||
font-size: 0.95em;
|
||||
transform: translateX(-50%);
|
||||
box-shadow: 0 6px 24px rgba(2,6,23,0.6);
|
||||
}
|
||||
|
||||
.small-popup.ok { background: rgba(16,185,129,0.95); color: #032; }
|
||||
.small-popup.error { background: rgba(239,68,68,0.95); color: #210; }
|
||||
|
||||
.small-popup .close-x {
|
||||
margin-left: 8px;
|
||||
font-weight: 700;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.close:hover {
|
||||
color: var(--ui-text);
|
||||
}
|
||||
|
||||
/* Mobile responsive */
|
||||
/* =========================================
|
||||
7. Mobile Responsiveness
|
||||
========================================= */
|
||||
@media (max-width: 768px) {
|
||||
.library-table-container {
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
.library-search-bar {
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.library-search-input {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.library-items-table {
|
||||
font-size: 0.85em;
|
||||
}
|
||||
.library-table-container { padding: 10px; }
|
||||
.library-search-bar { flex-direction: column; }
|
||||
.library-search-input { width: 100%; }
|
||||
.library-items-table { font-size: 0.85em; }
|
||||
|
||||
.library-items-table th,
|
||||
.library-items-table td {
|
||||
@@ -479,17 +424,12 @@
|
||||
font-size: 0.75em;
|
||||
}
|
||||
|
||||
.filter-row {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
|
||||
.filter-row,
|
||||
.library-scan-controls {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
|
||||
.library-scan-reader-wrap {
|
||||
max-width: 100%;
|
||||
}
|
||||
.library-scan-reader-wrap { max-width: 100%; }
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -939,7 +879,7 @@
|
||||
const response = await fetch(`/api/is_student_card/${encodeURIComponent(code)}`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
'Content-Type': 'application/json',
|
||||
// Falls du in Flask CSRF-Protect nutzt, muss der Token mitgesendet werden:
|
||||
'X-CSRFToken': '{{ csrf_token }}',
|
||||
'X-CSRF-Token': '{{ csrf_token }}'
|
||||
|
||||
@@ -819,7 +819,7 @@
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
|
||||
.ausleihen, .edit-button, .delete-button, .details-button, .duplicate-button, .schedule-button, .damage-button {
|
||||
.ausleihen, .edit-button, .delete-button, .details-button, .schedule-button, .damage-button {
|
||||
padding: 10px 18px;
|
||||
border: none;
|
||||
border-radius: 5px;
|
||||
@@ -942,27 +942,6 @@
|
||||
box-shadow: 0 2px 4px rgba(23, 162, 184, 0.3);
|
||||
}
|
||||
|
||||
/* Duplicate Button */
|
||||
.duplicate-button {
|
||||
background-color: #6f42c1;
|
||||
color: white;
|
||||
border: 2px solid #6f42c1;
|
||||
}
|
||||
|
||||
.duplicate-button:hover {
|
||||
background-color: #5a32a3;
|
||||
border-color: #4e2a8e;
|
||||
transform: translateY(-1px);
|
||||
box-shadow: 0 4px 8px rgba(111, 66, 193, 0.3);
|
||||
color: white;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.duplicate-button:active {
|
||||
transform: translateY(0);
|
||||
box-shadow: 0 2px 4px rgba(111, 66, 193, 0.3);
|
||||
}
|
||||
|
||||
.damage-button {
|
||||
background-color: #fd7e14;
|
||||
color: white;
|
||||
@@ -1645,7 +1624,7 @@
|
||||
gap: 10px !important;
|
||||
}
|
||||
|
||||
.ausleihen, .edit-button, .delete-button, .details-button, .duplicate-button, .schedule-button {
|
||||
.ausleihen, .edit-button, .delete-button, .details-button, .schedule-button {
|
||||
width: 100% !important;
|
||||
min-height: 44px !important;
|
||||
padding: 12px 20px !important;
|
||||
@@ -1777,7 +1756,7 @@
|
||||
justify-content: flex-start;
|
||||
}
|
||||
|
||||
.ausleihen, .edit-button, .delete-button, .details-button, .duplicate-button, .schedule-button {
|
||||
.ausleihen, .edit-button, .delete-button, .details-button, .schedule-button {
|
||||
padding: 10px 20px;
|
||||
font-size: 0.9rem;
|
||||
min-width: 110px;
|
||||
@@ -1790,7 +1769,7 @@
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.ausleihen, .edit-button, .delete-button, .details-button, .duplicate-button, .schedule-button {
|
||||
.ausleihen, .edit-button, .delete-button, .details-button, .schedule-button {
|
||||
padding: 8px 16px;
|
||||
font-size: 0.85rem;
|
||||
min-width: 95px;
|
||||
@@ -1808,7 +1787,7 @@
|
||||
gap: 15px;
|
||||
}
|
||||
|
||||
.ausleihen, .edit-button, .delete-button, .details-button, .duplicate-button, .schedule-button {
|
||||
.ausleihen, .edit-button, .delete-button, .details-button, .schedule-button {
|
||||
padding: 12px 24px;
|
||||
font-size: 1rem;
|
||||
min-width: 120px;
|
||||
@@ -1980,7 +1959,7 @@
|
||||
}
|
||||
|
||||
/* Standardize form and document buttons */
|
||||
.save-button, .cancel-button, .remove-book-cover-button, .remove-duplicate-image-button,
|
||||
.save-button, .cancel-button, .remove-book-cover-button,
|
||||
.import-book-button, .fetch-isbn-button, .nav-back-button {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
@@ -3465,9 +3444,6 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
{% if current_permissions.actions.get('can_edit', False) %}
|
||||
<button class="edit-button" onclick="openEditModalForSelectedUnit('${item._id}', 'specific-item-card-${item._id}')">Bearbeiten</button>
|
||||
{% endif %}
|
||||
{% if current_permissions.actions.get('can_insert', False) %}
|
||||
<button class="duplicate-button" onclick="duplicateItem('${item._id}')">Duplizieren</button>
|
||||
{% endif %}
|
||||
{% if current_permissions.pages.get('admin_school_settings', False) %}
|
||||
${canScheduleItem ? `<button class="schedule-button" onclick="openScheduleModal('${item._id}')">Reservieren</button>` : ''}
|
||||
{% endif %}
|
||||
@@ -4244,7 +4220,6 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
: `<button class="ausleihen disabled-button" disabled>Ausgeliehen</button>`
|
||||
}
|
||||
<button class="edit-button" onclick="openEditModalForSelectedUnit('${item._id}', 'specific-item-modal-${item._id}')">Bearbeiten</button>
|
||||
<button class="duplicate-button" onclick="duplicateItem('${item._id}')">Duplizieren</button>
|
||||
${damageReports && damageReports.length > 0 ? `<button class="damage-button" onclick="markDamageAsRepaired('${item._id}')">Repariert</button>` : `<button class="damage-button" onclick="registerDamage('${item._id}')">Schaden melden</button>`}
|
||||
${canScheduleItem ? `<button class="schedule-button" onclick="openScheduleModal('${item._id}')">Reservieren</button>` : ''}
|
||||
<form method="POST" action="/delete_item/${item._id}" style="display:inline;" onsubmit="return confirm('Sind Sie sicher?')">
|
||||
@@ -5044,55 +5019,6 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Duplication function
|
||||
function duplicateItem(itemId) {
|
||||
// Show loading indicator
|
||||
const loadingDiv = document.createElement('div');
|
||||
loadingDiv.innerHTML = `
|
||||
<div style="position: fixed; top: 0; left: 0; width: 100%; height: 100%;
|
||||
background: rgba(0,0,0,0.5); z-index: 10000; display: flex;
|
||||
align-items: center; justify-content: center;">
|
||||
<div class="modal-dialog-white">
|
||||
<div>Element wird dupliziert...</div>
|
||||
<div class="modal-content-margin">
|
||||
<div class="spinner"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
document.body.appendChild(loadingDiv);
|
||||
|
||||
// Create form data for the duplicate_item request
|
||||
const formData = new FormData();
|
||||
formData.append('original_item_id', itemId);
|
||||
|
||||
// Send duplication request to get item data
|
||||
fetch('/duplicate_item', {
|
||||
method: 'POST',
|
||||
body: formData
|
||||
})
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
document.body.removeChild(loadingDiv);
|
||||
|
||||
if (data.success) {
|
||||
// Store duplication data in sessionStorage for the upload page
|
||||
sessionStorage.setItem('duplicateItemData', JSON.stringify(data.item_data));
|
||||
|
||||
// Redirect to upload admin page
|
||||
window.location.href = '/upload_admin?duplicate=true';
|
||||
} else {
|
||||
alert('Fehler beim Duplizieren: ' + (data.message || 'Unbekannter Fehler'));
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
document.body.removeChild(loadingDiv);
|
||||
console.error('Error duplicating item:', error);
|
||||
alert('Fehler beim Duplizieren des Elements. Bitte versuchen Sie es erneut.');
|
||||
});
|
||||
}
|
||||
|
||||
// Helper functions for appointment display
|
||||
function formatAppointmentDate(dateString) {
|
||||
if (!dateString) return '';
|
||||
|
||||
+17
-139
@@ -11,59 +11,6 @@
|
||||
{% block title %}{{ page_title|default('Artikel hochladen') }} - Inventarsystem{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{% if duplicate_data and duplicate_data.images %}
|
||||
<!-- Hidden server-side values for duplication, will be processed by JavaScript -->
|
||||
<div id="server-duplicate-data"
|
||||
data-name="{{ duplicate_data.name|default('') }}"
|
||||
data-description="{{ duplicate_data.description|default('') }}"
|
||||
data-location="{{ duplicate_data.location|default('') }}"
|
||||
data-room="{{ duplicate_data.room|default('') }}"
|
||||
data-year="{{ duplicate_data.year|default('') }}"
|
||||
data-cost="{{ duplicate_data.cost|default('') }}"
|
||||
data-images="{{ duplicate_data.images|tojson|safe }}"
|
||||
data-filter1="{{ duplicate_data.filter1|tojson|safe if duplicate_data.filter1 else '[]' }}"
|
||||
data-filter2="{{ duplicate_data.filter2|tojson|safe if duplicate_data.filter2 else '[]' }}"
|
||||
data-filter3="{{ duplicate_data.filter3|tojson|safe if duplicate_data.filter3 else '[]' }}"
|
||||
data-original-id="{{ duplicate_data.original_id|default('') }}"
|
||||
style="display:none;">
|
||||
</div>
|
||||
<script>
|
||||
// Pre-initialize duplicate data from server
|
||||
var serverDuplicateData = null;
|
||||
const dataElement = document.getElementById('server-duplicate-data');
|
||||
if (dataElement) {
|
||||
// Safely parse JSON arrays with error handling
|
||||
function safeJsonParse(jsonStr, defaultValue = []) {
|
||||
try {
|
||||
if (!jsonStr) return defaultValue;
|
||||
return JSON.parse(jsonStr);
|
||||
} catch (e) {
|
||||
console.error("Error parsing JSON:", e, "Value was:", jsonStr);
|
||||
return defaultValue;
|
||||
}
|
||||
}
|
||||
|
||||
// Get images data and log it for debugging
|
||||
const imagesData = dataElement.getAttribute('data-images') || "[]";
|
||||
console.log("Raw images data attribute:", imagesData);
|
||||
|
||||
serverDuplicateData = {
|
||||
name: dataElement.getAttribute('data-name') || "",
|
||||
description: dataElement.getAttribute('data-description') || "",
|
||||
location: dataElement.getAttribute('data-location') || "",
|
||||
room: dataElement.getAttribute('data-room') || "",
|
||||
year: dataElement.getAttribute('data-year') || "",
|
||||
cost: dataElement.getAttribute('data-cost') || "",
|
||||
images: safeJsonParse(imagesData),
|
||||
filter1: safeJsonParse(dataElement.getAttribute('data-filter1')),
|
||||
filter2: safeJsonParse(dataElement.getAttribute('data-filter2')),
|
||||
filter3: safeJsonParse(dataElement.getAttribute('data-filter3')),
|
||||
original_id: dataElement.getAttribute('data-original-id') || ""
|
||||
};
|
||||
console.log("Server-provided duplicate data:", serverDuplicateData);
|
||||
}
|
||||
</script>
|
||||
{% endif %}
|
||||
|
||||
<style>
|
||||
/* Book information display styles */
|
||||
@@ -296,38 +243,11 @@
|
||||
color: #721c24 !important;
|
||||
}
|
||||
|
||||
/* Duplicate code popup styling */
|
||||
.popup-overlay {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-color: rgba(0, 0, 0, 0.6);
|
||||
z-index: 10000;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
animation: overlayFadeIn 0.3s ease;
|
||||
}
|
||||
|
||||
@keyframes overlayFadeIn {
|
||||
from { opacity: 0; }
|
||||
to { opacity: 1; }
|
||||
}
|
||||
|
||||
.duplicate-code-popup {
|
||||
background-color: white;
|
||||
padding: 30px;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 5px 20px rgba(0, 0, 0, 0.3);
|
||||
max-width: 500px;
|
||||
width: 90%;
|
||||
text-align: center;
|
||||
position: relative;
|
||||
animation: popupSlideIn 0.3s ease;
|
||||
}
|
||||
|
||||
@keyframes popupSlideIn {
|
||||
from {
|
||||
opacity: 0;
|
||||
@@ -916,7 +836,7 @@
|
||||
<!-- Options will be loaded by JavaScript -->
|
||||
</select>
|
||||
</div>
|
||||
<div class="formupload_admin-group">
|
||||
<div class="form-group">
|
||||
<label for="filter2-4">Wert 4:</label>
|
||||
<select id="filter2-4" name="filter2" class="filter-dropdown-select">
|
||||
<option value="">-- Optional --</option>
|
||||
@@ -956,11 +876,11 @@
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Image upload (hidden for library mode) -->
|
||||
<!-- Image upload -->
|
||||
<div class="form-group">
|
||||
<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>
|
||||
<div class="allowed-formats">Erlaubte Formate: JPG, JPEG, PNG, GIF, MP4, MOV, AVI, MKV, WEBM, FLV, M4V, 3GP</div>
|
||||
<label for="images">Bilder:</label>
|
||||
<input type="file" id="images" name="images" accept=".jpg, .jpeg, .png, .gif" multiple>
|
||||
<div class="allowed-formats">Erlaubte Formate: JPG, JPEG, PNG, GIF</div>
|
||||
<!-- Add image preview area -->
|
||||
<div class="image-preview-container" id="image-preview-container"></div>
|
||||
</div>
|
||||
@@ -1878,11 +1798,11 @@
|
||||
if (existingPopup) {
|
||||
existingPopup.remove();
|
||||
}
|
||||
|
||||
|
||||
// Create popup overlay
|
||||
const overlay = document.createElement('div');
|
||||
overlay.className = 'popup-overlay';
|
||||
|
||||
|
||||
// Create popup content
|
||||
overlay.innerHTML = `
|
||||
<div class="duplicate-code-popup">
|
||||
@@ -1895,9 +1815,9 @@
|
||||
<button class="popup-close-button" onclick="this.closest('.popup-overlay').remove()">Verstanden</button>
|
||||
</div>
|
||||
`;
|
||||
|
||||
|
||||
document.body.appendChild(overlay);
|
||||
|
||||
|
||||
// Auto-remove after 10 seconds
|
||||
setTimeout(() => {
|
||||
if (overlay.parentNode) {
|
||||
@@ -1937,28 +1857,25 @@
|
||||
function setupImagePreview() {
|
||||
const imageInput = document.getElementById('images');
|
||||
const previewContainer = document.getElementById('image-preview-container');
|
||||
|
||||
|
||||
if (imageInput && previewContainer) {
|
||||
imageInput.addEventListener('change', function(e) {
|
||||
previewContainer.innerHTML = '';
|
||||
|
||||
|
||||
const files = e.target.files;
|
||||
|
||||
// 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'];
|
||||
let hasInvalidFile = false;
|
||||
|
||||
|
||||
// Validate file types before preview (Strictly Images)
|
||||
const allowedTypes = ['image/jpeg', 'image/jpg', 'image/png', 'image/gif'];
|
||||
|
||||
for (let i = 0; i < files.length; i++) {
|
||||
if (!allowedTypes.includes(files[i].type)) {
|
||||
hasInvalidFile = true;
|
||||
// Clear the file input to prevent submission
|
||||
imageInput.value = '';
|
||||
previewContainer.innerHTML = '<div class="error-message">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</div>';
|
||||
previewContainer.innerHTML = '<div class="error-message">Fehler: Datei "' + files[i].name + '" hat ein nicht unterstütztes Format. Erlaubte Formate: JPG, JPEG, PNG, GIF</div>';
|
||||
return; // Stop processing
|
||||
}
|
||||
}
|
||||
|
||||
for (let i = 0; i < files.length; i++) {
|
||||
const file = files[i];
|
||||
if (file.type.startsWith('image/')) {
|
||||
@@ -1973,17 +1890,6 @@
|
||||
previewContainer.appendChild(preview);
|
||||
};
|
||||
reader.readAsDataURL(file);
|
||||
} else if (file.type.startsWith('video/')) {
|
||||
const preview = document.createElement('div');
|
||||
preview.className = 'image-preview video-preview';
|
||||
preview.innerHTML = `
|
||||
<div class="video-placeholder">
|
||||
<div class="video-icon">🎥</div>
|
||||
<div class="video-name">${file.name}</div>
|
||||
</div>
|
||||
<button type="button" class="remove-image" onclick="removeImagePreview(this, ${i})">×</button>
|
||||
`;
|
||||
previewContainer.appendChild(preview);
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -2049,34 +1955,6 @@
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Handle duplication data if available (from sessionStorage or server)
|
||||
if (typeof prefillFormWithDuplicateData === 'function') {
|
||||
setTimeout(() => {
|
||||
prefillFormWithDuplicateData();
|
||||
}, 500); // Wait for all dropdowns to load
|
||||
}
|
||||
});
|
||||
|
||||
// Initialize duplication data - handle both server-side and sessionStorage data
|
||||
let duplicateData = null;
|
||||
|
||||
// First check if serverDuplicateData is defined by the script above
|
||||
if (typeof serverDuplicateData !== 'undefined' && serverDuplicateData) {
|
||||
console.log("Using server-provided duplicateData:", serverDuplicateData);
|
||||
duplicateData = serverDuplicateData;
|
||||
|
||||
// Ensure images is properly handled as an array
|
||||
if (duplicateData.images) {
|
||||
if (typeof duplicateData.images === 'string') {
|
||||
try {
|
||||
duplicateData.images = JSON.parse(duplicateData.images);
|
||||
} catch (e) {
|
||||
console.error("Error parsing duplicate images array:", e);
|
||||
}
|
||||
}
|
||||
console.log("Parsed duplicate images successfully.");
|
||||
}
|
||||
}
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
||||
Reference in New Issue
Block a user