Compare commits

...

14 Commits

Author SHA1 Message Date
Aiirondev_dev 5136e40587 Implementation of a clean up function for a stray collection processing
Release Inventarsystem / release-docker (push) Successful in 2m15s
2026-08-16 23:08:10 +02:00
Aiirondev_dev c62b2b553d improvements in processing the library item uploading
Release Inventarsystem / release-docker (push) Successful in 2m16s
2026-08-16 22:50:17 +02:00
Aiirondev_dev 8783f97a09 improvements in displaying the Images in the detailed view
Release Inventarsystem / release-docker (push) Successful in 2m15s
2026-08-16 22:19:41 +02:00
Aiirondev_dev 43e09b41f1 Slight change to the Style for the scnaner
Release Inventarsystem / release-docker (push) Successful in 2m16s
2026-08-16 21:23:04 +02:00
Aiirondev_dev 84257dc289 Fix / implementation of the according wrapper for the scanner processing
Release Inventarsystem / release-docker (push) Successful in 2m18s
2026-08-16 21:07:47 +02:00
Aiirondev_dev c4b3850369 Merge remote-tracking branch 'origin/main'
Release Inventarsystem / release-docker (push) Successful in 2m15s
2026-08-16 20:06:12 +02:00
Aiirondev_dev 28e9487fe1 Improved implementation of the Klassen processing to havbe the already existing ones in a dropdown. 2026-08-16 20:06:05 +02:00
Aiirondev_dev fe075938d7 resolve camara scan stream failure
Release Inventarsystem / release-docker (push) Successful in 2m15s
2026-08-16 15:57:12 +02:00
Aiirondev_dev 0ef928efd8 slight fix of the scanner
Release Inventarsystem / release-docker (push) Successful in 2m14s
2026-08-16 15:50:48 +02:00
Aiirondev_dev 1299140823 Fix of the encryption processing with the Student class
Release Inventarsystem / release-docker (push) Successful in 2m14s
2026-08-16 13:17:20 +02:00
Aiirondev_dev ea48d5c28a decryption of the parsed fields
Release Inventarsystem / release-docker (push) Successful in 2m15s
2026-08-16 13:08:34 +02:00
Aiirondev_dev 514065f4af fixe of a list error
Release Inventarsystem / release-docker (push) Successful in 3m7s
2026-08-16 12:58:31 +02:00
Aiirondev_dev 90da8487f2 feat(student-cards): add class-specific PDF export with dynamic dropdown
Release Inventarsystem / release-docker (push) Successful in 2m16s
- Implement /student_card_class_barcode_download route to filter student cards by class
- Dynamically extract unique class names from the database for frontend selection
- Update student_cards_admin.html to replace the text input with a class selection dropdown
2026-08-15 18:10:05 +02:00
Aiirondev_dev b1ca358d41 Cleanup of the front end and backend of the upload function to only allow images and no videos because of space and memory reasons as well as hardening the uploading process.
Release Inventarsystem / release-docker (push) Successful in 2m15s
2026-08-15 01:38:35 +02:00
5 changed files with 796 additions and 523 deletions
+363 -234
View File
@@ -2177,7 +2177,7 @@ def _upload_student_cards_excel():
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
try:
db = client[cfg.MONGODB_DB]
student_cards = db['student_cards']
student_cards = list(db['student_cards'].find())
existing_ids.update(
str(card.get('AusweisId', '')).strip().upper()
for card in student_cards.find({}, {'AusweisId': 1})
@@ -3828,7 +3828,10 @@ def api_item_detail(item_id):
"""
client.close()
return detail_html, 200
return jsonify({
'html': detail_html,
'images': item.get('Images', item.get('Bilder', []))
}), 200
except Exception as e:
app.logger.error(f"Error fetching item detail: {e}")
return jsonify({'error': 'An error occurred while fetching the item detail'}), 500
@@ -4108,20 +4111,21 @@ def student_cards_admin():
app.logger.error(f"Error adding student card: {e}")
flash('Fehler beim Hinzufügen des Ausweises.', 'error')
# Get all student cards
# Get all student cards and decrypt them
all_cards = list(student_cards.find().sort('AusweisId', 1))
all_cards = [_decrypt_student_card_doc(card) for card in all_cards]
client.close()
raw_classes = set(card.get('Klasse', '').strip() for card in all_cards if card.get('Klasse'))
available_classes = sorted(list(raw_classes))
return render_template(
'student_cards_admin.html',
username=session['username'],
student_cards=all_cards,
student_cards=all_cards, # Hier all_cards übergeben
edit_mode=edit_mode,
form_data=form_data,
config={'default': cfg.STUDENT_DEFAULT_BORROW_DAYS},
library_module_enabled=cfg.MODULES.is_enabled('library'),
student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards')
available_classes=available_classes, # Enthält nun die lesbaren Klassen
config=cfg.get_school_info()
)
@@ -4215,6 +4219,7 @@ def student_card_barcode_download():
from reportlab.pdfgen import canvas
from reportlab.lib.units import mm
from reportlab.lib.colors import HexColor, white, black
from reportlab.pdfbase.pdfmetrics import stringWidth
from io import BytesIO
import barcode
from barcode.writer import ImageWriter
@@ -4246,10 +4251,10 @@ def student_card_barcode_download():
# Professional color palette
header_color = HexColor("#0F172A") # Sehr dunkles blau
accent_color = HexColor("#2563EB") # Helles blau
light_bg = HexColor("#F8FAFC") # Sehr heller grau
card_bg_color = HexColor("#FFFFFF") # Weiß
text_dark = HexColor("#1E293B") # Dunkler text
text_gray = HexColor("#64748B") # Grauer text
light_bg = HexColor("#F8FAFC") # Sehr heller grau
card_bg_color = HexColor("#FFFFFF") # Weiß
text_dark = HexColor("#1E293B") # Dunkler text
text_gray = HexColor("#64748B") # Grauer text
for i, card in enumerate(all_cards):
if col_idx == 0 and i > 0:
@@ -4265,7 +4270,7 @@ def student_card_barcode_download():
# Card shadow effect (unter border)
c.setFillColor(HexColor("#E2E8F0"))
c.rect(x_pos + 0.5*mm, y_pos - card_height - 0.5*mm, card_width, card_height, fill=1, stroke=0)
c.rect(x_pos + 0.5 * mm, y_pos - card_height - 0.5 * mm, card_width, card_height, fill=1, stroke=0)
# Card background
c.setLineWidth(1)
@@ -4280,84 +4285,98 @@ def student_card_barcode_download():
# Header bar
c.setFillColor(header_color)
c.rect(x_pos, y_pos - 10*mm, card_width, 10*mm, fill=1, stroke=0)
c.rect(x_pos, y_pos - 10 * mm, card_width, 10 * mm, fill=1, stroke=0)
# Header accent line
c.setStrokeColor(accent_color)
c.setLineWidth(2)
c.line(x_pos, y_pos - 10*mm, x_pos + card_width, y_pos - 10*mm)
c.line(x_pos, y_pos - 10 * mm, x_pos + card_width, y_pos - 10 * mm)
school_name = cfg.get_school_info()
school_name = school_name["name"]
# "SCHÜLERAUSWEIS" text in header
c.setFont("Helvetica-Bold", 9)
school_name_str = str(school_name["name"])
# Zwei-Zeilen-Header: 1. BIBLIOTHEKSAUSWEIS, 2. Schulname (dynamisch)
c.setFont("Helvetica-Bold", 8)
c.setFillColor(white)
c.drawString(x_pos + 3*mm, y_pos - 6.5*mm, f"BIBLIOTHEKSAUSWEIS - {str(school_name)}")
c.drawString(x_pos + 3 * mm, y_pos - 4 * mm, "BIBLIOTHEKSAUSWEIS")
# Dynamische Anpassung des Schulnamens an die Breite
font_size = 8
while stringWidth(school_name_str, "Helvetica-Bold", font_size) > (card_width - 6 * mm) and font_size > 4:
font_size -= 0.5
c.setFont("Helvetica-Bold", font_size)
c.drawString(x_pos + 3 * mm, y_pos - 8 * mm, school_name_str)
# Student name - large and bold
c.setFillColor(text_dark)
c.setFont("Helvetica-Bold", 10)
name = card['SchülerName'][:20]
c.drawString(x_pos + 3*mm, y_pos - 14*mm, name)
c.drawString(x_pos + 3 * mm, y_pos - 16 * mm, name)
# ID with label
c.setFont("Helvetica", 8)
c.setFillColor(text_gray)
c.drawString(x_pos + 3*mm, y_pos - 18*mm, "Ausweis ID:")
c.drawString(x_pos + 3 * mm, y_pos - 20 * mm, "Ausweis ID:")
c.setFillColor(text_dark)
c.setFont("Helvetica-Bold", 9)
c.drawString(x_pos + 3*mm, y_pos - 21*mm, str(card['AusweisId']))
c.drawString(x_pos + 3 * mm, y_pos - 23 * mm, str(card['AusweisId']))
# Class with label
if card.get('Klasse'):
c.setFont("Helvetica", 8)
c.setFillColor(text_gray)
c.drawString(x_pos + 3*mm, y_pos - 25*mm, "Klasse:")
c.drawString(x_pos + 3 * mm, y_pos - 27 * mm, "Klasse:")
c.setFillColor(text_dark)
c.setFont("Helvetica-Bold", 9)
c.drawString(x_pos + 3*mm, y_pos - 28*mm, card['Klasse'])
c.drawString(x_pos + 3*mm, y_pos - 31*mm, "-")
c.drawString(x_pos + 3*mm, y_pos - 34*mm, "-")
c.drawString(x_pos + 3*mm, y_pos - 37*mm, "-")
c.drawString(x_pos + 3*mm, y_pos - 40*mm, "-")
c.drawString(x_pos + 3 * mm, y_pos - 30 * mm, card['Klasse'])
c.drawString(x_pos + 3 * mm, y_pos - 33 * mm, "-")
c.drawString(x_pos + 3 * mm, y_pos - 36 * mm, "-")
c.drawString(x_pos + 3 * mm, y_pos - 39 * mm, "-")
c.drawString(x_pos + 3 * mm, y_pos - 42 * mm, "-")
# Right barcode section with border highlight
barcode_x_start = x_pos + info_width + 1*mm
barcode_x_start = x_pos + info_width + 1 * mm
c.setFillColor(accent_color)
c.setLineWidth(0)
c.rect(barcode_x_start - 1*mm, y_pos - card_height,
card_width - info_width + 1*mm, 2*mm, fill=1, stroke=0)
c.rect(barcode_x_start - 1 * mm, y_pos - card_height,
card_width - info_width + 1 * mm, 2 * mm, fill=1, stroke=0)
# Generate and add larger barcode
# Generate and add dynamically sized barcode
try:
temp_dir = tempfile.gettempdir()
barcode_path = os.path.join(temp_dir, f"barcode_{card['AusweisId']}")
# Generate barcode with higher module width for better scanning
# ImageWriter Settings für maximalen Platz und Lesbarkeit
options = {
'write_text': False, # Text entfernen (spart Platz)
'quiet_zone': 1.0, # Minimaler Rand
'dpi': 300 # Hohe Auflösung
}
barcode_obj = barcode.get('code128', str(card['AusweisId']), writer=ImageWriter())
barcode_obj.save(barcode_path)
barcode_obj.save(barcode_path, options=options)
barcode_file = f"{barcode_path}.png"
if os.path.exists(barcode_file):
# Larger barcode taking up most of right section
barcode_width = (card_width - info_width - 4*mm)
barcode_height = 16*mm
barcode_y = y_pos - card_height + (card_height - barcode_height) / 2 + 2*mm
# Barcode über den fast kompletten restlichen Bereich strecken
barcode_width = (card_width - info_width - 4 * mm)
barcode_height = card_height - 15 * mm
barcode_y = y_pos - card_height + 2.5 * mm
c.drawImage(barcode_file,
barcode_x_start + 1*mm,
barcode_y,
width=barcode_width,
height=barcode_height,
preserveAspectRatio=True)
barcode_x_start + 1 * mm,
barcode_y,
width=barcode_width,
height=barcode_height,
preserveAspectRatio=False) # Strecken erlauben für maximalen Scanbereich
os.remove(barcode_file)
else:
raise Exception("Barcode file not created")
except Exception as e:
c.setFont("Helvetica", 7)
c.setFillColor(HexColor("#DC2626"))
c.drawString(barcode_x_start + 2*mm, y_pos - card_height + 20*mm, "⚠️ Barcode Error")
c.drawString(barcode_x_start + 2 * mm, y_pos - card_height + 20 * mm, "⚠️ Barcode Error")
col_idx += 1
if col_idx >= cols:
@@ -4378,6 +4397,196 @@ def student_card_barcode_download():
return redirect(url_for('student_cards_admin'))
@app.route('/student_card_class_barcode_download', methods=['GET'])
def student_card_class_barcode_download():
"""
Download PDF with student card barcodes filtered by a specific class from dropdown.
"""
from flask import request, session, redirect, url_for, send_file, flash
if 'username' not in session:
return redirect(url_for('login'))
current_permissions = us.get_effective_permissions(session['username'])
if not current_permissions['actions'].get('can_manage_users', False):
flash('Ihnen fehlen die nötigen Berechtigungen, um diese Aktion auszuführen.', 'error')
return redirect(url_for('library_view'))
class_name = request.args.get('class_name', '').strip()
if not class_name:
flash('Bitte wählen Sie eine Klasse aus.', 'error')
return redirect(url_for('student_cards_admin'))
try:
from reportlab.lib.pagesizes import A4
from reportlab.pdfgen import canvas
from reportlab.lib.units import mm
from reportlab.lib.colors import HexColor, white
from reportlab.pdfbase.pdfmetrics import stringWidth
from io import BytesIO
import barcode
from barcode.writer import ImageWriter
import tempfile
import os
import datetime
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
db = client[cfg.MONGODB_DB]
student_cards = db['student_cards']
# 1. Alle Ausweise laden
all_cards = list(student_cards.find().sort('AusweisId', 1))
client.close()
# 2. Alle entschlüsseln
decrypted_cards = [_decrypt_student_card_doc(card) for card in all_cards]
# 3. Im Speicher nach der Klartext-Klasse filtern
class_cards = [
card for card in decrypted_cards
if card.get('Klasse', '').strip() == class_name
]
if not class_cards:
flash(f'Keine Ausweise für die Klasse "{class_name}" gefunden.', 'error')
return redirect(url_for('student_cards_admin'))
pdf_buffer = BytesIO()
c = canvas.Canvas(pdf_buffer, pagesize=A4)
page_width, page_height = A4
margin = 10 * mm
card_width = 88 * mm
card_height = 56 * mm
cols = 2
gap_x = 8 * mm
gap_y = 8 * mm
x_positions = [margin, margin + card_width + gap_x]
y_start = page_height - margin
y_pos = y_start
col_idx = 0
header_color = HexColor("#0F172A")
accent_color = HexColor("#2563EB")
light_bg = HexColor("#F8FAFC")
card_bg_color = HexColor("#FFFFFF")
text_dark = HexColor("#1E293B")
text_gray = HexColor("#64748B")
for i, card in enumerate(class_cards):
if col_idx == 0 and i > 0:
y_pos -= (card_height + gap_y)
if y_pos - card_height < margin:
c.showPage()
y_pos = y_start
col_idx = 0
x_pos = x_positions[col_idx]
c.setFillColor(HexColor("#E2E8F0"))
c.rect(x_pos + 0.5 * mm, y_pos - card_height - 0.5 * mm, card_width, card_height, fill=1, stroke=0)
c.setLineWidth(1)
c.setFillColor(card_bg_color)
c.setStrokeColor(HexColor("#CBD5E1"))
c.rect(x_pos, y_pos - card_height, card_width, card_height, fill=1, stroke=1)
info_width = 38 * mm
c.setFillColor(light_bg)
c.rect(x_pos, y_pos - card_height, info_width, card_height, fill=1, stroke=0)
c.setFillColor(header_color)
c.rect(x_pos, y_pos - 10 * mm, card_width, 10 * mm, fill=1, stroke=0)
c.setStrokeColor(accent_color)
c.setLineWidth(2)
c.line(x_pos, y_pos - 10 * mm, x_pos + card_width, y_pos - 10 * mm)
school_name = cfg.get_school_info()
school_name_str = str(school_name["name"])
c.setFont("Helvetica-Bold", 8)
c.setFillColor(white)
c.drawString(x_pos + 3 * mm, y_pos - 4 * mm, "BIBLIOTHEKSAUSWEIS")
font_size = 8
while stringWidth(school_name_str, "Helvetica-Bold", font_size) > (card_width - 6 * mm) and font_size > 4:
font_size -= 0.5
c.setFont("Helvetica-Bold", font_size)
c.drawString(x_pos + 3 * mm, y_pos - 8 * mm, school_name_str)
c.setFillColor(text_dark)
c.setFont("Helvetica-Bold", 10)
name = card.get('SchülerName', '')[:20]
c.drawString(x_pos + 3 * mm, y_pos - 16 * mm, name)
c.setFont("Helvetica", 8)
c.setFillColor(text_gray)
c.drawString(x_pos + 3 * mm, y_pos - 20 * mm, "Ausweis ID:")
c.setFillColor(text_dark)
c.setFont("Helvetica-Bold", 9)
c.drawString(x_pos + 3 * mm, y_pos - 23 * mm, str(card.get('AusweisId', '')))
if card.get('Klasse'):
c.setFont("Helvetica", 8)
c.setFillColor(text_gray)
c.drawString(x_pos + 3 * mm, y_pos - 27 * mm, "Klasse:")
c.setFillColor(text_dark)
c.setFont("Helvetica-Bold", 9)
c.drawString(x_pos + 3 * mm, y_pos - 30 * mm, card['Klasse'])
barcode_x_start = x_pos + info_width + 1 * mm
c.setFillColor(accent_color)
c.setLineWidth(0)
c.rect(barcode_x_start - 1 * mm, y_pos - card_height, card_width - info_width + 1 * mm, 2 * mm, fill=1,
stroke=0)
try:
temp_dir = tempfile.gettempdir()
barcode_path = os.path.join(temp_dir, f"barcode_{card.get('AusweisId', i)}")
options = {
'write_text': False,
'quiet_zone': 1.0,
'dpi': 300
}
barcode_obj = barcode.get('code128', str(card.get('AusweisId', '')), writer=ImageWriter())
barcode_obj.save(barcode_path, options=options)
barcode_file = f"{barcode_path}.png"
if os.path.exists(barcode_file):
barcode_width = (card_width - info_width - 4 * mm)
barcode_height = card_height - 15 * mm
barcode_y = y_pos - card_height + 2.5 * mm
c.drawImage(barcode_file, barcode_x_start + 1 * mm, barcode_y,
width=barcode_width, height=barcode_height, preserveAspectRatio=False)
os.remove(barcode_file)
except Exception as e:
pass
col_idx += 1
if col_idx >= cols:
col_idx = 0
c.save()
pdf_buffer.seek(0)
filename = f'ausweise_klasse_{class_name.replace(" ", "_")}_{datetime.datetime.now().strftime("%Y%m%d")}.pdf'
return send_file(
pdf_buffer,
mimetype='application/pdf',
as_attachment=True,
download_name=filename
)
except Exception as e:
flash('Fehler beim PDF-Download', 'error')
return redirect(url_for('student_cards_admin'))
@app.route('/student_card_single_barcode_download/<card_id>', methods=['GET'])
def student_card_single_barcode_download(card_id):
"""
@@ -4399,6 +4608,7 @@ def student_card_single_barcode_download(card_id):
from reportlab.pdfgen import canvas
from reportlab.lib.units import mm
from reportlab.lib.colors import HexColor, white, black
from reportlab.pdfbase.pdfmetrics import stringWidth
from io import BytesIO
from bson.objectid import ObjectId
import barcode
@@ -4421,29 +4631,30 @@ def student_card_single_barcode_download(card_id):
c = canvas.Canvas(pdf_buffer, pagesize=A4)
page_width, page_height = A4
margin = 20 * mm
card_width = 105 * mm
card_height = 70 * mm
x_pos = (page_width - card_width) / 2
y_pos = (page_height - card_height) / 2
# Korrektur des y_pos auf die OBERKANTE, damit die nachfolgenden Rechnungen bündig sind
y_pos = (page_height + card_height) / 2
# Professional color palette
header_color = HexColor("#0F172A") # Sehr dunkles blau
accent_color = HexColor("#2563EB") # Helles blau
light_bg = HexColor("#F8FAFC") # Sehr heller grau
card_bg_color = HexColor("#FFFFFF") # Weiß
text_dark = HexColor("#1E293B") # Dunkler text
text_gray = HexColor("#64748B") # Grauer text
header_color = HexColor("#0F172A")
accent_color = HexColor("#2563EB")
light_bg = HexColor("#F8FAFC")
card_bg_color = HexColor("#FFFFFF")
text_dark = HexColor("#1E293B")
text_gray = HexColor("#64748B")
# Card shadow effect
c.setFillColor(HexColor("#E2E8F0"))
c.rect(x_pos + 1*mm, y_pos - card_height - 1*mm, card_width, card_height, fill=1, stroke=0)
c.rect(x_pos + 1 * mm, y_pos - card_height - 1 * mm, card_width, card_height, fill=1, stroke=0)
# Card background
c.setLineWidth(1.5)
c.setFillColor(card_bg_color)
c.setStrokeColor(HexColor("#CBD5E1"))
c.rect(x_pos, y_pos, card_width, card_height, fill=1, stroke=1)
c.rect(x_pos, y_pos - card_height, card_width, card_height, fill=1, stroke=1)
# Left info section (50mm)
info_width = 50 * mm
@@ -4457,86 +4668,101 @@ def student_card_single_barcode_download(card_id):
# Header bar
c.setFillColor(header_color)
c.rect(x_pos, y_pos - 10*mm, card_width, 10*mm, fill=1, stroke=0)
c.rect(x_pos, y_pos - 10 * mm, card_width, 10 * mm, fill=1, stroke=0)
# Header accent line
c.setStrokeColor(accent_color)
c.setLineWidth(2.5)
c.line(x_pos, y_pos - 10*mm, x_pos + card_width, y_pos - 10*mm)
c.line(x_pos, y_pos - 10 * mm, x_pos + card_width, y_pos - 10 * mm)
school_name = cfg.get_school_info()
school_name = school_name["name"]
# "SCHÜLERAUSWEIS" text in header
c.setFont("Helvetica-Bold", 11)
school_name_str = str(school_name["name"])
# Zwei-Zeilen-Header
c.setFont("Helvetica-Bold", 10)
c.setFillColor(white)
c.drawString(x_pos + 4*mm, y_pos - 6.5*mm, f"BIBLIOTHEKSAUSWEIS - {str(school_name)}")
c.drawString(x_pos + 4 * mm, y_pos - 4.5 * mm, "BIBLIOTHEKSAUSWEIS")
# Dynamische Größe für den Schulnamen
font_size = 10
while stringWidth(school_name_str, "Helvetica-Bold", font_size) > (card_width - 8 * mm) and font_size > 4:
font_size -= 0.5
c.setFont("Helvetica-Bold", font_size)
c.drawString(x_pos + 4 * mm, y_pos - 8.5 * mm, school_name_str)
# Student name - large and prominent
c.setFillColor(text_dark)
c.setFont("Helvetica-Bold", 12)
name = card['SchülerName'][:25]
c.drawString(x_pos + 4*mm, y_pos - 16*mm, name)
c.drawString(x_pos + 4 * mm, y_pos - 18 * mm, name)
# ID section with label
c.setFont("Helvetica", 9)
c.setFillColor(text_gray)
c.drawString(x_pos + 4*mm, y_pos - 21*mm, "Ausweis-ID:")
c.drawString(x_pos + 4 * mm, y_pos - 24 * mm, "Ausweis-ID:")
c.setFillColor(text_dark)
c.setFont("Helvetica-Bold", 11)
c.drawString(x_pos + 4*mm, y_pos - 25*mm, str(card['AusweisId']))
c.drawString(x_pos + 4 * mm, y_pos - 28 * mm, str(card['AusweisId']))
# Class section
if card.get('Klasse'):
c.setFont("Helvetica", 9)
c.setFillColor(text_gray)
c.drawString(x_pos + 4*mm, y_pos - 30*mm, "Klasse:")
c.drawString(x_pos + 4 * mm, y_pos - 34 * mm, "Klasse:")
c.setFillColor(text_dark)
c.setFont("Helvetica-Bold", 11)
c.drawString(x_pos + 4*mm, y_pos - 34*mm, card['Klasse'])
c.drawString(x_pos + 4 * mm, y_pos - 38 * mm, card['Klasse'])
# Barcode section - right side with blue accent
barcode_x_start = x_pos + info_width + 3*mm
barcode_x_start = x_pos + info_width + 3 * mm
c.setFillColor(accent_color)
c.setLineWidth(0)
c.rect(x_pos + info_width, y_pos - card_height,
card_width - info_width, 3*mm, fill=1, stroke=0)
card_width - info_width, 3 * mm, fill=1, stroke=0)
# Generate and add large barcode
# Generate and add large dynamically sized barcode
try:
temp_dir = tempfile.gettempdir()
barcode_path = os.path.join(temp_dir, f"barcode_{card['AusweisId']}")
# Generate barcode with better sizing
# Options anpassen für Scanbarkeit
options = {
'write_text': False,
'quiet_zone': 1.0,
'dpi': 300
}
barcode_obj = barcode.get('code128', str(card['AusweisId']), writer=ImageWriter())
barcode_obj.save(barcode_path)
barcode_obj.save(barcode_path, options=options)
barcode_file = f"{barcode_path}.png"
if os.path.exists(barcode_file):
# Large barcode on right side
barcode_width = (card_width - info_width - 8*mm)
barcode_height = 20*mm
barcode_y_offset = (card_height - 10*mm - barcode_height) / 2
# Den gesamten Platz auf der rechten Seite ausnutzen
barcode_width = (card_width - info_width - 8 * mm)
barcode_height = card_height - 18 * mm
barcode_y = y_pos - card_height + 5 * mm
c.drawImage(barcode_file,
barcode_x_start,
y_pos - card_height + barcode_y_offset + 5*mm,
width=barcode_width,
height=barcode_height,
preserveAspectRatio=True)
barcode_x_start + 1 * mm,
barcode_y,
width=barcode_width,
height=barcode_height,
preserveAspectRatio=False) # Ausdehnung in alle Richtungen
os.remove(barcode_file)
else:
raise Exception("Barcode file not created")
except Exception as e:
c.setFont("Helvetica", 9)
c.setFillColor(HexColor("#DC2626"))
c.drawString(barcode_x_start + 2*mm, y_pos - card_height + 25*mm, "⚠️ Barcode Error")
c.drawString(barcode_x_start + 2 * mm, y_pos - card_height + 25 * mm, "⚠️ Barcode Error")
# Bottom info line
c.setStrokeColor(HexColor("#CBD5E1"))
c.setLineWidth(0.5)
c.line(x_pos, y_pos - card_height + 3*mm, x_pos + card_width, y_pos - card_height + 3*mm)
c.line(x_pos, y_pos - card_height + 3 * mm, x_pos + card_width, y_pos - card_height + 3 * mm)
c.save()
pdf_buffer.seek(0)
@@ -4552,7 +4778,6 @@ def student_card_single_barcode_download(card_id):
flash('Fehler beim PDF-Download', 'error')
return redirect(url_for('student_cards_admin'))
@app.route('/login', methods=['GET', 'POST'])
def login():
"""
@@ -5239,7 +5464,7 @@ 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:
@@ -5266,9 +5491,9 @@ 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
@@ -5301,46 +5526,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()]
# 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}")
individual_codes = [c.strip() for c in str(individual_codes_raw).replace(',', '\n').splitlines() if
c.strip()]
# 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))
@@ -5348,7 +5557,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:
@@ -5384,9 +5593,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
@@ -5395,28 +5603,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
# 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.")
@@ -5443,14 +5643,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}"
@@ -5465,14 +5662,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
@@ -5490,9 +5684,7 @@ def upload_item():
continue
secure_name = secure_filename(image.filename)
image.seek(0)
image_bytes = image.read()
if not image_bytes:
@@ -5527,7 +5719,6 @@ def upload_item():
)
image_filenames.append(new_filename)
processed_count += 1
final_size_kb = len(optimized_io.getvalue()) / 1024
app.logger.info(
@@ -5537,79 +5728,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')
@@ -5627,7 +5752,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(
@@ -5643,7 +5767,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)
@@ -5669,7 +5796,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,
@@ -5702,7 +5828,9 @@ def upload_item():
if item_id:
success_msg = f'Element wurde erfolgreich hinzugefügt ({len(created_item_ids)} erstellt)'
fs = get_gridfs() # Deine GridFS Verbindung
cleanup_orphaned_images(fs, dry_run=True)
if upload_mode == 'library':
try:
_append_audit_event_standalone(
@@ -5715,8 +5843,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))
@@ -9835,18 +9963,21 @@ def fetch_book_info(isbn):
app.logger.error(f"Error fetching book data: {e}")
return jsonify({"error": f"Failed to fetch book information"}), 500
@app.route('/download_book_cover', methods=['POST'])
def download_book_cover():
"""
API endpoint to download and save a book cover image from URL
API endpoint to download a book cover image from URL
and save it directly to MongoDB GridFS.
"""
if 'username' not in session:
return jsonify({"error": "Not authorized"}), 403
current_permissions = us.get_effective_permissions(session['username'])
if not current_permissions['actions'].get('can_insert', False):
flash('Ihnen fehlen die nötigen Berechtigungen, um diese Aktion auszuführen.', 'error')
return redirect(url_for('library_view'))
return jsonify({"error": "Ihnen fehlen die nötigen Berechtigungen."}), 403
if not cfg.MODULES.is_enabled('library'):
return jsonify({"error": "Bibliotheks-Modul ist deaktiviert."}), 403
@@ -9861,17 +9992,11 @@ def download_book_cover():
if parsed_url.scheme != 'https' or not parsed_url.netloc:
return jsonify({"error": "Only public HTTPS URLs are allowed"}), 400
# 2. SSRF Protection: Strict Allowlist Check
# if parsed_url.netloc not in ALLOWED_COVER_DOMAINS:
# return jsonify({"error": "Target host is not an allowed book cover provider"}), 403
# Download the image (allow_redirects=False prevents redirecting to internal IPs)
response = requests.get(image_url, stream=True, timeout=10, allow_redirects=False)
if response.status_code != 200:
return jsonify({"error": f"Failed to download image: Status {response.status_code}"}), 400
# Check content type
content_type = response.headers.get('content-type', '')
allowed_types = ['image/jpeg', 'image/jpg', 'image/png', 'image/gif']
@@ -9880,16 +10005,14 @@ def download_book_cover():
"error": f"Nicht unterstütztes Bildformat: {content_type}. Erlaubte Formate: JPG, JPEG, PNG, GIF"
}), 400
# Check content length header
content_length = response.headers.get('Content-Length')
if content_length:
try:
if int(content_length) > 5 * 1024 * 1024:
return jsonify({"error": "Image is too large"}), 413
return jsonify({"error": "Image is too large (max 5MB)"}), 413
except ValueError:
pass
# Generate a fully unique filename
unique_id = str(uuid.uuid4())
timestamp = time.strftime("%Y%m%d%H%M%S")
@@ -9900,23 +10023,29 @@ def download_book_cover():
extension = '.gif'
filename = f"book_cover_{unique_id}_{timestamp}{extension}"
filepath = os.path.join(app.config['UPLOAD_FOLDER'], filename)
# Save image in chunks (prevents memory exhaustion and enforces size limits)
with open(filepath, 'wb') as f:
written = 0
for chunk in response.iter_content(chunk_size=8192):
written += len(chunk)
if written > 5 * 1024 * 1024:
# Clean up the partial file before aborting
os.remove(filepath)
return jsonify({"error": "Image is too large"}), 413
f.write(chunk)
image_data = io.BytesIO()
written = 0
for chunk in response.iter_content(chunk_size=8192):
written += len(chunk)
if written > 5 * 1024 * 1024:
return jsonify({"error": "Image is too large (max 5MB)"}), 413
image_data.write(chunk)
image_data.seek(0)
fs = get_gridfs()
fs.put(
image_data,
filename=filename,
content_type=content_type
)
return jsonify({
"success": True,
"filename": filename,
"message": "Image downloaded successfully"
"message": "Image downloaded and stored directly in database"
})
except requests.exceptions.RequestException as e:
@@ -9924,8 +10053,8 @@ def download_book_cover():
return jsonify({"error": "Netzwerkfehler beim Herunterladen des Bildes."}), 500
except Exception as e:
app.logger.error(f"Error downloading book cover: {e}")
# Fixed syntax here: Removed the injected HTML that was appended to this line
return jsonify({"error": f"Failed to download image"}), 500
return jsonify({"error": "Failed to download image"}), 500
"""
@app.route('/proxy_image')
def proxy_image():
+134
View File
@@ -25,6 +25,7 @@ import datetime
import Web.modules.database.settings as cfg
from Web.modules.database.settings import MongoClient
import Web.modules.inventarsystem.data_protection as dp
import logging
def is_library_item(item):
@@ -1293,3 +1294,136 @@ def sync_group_codes(primary_obj_id, base_code, individual_codes_list):
except Exception as e:
print(f"Error syncing group codes: {e}")
return False
logging.basicConfig(level=logging.INFO, format='%(levelname)s: %(message)s')
def cleanup_orphaned_images(fs, dry_run=True):
"""
Finds images in GridFS that are no longer referenced by any item
and optionally deletes them.
Supported item fields:
- book_cover_image
- image
- images
The fields are expected to contain GridFS file ObjectIds.
:param fs: GridFS instance, e.g. gridfs.GridFS(db)
:param dry_run: If True, only reports what would be deleted.
If False, actually deletes the files.
"""
logging.info("Starte Cleanup-Skript...")
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
try:
db = client[cfg.MONGODB_DB]
items_collection = db["items"]
referenced_files = set()
for item in items_collection.find(
{},
{
"Images": 1
}
):
images = item.get("Images")
if isinstance(images, list):
for img in images:
if img:
referenced_files.add(img)
referenced_files.discard(None)
logging.info(
f"{len(referenced_files)} referenzierte GridFS-Dateien gefunden."
)
orphaned_files = []
for grid_file in fs.find():
file_id = grid_file._id
filename = grid_file.filename or ""
if not filename.lower().endswith(
(".jpg", ".jpeg", ".png", ".gif", ".webp")
):
continue
if file_id not in referenced_files:
orphaned_files.append(
{
"_id": file_id,
"filename": filename,
"upload_date": grid_file.upload_date,
}
)
logging.info(
f"Gefundene verwaiste Bilder: {len(orphaned_files)}"
)
if dry_run:
logging.info(
"--- DRY RUN AKTIV - Es wird nichts gelöscht ---"
)
for file in orphaned_files:
logging.info(
f"Würde löschen: "
f"{file['filename']} "
f"(ID: {file['_id']}, "
f"Hochgeladen: {file['upload_date']})"
)
logging.info(
"--- Setze dry_run=False, um physisch zu löschen ---"
)
else:
logging.warning("--- LÖSCHVORGANG AKTIV ---")
deleted_count = 0
failed_count = 0
for file in orphaned_files:
try:
fs.delete(file["_id"])
deleted_count += 1
logging.info(
f"Gelöscht: {file['filename']} "
f"(ID: {file['_id']})"
)
except Exception as e:
failed_count += 1
logging.error(
f"Fehler beim Löschen von "
f"{file['filename']} "
f"(ID: {file['_id']}): {e}"
)
logging.info(
f"Cleanup beendet. "
f"{deleted_count} Bilder gelöscht, "
f"{failed_count} Fehler."
)
return {
"status": "success",
"referenced_count": len(referenced_files),
"orphaned_count": len(orphaned_files),
"dry_run": dry_run,
}
finally:
client.close()
+125 -104
View File
@@ -135,21 +135,6 @@
.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;
}
.library-scan-reader {
width: 100%;
min-height: 280px;
}
/* Filters */
.library-filter-toggle-btn {
padding: 10px 16px;
@@ -431,6 +416,40 @@
.library-scan-reader-wrap { max-width: 100%; }
}
.library-scan-reader-wrap {
display: none;
margin-top: 15px;
max-width: 640px;
margin-left: auto;
margin-right: auto;
background: #000;
border: 1px solid #d9dde4;
border-radius: 8px;
overflow: hidden;
grid-column: 1 / -1;
}
.library-scan-reader {
width: 100%;
min-height: 280px;
position: relative;
}
.library-scan-reader video {
width: 100%;
height: auto;
display: block;
object-fit: cover;
}
.library-scan-reader canvas.drawing,
.library-scan-reader canvas.drawingBuffer {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
}
</style>
<div class="library-table-container" id="libraryTableContainer" data-can-edit="{{ 1 if current_permissions.actions.get('can_edit', False) else 0 }}">
@@ -457,7 +476,6 @@
🔍 Filter
</button>
</div>
<div class="library-scan-controls">
<select id="scanModeSelect" aria-label="Scan-Modus">
<option value="card_only">Nur Ausweis erfassen</option>
@@ -475,6 +493,10 @@
</label>
<button id="manualActionBtn" class="button" type="button" style="margin-left:6px; background:#4f46e5; color:white;">Code verarbeiten</button>
</div>
<div class="library-scan-reader-wrap" id="scanReaderWrap" style="display: none; margin-top: 15px;">
<div class="library-scan-reader" style="width: 100%; max-width: 640px; margin: 0 auto; overflow: hidden; border-radius: 8px; border: 2px solid #ccc;">
</div>
</div>
<div id="filterPanel" class="library-filter-panel">
<div class="filter-row">
<div class="filter-item">
@@ -805,71 +827,92 @@
deleteLibraryItem(itemId);
}
// =========================================================================
// 3. CORE SCANNER ROUTING ENGINE (QUAGGA2)
// =========================================================================
function startScanner(targetCallback) {
const readerWrap = document.getElementById('scanReaderWrap');
async function startScanner(callback = null) {
if (scannerRunning) {
console.warn("Scanner is already running. Stopping it first...");
await stopScanner();
}
activeScannerCallback = callback;
const scannerWrap = document.querySelector('.library-scan-reader-wrap');
const toggleBtn = document.getElementById('toggleScannerBtn');
activeScannerCallback = targetCallback;
// 1. CRITICAL FIX: Make the container visible BEFORE Quagga initializes
// Quagga cannot calculate video dimensions if display is 'none'
if (scannerWrap) {
scannerWrap.style.display = 'block';
}
if (readerWrap) readerWrap.style.display = 'block';
setScanStatus('Initializing camera...', 'warn');
setScanStatus('Starte Kamera...', 'warn');
Quagga.init({
inputStream: {
name: "Live",
type: "LiveStream",
target: document.querySelector('#library-scanner-container'),
constraints: {
width: 640,
height: 480,
facingMode: "environment"
// 2. Initialize Quagga with a slight delay to allow the DOM to render the block
setTimeout(() => {
Quagga.init({
inputStream: {
name: "Live",
type: "LiveStream",
// This MUST match the inner div where the video should appear
target: document.querySelector('.library-scan-reader'),
constraints: {
width: 640,
height: 480,
facingMode: "environment" // Prefer back camera on mobile
}
},
},
decoder: {
readers: [
"code_128_reader",
"ean_reader",
"code_39_reader",
"upc_reader",
"codabar_reader",
"i2of5_reader"
]
}
}, function(err) {
if (err) {
console.error('Scanner start failed:', err);
if (readerWrap) readerWrap.style.display = 'none';
const detail = (err && (err.message || err.name)) ? ` (${err.message || err.name})` : '';
setScanStatus(`Scanner konnte nicht gestartet werden${detail}`, 'error');
return;
}
locator: {
patchSize: "medium",
halfSample: true
},
decoder: {
// Keep only the barcode types you actually use to improve performance
readers: ["code_128_reader", "ean_reader", "code_39_reader"]
},
locate: true
}, function(err) {
if (err) {
// This will finally log the actual error (e.g., NotAllowedError) if permissions fail
console.error("Quagga initialization failed:", err);
setScanStatus('Kamera-Fehler: ' + (err.name || err), 'error');
Quagga.start();
scannerRunning = true;
if (scannerWrap) scannerWrap.style.display = 'none';
scannerRunning = false;
return;
}
if (!targetCallback && toggleBtn) {
toggleBtn.textContent = 'Scanner stoppen';
}
setScanStatus('Scanner aktiv. Jetzt Code scannen.', 'warn');
});
Quagga.start();
scannerRunning = true;
setScanStatus('Scanner bereit.', 'ok');
if (toggleBtn) {
toggleBtn.textContent = 'Scanner stoppen';
}
});
}, 50);
}
function stopScanner() {
async function stopScanner() {
if (!scannerRunning) return;
const readerWrap = document.getElementById('scanReaderWrap');
const toggleBtn = document.getElementById('toggleScannerBtn');
try {
Quagga.stop();
} catch (e) {
console.warn("Error stopping Quagga (it may not have been running):", e);
}
Quagga.stop();
scannerRunning = false;
activeScannerCallback = null;
if (readerWrap) readerWrap.style.display = 'none';
if (toggleBtn) toggleBtn.textContent = 'Scanner starten';
setScanStatus('Scanner gestoppt.', 'warn');
// Hide the container to free up UI space
const scannerWrap = document.querySelector('.library-scan-reader-wrap');
if (scannerWrap) {
scannerWrap.style.display = 'none';
}
const toggleBtn = document.getElementById('toggleScannerBtn');
if (toggleBtn) {
toggleBtn.textContent = 'Kamera Scanner'; // Reset button text
}
}
async function isStudentCardBarcode(code) {
@@ -1288,51 +1331,29 @@
detailContent.innerHTML = '<p>Lade Details...</p>';
detailModal.style.display = 'flex';
// Sicherer Zugriff auf das Item mit Fallback
const item = libraryItems.find(i => i._id === itemId);
let mediaHtml = '';
// Robuste Prüfung: Wir testen gängige Benennungen aus deinem Backend
const imageArray = item.Images || item.Bilder || item.images;
if (item) {
// Prüfe gängige Array-Namen aus dem Backend
const imageArray = item.Images || item.Bilder || item.images;
if (item && Array.isArray(imageArray) && imageArray.length > 0) {
const imagesHtml = imageArray.map((image, index) => {
if (Array.isArray(imageArray) && imageArray.length > 0) {
const imagesHtml = imageArray.map(image => {
// Direkter, robuster Pfad zur Upload-Route
const imageSrc = image.startsWith('/uploads/') || image.startsWith('http')
? image
: `/uploads/${image}`;
// Dein neuer Code für die exakte Routen-Generierung
const imageSrc = image.startsWith('/uploads/') || image.startsWith('http') ?
image :
`{{ url_for('uploaded_file', filename='') }}${image}`;
return `<img src="${imageSrc}" 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('');
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>`;
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>`;
}
}
// Zusätzliche Details vom Backend laden
fetch(`/api/item_detail/${itemId}`)
.then(response => {
if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`);
@@ -1347,7 +1368,7 @@
});
}
// Closes the modal via the 'x' button
// Schließt das Modal über den 'x'-Button
function closeDetailModal() {
document.getElementById('detailModal').style.display = 'none';
}
+18 -2
View File
@@ -232,6 +232,16 @@
<h1>📚 Bibliotheksausweise (Bibliothek)</h1>
</div>
<div class="export-buttons">
<form method="GET" action="{{ url_for('student_card_class_barcode_download') }}" style="display: inline-flex; gap: 5px; align-items: center; background: white; padding: 2px; border-radius: 4px; border: 1px solid #ddd;">
<select name="class_name" required style="border: none; padding: 8px; outline: none; font-size: 14px; background: transparent; cursor: pointer;">
<option value="" disabled selected>-- Klasse wählen --</option>
{% for cls in available_classes %}
<option value="{{ cls }}">{{ cls }}</option>
{% endfor %}
</select>
<button type="submit" class="btn-print" style="background: #17a2b8; padding: 8px 12px; margin: 0;">📤 PDF</button>
</form>
<a href="{{ url_for('student_card_barcode_download') }}" class="btn-print" style="background: #28a745;">📥 Alle Ausweise (PDF)</a>
<a href="{{ url_for('library_admin') }}" class="btn btn-primary">← Zur Bibliotheks-Upload</a>
</div>
@@ -283,9 +293,15 @@
</div>
<div class="form-group">
<label for="class_name">Klasse</label>
<input type="text" id="class_name" name="class_name"
<input type="text" id="class_name" name="class_name" list="class_list"
value="{{ form_data.get('class_name', '') }}"
placeholder="z.B. 10A">
placeholder="z.B. 10A (Tippen oder Auswählen)">
<datalist id="class_list">
{% for cls in available_classes %}
<option value="{{ cls }}">
{% endfor %}
</datalist>
</div>
</div>
+71 -98
View File
@@ -836,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>
@@ -876,12 +876,14 @@
</div>
<!-- Image upload (hidden for library mode) -->
<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>
<!-- Add image preview area -->
<label>Buchcover (automatisch):</label>
<div id="book-cover-preview-container"></div>
</div>
<div class="form-group">
<label for="images"> Bilder hinzufügen:</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>
<div class="image-preview-container" id="image-preview-container"></div>
</div>
@@ -1669,23 +1671,24 @@
}, 3000);
}
// Function to download book cover image
function downloadBookCover(imageUrl) {
if (!imageUrl) {
console.log('No image URL provided');
return;
}
// Show loading indicator for image download
const imagePreviewContainer = document.getElementById('image-preview-container');
if (imagePreviewContainer) {
const loadingDiv = document.createElement('div');
loadingDiv.className = 'image-loading';
loadingDiv.innerHTML = '<div class="loading-spinner">Buchcover wird heruntergeladen...</div>';
imagePreviewContainer.appendChild(loadingDiv);
const coverPreviewContainer = document.getElementById('book-cover-preview-container');
if (!coverPreviewContainer) {
console.error('Error: "book-cover-preview-container" not found in the DOM.');
return;
}
// Download the image via backend
const loadingDiv = document.createElement('div');
loadingDiv.className = 'image-loading';
loadingDiv.innerHTML = '<div class="loading-spinner">Buchcover wird heruntergeladen...</div>';
coverPreviewContainer.appendChild(loadingDiv);
fetch('/download_book_cover', {
method: 'POST',
headers: {
@@ -1693,78 +1696,63 @@
},
body: JSON.stringify({ url: imageUrl })
})
.then(response => response.json())
.then(data => {
// Remove loading indicator
const loadingDiv = imagePreviewContainer?.querySelector('.image-loading');
if (loadingDiv) {
loadingDiv.remove();
}
if (data.success) {
// Create a preview of the downloaded image
const imagePreview = document.createElement('div');
imagePreview.className = 'book-cover-preview';
imagePreview.innerHTML = `
<div class="preview-item">
<img src="{{ url_for('uploaded_file', filename='') }}${data.filename}"
alt="Buchcover" class="book-cover-thumbnail">
<p class="book-cover-caption">Buchcover automatisch heruntergeladen</p>
<input type="hidden" name="book_cover_image" value="${data.filename}">
<button type="button" onclick="removeBookCover(this)"
class="remove-book-cover-button">
Entfernen
</button>
</div>
`;
if (imagePreviewContainer) {
imagePreviewContainer.appendChild(imagePreview);
.then(response => response.json())
.then(data => {
const currentLoadingDiv = coverPreviewContainer.querySelector('.image-loading');
if (currentLoadingDiv) {
currentLoadingDiv.remove();
}
console.log('Book cover downloaded successfully:', data.filename);
} else {
console.error('Failed to download book cover:', data.error);
// Show error message to user
if (imagePreviewContainer) {
const errorDiv = document.createElement('div');
errorDiv.className = 'error-message';
errorDiv.textContent = 'Fehler beim Herunterladen des Buchcovers: ' + data.error;
errorDiv.style.fontSize = '0.8em';
errorDiv.style.padding = '5px';
errorDiv.style.marginTop = '5px';
imagePreviewContainer.appendChild(errorDiv);
if (data.success) {
coverPreviewContainer.innerHTML = '';
// Remove error message after 5 seconds
setTimeout(() => errorDiv.remove(), 5000);
const imagePreview = document.createElement('div');
imagePreview.className = 'book-cover-preview';
imagePreview.innerHTML = `
<div class="preview-item">
<img src="/uploads/${data.filename}"
alt="Buchcover" class="book-cover-thumbnail" style="max-width: 150px; border-radius: 4px;">
<p class="book-cover-caption" style="font-size: 0.9em; color: #555;">Buchcover automatisch heruntergeladen</p>
<input type="hidden" name="book_cover_image" value="${data.filename}">
<button type="button" onclick="removeBookCover(this)"
class="remove-book-cover-button btn btn-sm btn-danger">
Entfernen
</button>
</div>
`;
coverPreviewContainer.appendChild(imagePreview);
console.log('Book cover downloaded successfully:', data.filename);
} else {
console.error('Failed to download book cover:', data.error);
showCoverError(coverPreviewContainer, 'Fehler beim Herunterladen des Buchcovers: ' + data.error);
}
}
})
.catch(error => {
console.error('Error downloading book cover:', error);
// Remove loading indicator
const loadingDiv = imagePreviewContainer?.querySelector('.image-loading');
if (loadingDiv) {
loadingDiv.remove();
}
})
.catch(error => {
console.error('Error downloading book cover:', error);
// Show error message
if (imagePreviewContainer) {
const errorDiv = document.createElement('div');
errorDiv.className = 'error-message';
errorDiv.textContent = 'Netzwerkfehler beim Herunterladen des Buchcovers';
errorDiv.style.fontSize = '0.8em';
errorDiv.style.padding = '5px';
errorDiv.style.marginTop = '5px';
imagePreviewContainer.appendChild(errorDiv);
const currentLoadingDiv = coverPreviewContainer.querySelector('.image-loading');
if (currentLoadingDiv) {
currentLoadingDiv.remove();
}
// Remove error message after 5 seconds
setTimeout(() => errorDiv.remove(), 5000);
}
});
showCoverError(coverPreviewContainer, 'Netzwerkfehler beim Herunterladen des Buchcovers');
});
}
function showCoverError(container, message) {
const errorDiv = document.createElement('div');
errorDiv.className = 'error-message';
errorDiv.textContent = message;
errorDiv.style.fontSize = '0.8em';
errorDiv.style.color = 'red';
errorDiv.style.padding = '5px';
errorDiv.style.marginTop = '5px';
container.appendChild(errorDiv);
setTimeout(() => errorDiv.remove(), 5000);
}
// Function to remove downloaded book cover
function removeBookCover(button) {
const previewItem = button.closest('.preview-item');
if (previewItem) {
@@ -1772,7 +1760,6 @@
}
}
// Code validation functions
function checkCodeUnique(code, excludeId, callback) {
if (!code || code.trim() === '') {
callback(true);
@@ -1864,21 +1851,18 @@
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/')) {
@@ -1893,17 +1877,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);
}
}
});