|
|
|
@@ -68,13 +68,11 @@ import logging
|
|
|
|
|
from logging.handlers import RotatingFileHandler
|
|
|
|
|
import secrets
|
|
|
|
|
import importlib
|
|
|
|
|
import atexit
|
|
|
|
|
try:
|
|
|
|
|
redis = importlib.import_module('redis')
|
|
|
|
|
except Exception:
|
|
|
|
|
redis = None
|
|
|
|
|
# QR Code functionality deactivated
|
|
|
|
|
# import qrcode
|
|
|
|
|
# from qrcode.constants import ERROR_CORRECT_L
|
|
|
|
|
import threading
|
|
|
|
|
import shutil
|
|
|
|
|
import uuid
|
|
|
|
@@ -126,10 +124,6 @@ app.register_blueprint(terminplaner_bp, url_prefix='/terminplaner')
|
|
|
|
|
|
|
|
|
|
if not os.path.exists(app.config['UPLOAD_FOLDER']):
|
|
|
|
|
os.makedirs(app.config['UPLOAD_FOLDER'], exist_ok=True)
|
|
|
|
|
# QR Code directory creation deactivated
|
|
|
|
|
# if not os.path.exists(app.config['QR_CODE_FOLDER']):
|
|
|
|
|
# os.makedirs(app.config['QR_CODE_FOLDER'])
|
|
|
|
|
|
|
|
|
|
BACKUP_FOLDER = cfg.BACKUP_FOLDER
|
|
|
|
|
if not os.path.exists(BACKUP_FOLDER):
|
|
|
|
|
try:
|
|
|
|
@@ -159,7 +153,7 @@ def print(*args, **kwargs):
|
|
|
|
|
app.logger.info(message)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
STUDENT_CARD_ENCRYPTED_FIELDS = ('SchülerName', 'Klasse', 'Notizen')
|
|
|
|
|
STUDENT_CARD_ENCRYPTED_FIELDS = ('ausweis_ident', 'SchülerName', 'Klasse', 'Notizen')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _decrypt_student_card_doc(card_doc):
|
|
|
|
@@ -1460,7 +1454,7 @@ def update_appointment_statuses():
|
|
|
|
|
- Geplante Termine, die aktiviert werden sollten
|
|
|
|
|
- Aktive Termine, die beendet werden sollten
|
|
|
|
|
"""
|
|
|
|
|
current_time = datetime.datetime.now()
|
|
|
|
|
current_time = datetime.datetime.now(datetime.timezone.utc)
|
|
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
# Hole alle Termine mit Status 'planned' oder 'active'
|
|
|
|
@@ -1486,7 +1480,7 @@ def update_appointment_statuses():
|
|
|
|
|
new_status = au.get_current_status(appointment, log_changes=True, user='scheduler')
|
|
|
|
|
|
|
|
|
|
# Wenn sich der Status geändert hat, aktualisiere in der Datenbank
|
|
|
|
|
if new_status != old_status:
|
|
|
|
|
if new_status != old_status and not it.is_library_item(appointment.get('Item')):
|
|
|
|
|
extra_fields = {}
|
|
|
|
|
|
|
|
|
|
# --- Conflict resolver: planned → active transition ---
|
|
|
|
@@ -1592,6 +1586,9 @@ def update_appointment_statuses():
|
|
|
|
|
app.logger.warning(
|
|
|
|
|
f"Failed to create activation notification for {appointment.get('_id')}: {notif_err}"
|
|
|
|
|
)
|
|
|
|
|
elif it.is_library_item(appointment.get('Item')):
|
|
|
|
|
# Introduction of an messaging system and a Mahnstufen implementation for the library Book bookings after the designatet time.
|
|
|
|
|
pass
|
|
|
|
|
|
|
|
|
|
client.close()
|
|
|
|
|
|
|
|
|
@@ -1603,78 +1600,116 @@ def update_appointment_statuses():
|
|
|
|
|
except Exception as e:
|
|
|
|
|
app.logger.error(f"Automatic appointment status update failed: {e}")
|
|
|
|
|
|
|
|
|
|
# Schedule jobs - only start scheduler if this is the main process or a single-worker deployment
|
|
|
|
|
# This prevents race conditions in multi-worker Gunicorn environments
|
|
|
|
|
|
|
|
|
|
# Initialize scheduler instances
|
|
|
|
|
scheduler = BackgroundScheduler()
|
|
|
|
|
_scheduler_initialized = False
|
|
|
|
|
_scheduler_worker_id = None # Tracks the unique ID of the worker holding the lock
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _initialize_scheduler():
|
|
|
|
|
"""Initialize the background scheduler in a safe way for multi-worker deployments."""
|
|
|
|
|
global _scheduler_initialized
|
|
|
|
|
if _scheduler_initialized or not cfg.SCHEDULER_ENABLED:
|
|
|
|
|
"""Initialize the background scheduler safely using an atomic MongoDB lock."""
|
|
|
|
|
global _scheduler_initialized, _scheduler_worker_id
|
|
|
|
|
if _scheduler_initialized or not getattr(cfg, 'SCHEDULER_ENABLED', False):
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
# For multi-worker Gunicorn, use a lock file to ensure only one instance starts the scheduler
|
|
|
|
|
# Clean up any stale lock file from previous runs (older than 5 minutes)
|
|
|
|
|
scheduler_lock_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), '.scheduler_lock')
|
|
|
|
|
try:
|
|
|
|
|
if os.path.exists(scheduler_lock_path):
|
|
|
|
|
lock_age = time.time() - os.path.getmtime(scheduler_lock_path)
|
|
|
|
|
if lock_age > 300: # 5 minutes - indicates a stale lock from a previous container run
|
|
|
|
|
os.remove(scheduler_lock_path)
|
|
|
|
|
app.logger.info(f"Removed stale scheduler lock file (age: {lock_age:.0f}s)")
|
|
|
|
|
except Exception as e:
|
|
|
|
|
app.logger.warning(f"Could not clean up scheduler lock file: {e}")
|
|
|
|
|
client = MongoClient(MONGODB_HOST, MONGODB_PORT)
|
|
|
|
|
db = client[MONGODB_DB]
|
|
|
|
|
locks_col = db['system_locks']
|
|
|
|
|
|
|
|
|
|
# Always try to remove lock file on startup (extra safety)
|
|
|
|
|
try:
|
|
|
|
|
if os.path.exists(scheduler_lock_path):
|
|
|
|
|
os.remove(scheduler_lock_path)
|
|
|
|
|
app.logger.info("Scheduler lock file removed on startup.")
|
|
|
|
|
except Exception as e:
|
|
|
|
|
app.logger.warning(f"Could not remove scheduler lock file on startup: {e}")
|
|
|
|
|
# 1. Generate a unique ID for this specific worker process
|
|
|
|
|
_scheduler_worker_id = str(uuid.uuid4())
|
|
|
|
|
now = datetime.datetime.now(datetime.timezone.utc)
|
|
|
|
|
|
|
|
|
|
# 2. Ensure the lock document exists (initialize if missing)
|
|
|
|
|
try:
|
|
|
|
|
# Try to create the lock file - only succeeds if it doesn't exist
|
|
|
|
|
lock_fd = os.open(scheduler_lock_path, os.O_CREAT | os.O_EXCL | os.O_WRONLY, 0o644)
|
|
|
|
|
os.close(lock_fd)
|
|
|
|
|
should_start = True
|
|
|
|
|
except FileExistsError:
|
|
|
|
|
should_start = False
|
|
|
|
|
app.logger.warning("Scheduler lock exists - another process is already running the scheduler")
|
|
|
|
|
locks_col.insert_one({
|
|
|
|
|
'_id': 'scheduler_lock',
|
|
|
|
|
'locked_at': datetime.datetime.min.replace(tzinfo=datetime.timezone.utc),
|
|
|
|
|
'worker_id': None
|
|
|
|
|
})
|
|
|
|
|
except DuplicateKeyError:
|
|
|
|
|
pass # Document already exists, which is expected
|
|
|
|
|
|
|
|
|
|
if should_start:
|
|
|
|
|
# 3. Try to acquire the lock atomically
|
|
|
|
|
# We only acquire if the current lock is older than 5 minutes (stale/crashed worker)
|
|
|
|
|
# or if it was explicitly released (1970 init date)
|
|
|
|
|
lock_timeout = now - datetime.timedelta(minutes=5)
|
|
|
|
|
|
|
|
|
|
acquired = locks_col.find_one_and_update(
|
|
|
|
|
{
|
|
|
|
|
'_id': 'scheduler_lock',
|
|
|
|
|
'locked_at': {'$lt': lock_timeout}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
'$set': {
|
|
|
|
|
'locked_at': now,
|
|
|
|
|
'worker_id': _scheduler_worker_id
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
if acquired is not None:
|
|
|
|
|
# 4. Lock acquired successfully - this is the master worker
|
|
|
|
|
scheduler.add_job(func=create_daily_backup, trigger="interval", hours=cfg.BACKUP_INTERVAL_HOURS)
|
|
|
|
|
scheduler.add_job(func=update_appointment_statuses, trigger="interval", minutes=cfg.SCHEDULER_INTERVAL_MIN)
|
|
|
|
|
scheduler.add_job(func=create_return_reminders, trigger="interval", minutes=cfg.SCHEDULER_INTERVAL_MIN)
|
|
|
|
|
scheduler.add_job(func=cleanup_expired_trial_tenants, trigger="interval", hours=1)
|
|
|
|
|
|
|
|
|
|
# 5. Add a heartbeat job to keep the lock alive
|
|
|
|
|
def renew_lock_heartbeat():
|
|
|
|
|
try:
|
|
|
|
|
hb_client = MongoClient(MONGODB_HOST, MONGODB_PORT)
|
|
|
|
|
hb_db = hb_client[MONGODB_DB]
|
|
|
|
|
hb_db['system_locks'].update_one(
|
|
|
|
|
{'_id': 'scheduler_lock', 'worker_id': _scheduler_worker_id},
|
|
|
|
|
{'$set': {'locked_at': datetime.datetime.now(datetime.timezone.utc)}}
|
|
|
|
|
)
|
|
|
|
|
hb_client.close()
|
|
|
|
|
except Exception as e:
|
|
|
|
|
app.logger.error(f"Scheduler heartbeat failed: {e}")
|
|
|
|
|
|
|
|
|
|
# Run heartbeat every 2 minutes (safely below the 5-minute timeout)
|
|
|
|
|
scheduler.add_job(func=renew_lock_heartbeat, trigger="interval", minutes=2)
|
|
|
|
|
|
|
|
|
|
scheduler.start()
|
|
|
|
|
_scheduler_initialized = True
|
|
|
|
|
app.logger.info(f"Scheduler started successfully (interval={cfg.SCHEDULER_INTERVAL_MIN} min)")
|
|
|
|
|
app.logger.info(f"Scheduler started successfully (Worker ID: {_scheduler_worker_id})")
|
|
|
|
|
else:
|
|
|
|
|
app.logger.info("Scheduler skipped - another worker instance is running it")
|
|
|
|
|
app.logger.info("Scheduler skipped - another active worker holds the MongoDB lock")
|
|
|
|
|
|
|
|
|
|
client.close()
|
|
|
|
|
|
|
|
|
|
except Exception as e:
|
|
|
|
|
app.logger.error(f"Failed to initialize scheduler: {e}")
|
|
|
|
|
app.logger.error(f"Failed to initialize scheduler with MongoDB lock: {e}")
|
|
|
|
|
_scheduler_initialized = False
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Initialize scheduler on app startup
|
|
|
|
|
_initialize_scheduler()
|
|
|
|
|
|
|
|
|
|
# Register shutdown handler to stop scheduler when app is terminated
|
|
|
|
|
import atexit
|
|
|
|
|
|
|
|
|
|
def _shutdown_scheduler():
|
|
|
|
|
if cfg.SCHEDULER_ENABLED and _scheduler_initialized:
|
|
|
|
|
"""Gracefully shut down the scheduler and release the MongoDB lock."""
|
|
|
|
|
global _scheduler_initialized, _scheduler_worker_id
|
|
|
|
|
if getattr(cfg, 'SCHEDULER_ENABLED', False) and _scheduler_initialized:
|
|
|
|
|
try:
|
|
|
|
|
scheduler.shutdown()
|
|
|
|
|
lock_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), '.scheduler_lock')
|
|
|
|
|
try:
|
|
|
|
|
os.remove(lock_path)
|
|
|
|
|
except Exception:
|
|
|
|
|
pass
|
|
|
|
|
scheduler.shutdown(wait=False)
|
|
|
|
|
|
|
|
|
|
# Release the lock so a newly spawned worker can immediately take over
|
|
|
|
|
client = MongoClient(MONGODB_HOST, MONGODB_PORT)
|
|
|
|
|
db = client[MONGODB_DB]
|
|
|
|
|
db['system_locks'].update_one(
|
|
|
|
|
{'_id': 'scheduler_lock', 'worker_id': _scheduler_worker_id},
|
|
|
|
|
{'$set': {'locked_at': datetime.datetime.min.replace(tzinfo=datetime.timezone.utc)}}
|
|
|
|
|
)
|
|
|
|
|
client.close()
|
|
|
|
|
app.logger.info(f"Scheduler shut down and lock released (Worker ID: {_scheduler_worker_id})")
|
|
|
|
|
except Exception as e:
|
|
|
|
|
app.logger.error(f"Error during scheduler shutdown: {e}")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
atexit.register(_shutdown_scheduler)
|
|
|
|
|
|
|
|
|
|
"""-------------------------------------------------------------File Upload Validation----------------------------------------------------------------------------- """
|
|
|
|
@@ -2156,12 +2191,12 @@ def _upload_student_cards_excel():
|
|
|
|
|
|
|
|
|
|
synonyms = {
|
|
|
|
|
'ausweis_id': ['ausweis_id', 'ausweisid', 'ausweis-id', 'karte', 'kartennummer', 'card_id', 'id'],
|
|
|
|
|
'first_name': ['vorname', 'first_name', 'firstname', 'rufname'],
|
|
|
|
|
'last_name': ['nachname', 'last_name', 'lastname'],
|
|
|
|
|
'class_name': ['klasse', 'class', 'class_name', 'jahrgang', 'jahrgangsstufe', 'stufe', 'gruppe', 'asv_klasse'],
|
|
|
|
|
'notes': ['notizen', 'notes', 'bemerkungen', 'bemerkung', 'hinweis', 'hinweise'],
|
|
|
|
|
'default_borrow_days': ['standard_ausleihdauer', 'ausleihdauer', 'borrow_days', 'tage', 'leihtage',
|
|
|
|
|
'max_borrow_days'],
|
|
|
|
|
'ausweis_ident': ['lokales Differenzierungsmerkmal', 'lokales differenzierungsmerkmal', 'lokales_differenzierungsmerkmal', 'ausweis_ident', 'differenzierungsmerkmal'],
|
|
|
|
|
'first_name': ['vorname', 'first_name', 'firstname', 'rufname', 'Vorname'],
|
|
|
|
|
'last_name': ['nachname', 'last_name', 'lastname', 'Nachname'],
|
|
|
|
|
'class_name': ['klasse', 'class', 'class_name', 'jahrgang', 'jahrgangsstufe', 'stufe', 'gruppe', 'asv_klasse', 'Jahrgang', 'Klasse'],
|
|
|
|
|
'notes': ['notizen', 'notes', 'bemerkungen', 'bemerkung', 'hinweis', 'hinweise', 'Notizen', 'Bemerkung', 'Hinweis', 'Hinweise'],
|
|
|
|
|
'default_borrow_days': ['standard_ausleihdauer', 'ausleihdauer', 'borrow_days', 'tage', 'leihtage', 'max_borrow_days', 'Ausleihdauer'],
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
def col_index(key):
|
|
|
|
@@ -2173,6 +2208,7 @@ def _upload_student_cards_excel():
|
|
|
|
|
|
|
|
|
|
mapped_indices = {
|
|
|
|
|
'ausweis_id': col_index('ausweis_id'),
|
|
|
|
|
'ausweis_ident': col_index('ausweis_ident'),
|
|
|
|
|
'first_name': col_index('first_name'),
|
|
|
|
|
'last_name': col_index('last_name'),
|
|
|
|
|
'class_name': col_index('class_name'),
|
|
|
|
@@ -2181,7 +2217,7 @@ def _upload_student_cards_excel():
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
validation_only = (request.form.get('excel_action') or '').strip().lower() == 'validate'
|
|
|
|
|
max_rows = 15000
|
|
|
|
|
max_rows = 1500
|
|
|
|
|
|
|
|
|
|
planned_rows = []
|
|
|
|
|
validation_errors = []
|
|
|
|
@@ -2191,7 +2227,7 @@ def _upload_student_cards_excel():
|
|
|
|
|
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
|
|
|
|
try:
|
|
|
|
|
db = client[cfg.MONGODB_DB]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
student_cards_cursor = db['student_cards'].find({}, {'AusweisId': 1})
|
|
|
|
|
existing_ids.update(
|
|
|
|
|
str(card.get('AusweisId', '')).strip().upper()
|
|
|
|
@@ -2213,29 +2249,34 @@ def _upload_student_cards_excel():
|
|
|
|
|
return row_values[idx]
|
|
|
|
|
|
|
|
|
|
ausweis_id = sanitize_form_value(val('ausweis_id'))
|
|
|
|
|
ausweis_ident = sanitize_form_value(val('ausweis_ident'))
|
|
|
|
|
class_name = sanitize_form_value(val('class_name'))
|
|
|
|
|
notes = sanitize_form_value(val('notes'))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Ausleihdauer extrahieren und standardmäßig auf 14 setzen
|
|
|
|
|
default_borrow_days = _excel_int(val('default_borrow_days'))
|
|
|
|
|
if not default_borrow_days:
|
|
|
|
|
default_borrow_days = 14
|
|
|
|
|
|
|
|
|
|
# Vor- und Nachname sicher auslesen und zusammensetzen
|
|
|
|
|
first_name = sanitize_form_value(val('first_name')) or ""
|
|
|
|
|
last_name = sanitize_form_value(val('last_name')) or ""
|
|
|
|
|
student_name = f"{first_name} {last_name}".strip()
|
|
|
|
|
|
|
|
|
|
# Leere Zeilen überspringen
|
|
|
|
|
if not ausweis_id and not student_name and not class_name:
|
|
|
|
|
continue
|
|
|
|
|
|
|
|
|
|
row_errors = []
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if not student_name:
|
|
|
|
|
row_errors.append('Vorname und Nachname fehlen')
|
|
|
|
|
|
|
|
|
|
# Logik für die Haupt-AusweisID
|
|
|
|
|
if not ausweis_id and student_name:
|
|
|
|
|
ausweis_id = generate_ausweis_id_excel(existing_ids)
|
|
|
|
|
ausweis_id = generate_ausweis_id(existing_ids)
|
|
|
|
|
validation_warnings.append((row_number, f'Ausweis-ID wurde automatisch erzeugt: {ausweis_id}'))
|
|
|
|
|
existing_ids.add(ausweis_id.upper())
|
|
|
|
|
existing_ids.add(ausweis_id.upper())
|
|
|
|
|
elif ausweis_id:
|
|
|
|
|
ausweis_id = str(ausweis_id).strip().upper()
|
|
|
|
|
if ausweis_id in existing_ids:
|
|
|
|
@@ -2243,6 +2284,9 @@ def _upload_student_cards_excel():
|
|
|
|
|
else:
|
|
|
|
|
existing_ids.add(ausweis_id)
|
|
|
|
|
|
|
|
|
|
if not ausweis_ident:
|
|
|
|
|
ausweis_ident = ausweis_id
|
|
|
|
|
|
|
|
|
|
if row_errors:
|
|
|
|
|
validation_errors.append((row_number, '; '.join(row_errors)))
|
|
|
|
|
continue
|
|
|
|
@@ -2250,6 +2294,7 @@ def _upload_student_cards_excel():
|
|
|
|
|
planned_rows.append({
|
|
|
|
|
'row_number': row_number,
|
|
|
|
|
'ausweis_id': ausweis_id,
|
|
|
|
|
'ausweis_ident': ausweis_ident,
|
|
|
|
|
'student_name': student_name,
|
|
|
|
|
'class_name': class_name,
|
|
|
|
|
'notes': notes,
|
|
|
|
@@ -2280,6 +2325,7 @@ def _upload_student_cards_excel():
|
|
|
|
|
for row in planned_rows:
|
|
|
|
|
encrypted_payload = encrypt_document_fields(
|
|
|
|
|
{
|
|
|
|
|
'ausweis_ident': row['ausweis_ident'],
|
|
|
|
|
'SchülerName': row['student_name'],
|
|
|
|
|
'Klasse': row['class_name'],
|
|
|
|
|
'Notizen': row['notes'],
|
|
|
|
@@ -4051,6 +4097,7 @@ def student_cards_admin():
|
|
|
|
|
edit_mode = True
|
|
|
|
|
form_data = {
|
|
|
|
|
'card_id': str(card['_id']),
|
|
|
|
|
'ausweis_ident': card.get('ausweis_ident', ''),
|
|
|
|
|
'ausweis_id': card.get('AusweisId', ''),
|
|
|
|
|
'student_name': card.get('SchülerName', ''),
|
|
|
|
|
'default_borrow_days': card.get('StandardAusleihdauer', 14),
|
|
|
|
@@ -4065,6 +4112,7 @@ def student_cards_admin():
|
|
|
|
|
if request.method == 'POST':
|
|
|
|
|
action = request.form.get('action', 'add')
|
|
|
|
|
ausweis_id = request.form.get('ausweis_id', '').strip().upper()
|
|
|
|
|
ausweis_ident = request.form.get('ausweis_ident', '').strip()
|
|
|
|
|
student_name = request.form.get('student_name', '').strip()
|
|
|
|
|
student_name_alias = student_name
|
|
|
|
|
default_borrow_days = request.form.get('default_borrow_days', 14)
|
|
|
|
@@ -4090,9 +4138,12 @@ def student_cards_admin():
|
|
|
|
|
existing = student_cards.find_one({'AusweisId': ausweis_id, '_id': {'$ne': ObjectId(card_id)}})
|
|
|
|
|
if existing:
|
|
|
|
|
flash('Diese Ausweis-ID existiert bereits.', 'error')
|
|
|
|
|
if not ausweis_ident:
|
|
|
|
|
ausweis_ident = ausweis_id
|
|
|
|
|
else:
|
|
|
|
|
encrypted_payload = encrypt_document_fields(
|
|
|
|
|
{
|
|
|
|
|
'ausweis_ident': ausweis_ident,
|
|
|
|
|
'SchülerName': student_name_alias,
|
|
|
|
|
'Klasse': class_name,
|
|
|
|
|
'Notizen': notes,
|
|
|
|
@@ -4124,6 +4175,8 @@ def student_cards_admin():
|
|
|
|
|
else:
|
|
|
|
|
ausweis_id = generate_ausweis_id()
|
|
|
|
|
existing = False
|
|
|
|
|
if not ausweis_ident:
|
|
|
|
|
ausweis_ident = ausweis_id
|
|
|
|
|
|
|
|
|
|
if existing:
|
|
|
|
|
flash('Diese ID existiert bereits.', 'error')
|
|
|
|
@@ -4131,6 +4184,7 @@ def student_cards_admin():
|
|
|
|
|
try:
|
|
|
|
|
encrypted_payload = encrypt_document_fields(
|
|
|
|
|
{
|
|
|
|
|
'ausweis_ident': ausweis_ident,
|
|
|
|
|
'SchülerName': student_name_alias,
|
|
|
|
|
'Klasse': class_name,
|
|
|
|
|
'Notizen': notes,
|
|
|
|
@@ -7282,62 +7336,6 @@ def check_availability():
|
|
|
|
|
except Exception as e:
|
|
|
|
|
return jsonify({'ok': False}), 500
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# def create_qr_code(id):
|
|
|
|
|
# """
|
|
|
|
|
# Generate a QR code for an item.
|
|
|
|
|
# The QR code contains a URL that points to the item details.
|
|
|
|
|
#
|
|
|
|
|
# Args:
|
|
|
|
|
# id (str): ID of the item to generate QR code for
|
|
|
|
|
#
|
|
|
|
|
# Returns:
|
|
|
|
|
# str: Filename of the generated QR code, or None if item not found
|
|
|
|
|
# """
|
|
|
|
|
# qr = qrcode.QRCode(
|
|
|
|
|
# version=1,
|
|
|
|
|
# error_correction=ERROR_CORRECT_L, # Use imported constant
|
|
|
|
|
# box_size=10,
|
|
|
|
|
# border=4,
|
|
|
|
|
# )
|
|
|
|
|
#
|
|
|
|
|
# # Parse and reconstruct the URL properly
|
|
|
|
|
# parsed_url = urlparse(request.url_root)
|
|
|
|
|
#
|
|
|
|
|
# # Force HTTPS if needed
|
|
|
|
|
# scheme = 'https' if parsed_url.scheme == 'http' else parsed_url.scheme
|
|
|
|
|
#
|
|
|
|
|
# # Properly reconstruct the base URL
|
|
|
|
|
# base_url = urlunparse((scheme, parsed_url.netloc, '', '', '', ''))
|
|
|
|
|
#
|
|
|
|
|
# # URL that will open this item directly
|
|
|
|
|
# item_url = f"{base_url}:{Port}/item/{id}"
|
|
|
|
|
# qr.add_data(item_url)
|
|
|
|
|
# qr.make(fit=True)
|
|
|
|
|
#
|
|
|
|
|
# item = it.get_item(id)
|
|
|
|
|
# if not item:
|
|
|
|
|
# return None
|
|
|
|
|
#
|
|
|
|
|
# img = qr.make_image(fill_color="black", back_color="white")
|
|
|
|
|
#
|
|
|
|
|
# # Create a unique filename using UUID
|
|
|
|
|
# unique_id = str(uuid.uuid4())
|
|
|
|
|
# timestamp = time.strftime("%Y%m%d%H%M%S")
|
|
|
|
|
#
|
|
|
|
|
# # Still include the original name for readability but ensure uniqueness with UUID
|
|
|
|
|
# safe_name = secure_filename(item['Name'])
|
|
|
|
|
# filename = f"{safe_name}_{unique_id}_{timestamp}.png"
|
|
|
|
|
# qr_path = os.path.join(app.config['QR_CODE_FOLDER'], filename)
|
|
|
|
|
#
|
|
|
|
|
#
|
|
|
|
|
# # Fix the file handling - save to file object, not string
|
|
|
|
|
# with open(qr_path, 'wb') as f:
|
|
|
|
|
# img.save(f)
|
|
|
|
|
#
|
|
|
|
|
# return filename
|
|
|
|
|
|
|
|
|
|
# Fix fromisoformat None value checks
|
|
|
|
|
@app.route('/plan_booking', methods=['POST'])
|
|
|
|
|
def plan_booking():
|
|
|
|
|
"""
|
|
|
|
|
Aiirondev_dev