Invario/Inventarsystem
3
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 24 Wiki Activity

Implementation of a multiple Clients per slot logic

Browse Source
This commit is contained in:
Aiirondev
2026-06-26 18:59:09 +02:00
parent 6583f7a368
commit 07b1cc5e79
5 changed files with 180 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Web/modules/terminplaner/backend_server.py
+44 -14
View File
@@ -198,7 +198,7 @@ def build_client_slot_ics(appointment_id: str, slot_start: str, client_name: str
return '\r\n'.join(ics_lines)
def new(date_start: str, date_end: str, time_span: list, slots, slot_length, user: str, mail: list=None, note:str="", calendar_enabled: bool=False, title: str="", custom_fields: list = ()) -> dict:
def new(date_start: str, date_end: str, time_span: list, slots, slot_length, user: str, mail: list=None, note:str="", calendar_enabled: bool=False, title: str="", custom_fields: list = (), client_per_slot: int=1) -> dict:
"""
Generates a link for the executive to send to his clients to book a time Slot
"""
@@ -220,7 +220,7 @@ def new(date_start: str, date_end: str, time_span: list, slots, slot_length, use
normalized_time_span = _normalize_time_span(time_span)
normalized_mail = _normalize_mail_list(mail or [])
id = termin.add(date_start, date_end, normalized_time_span, slots_int, slot_length_int, user, normalized_mail, note, calendar_enabled=calendar_enabled, title=title, custom_fields=custom_fields)
id = termin.add(date_start, date_end, normalized_time_span, slots_int, slot_length_int, user, normalized_mail, note, calendar_enabled=calendar_enabled, title=title, custom_fields=custom_fields, clients_p_slot=client_per_slot)
id_str = str(id)
tenant_id = _current_tenant_id()
@@ -259,7 +259,7 @@ def new(date_start: str, date_end: str, time_span: list, slots, slot_length, use
}
def book_slot(id, date_start_time, name, custom:list=()):
def book_slot(id, date_start_time, name, custom: tuple = ()):
try:
item = termin.get_item(id)
if not item:
@@ -269,18 +269,32 @@ def book_slot(id, date_start_time, name, custom:list=()):
if not isinstance(slots, list):
slots = []
# 1. Check overall total booking capacity
capacity = int(item.get('slots', 0) or 0)
if capacity and len(slots) >= capacity:
return False
# 2. Prevent the exact same user from double-booking the exact same slot
for existing in slots:
if isinstance(existing, (list, tuple)) and len(existing) >= 2:
if existing[0] == date_start_time and existing[1] == name:
return False
# 3. Check concurrent capacity for this specific time slot
clients_per_slot = int(item.get('clients_per_slot', 1) or 1)
bookings_at_time = sum(
1 for existing in slots
if isinstance(existing, (list, tuple)) and len(existing) > 0 and existing[0] == date_start_time
)
if bookings_at_time >= clients_per_slot:
return False
# Append the new booking successfully
slots.append((date_start_time, name, custom))
success = termin.update(id, slots)
return bool(success)
except Exception as e:
print(f"Error booking slot: {e}")
return False
@@ -331,32 +345,46 @@ def get_available(id):
date_end = termin_range.get('date_end')
time_span = termin_range.get('time_span', [])
# Safe integer parsing without heavy try-except blocks
try:
total_slots = int(termin_range.get('slots', 0) or 0)
except Exception:
except (ValueError, TypeError):
total_slots = 0
# Support both spellings gracefully
raw_length = termin_range.get('slot_length') or termin_range.get('slot_lenght') or 0
try:
slot_length = int(termin_range.get('slot_length') or termin_range.get('slot_lenght') or 0)
except Exception:
slot_length = termin_range.get('slot_length') or termin_range.get('slot_lenght')
slot_length = int(raw_length)
except (ValueError, TypeError):
slot_length = raw_length
clients_per_slot = int(termin_range.get('clients_per_slot', 1) or 1)
booked = termin_range.get('slots_booked', []) or []
# Normalize the bookings list safely
normalized = []
bookings_by_time = {} # Tracks how many people are in each specific time slot
for s in booked:
if isinstance(s, (list, tuple)) and len(s) >= 2:
normalized.append({'start': s[0], 'name': s[1]})
slot_time = s[0]
item = {'start': slot_time, 'name': s[1]}
elif isinstance(s, dict):
normalized.append(s)
slot_time = s.get('start')
item = s
else:
normalized.append({'value': s})
slot_time = str(s)
item = {'value': s}
normalized.append(item)
# Count concurrent bookings per timestamp
if slot_time:
bookings_by_time[slot_time] = bookings_by_time.get(slot_time, 0) + 1
# Calculate remaining total capacity safely
slots_used = len(normalized)
try:
slots_left = max(0, int(total_slots) - slots_used)
except Exception:
slots_left = max(0, slots_used - slots_used)
slots_left = max(0, total_slots - slots_used)
return {
'date_start': date_start,
@@ -365,8 +393,10 @@ def get_available(id):
'slot_length': slot_length,
'slot_lenght': slot_length,
'slots_total': total_slots,
'clients_per_slot': clients_per_slot,
'slots_booked': normalized,
'slots_left': slots_left,
'bookings_by_time': bookings_by_time
}
except Exception as e:
print(f"Error getting available slots: {e}")
Web/modules/terminplaner/blueprint.py
+53 -23
View File
@@ -114,9 +114,9 @@ def client(appointment_id):
appointment_item = termin.get_item(appointment_id) or {}
appointment_owner = str(appointment_item.get('user', '') or '').strip()
# Extract the custom fields defined by the appointment owner
custom_fields = appointment_item.get('custom_fields', [])
# Permissions check
can_view_booking_names = False
if current_user:
try:
@@ -124,6 +124,7 @@ def client(appointment_id):
except Exception:
can_view_booking_names = bool(current_user == appointment_owner)
# Sanitize data for public/client view
available_for_view = dict(available)
if not can_view_booking_names:
sanitized_bookings = []
@@ -139,21 +140,19 @@ def client(appointment_id):
if request.method == 'POST':
action = request.form.get('action', 'book')
# Fall 1: ADMIN/AUTOR storniert einen Termin
# Case 1: Admin/Owner cancels a booking
if action == 'delete' and can_view_booking_names:
slot_time = request.form.get('slot_time')
client_name = request.form.get('target_client_name')
# Aktuelle Buchungen direkt aus dem DB-Item holen
current_slots = appointment_item.get('slots_booked', []) or []
# Filtere den zu löschenden Slot heraus (Prüfung auf Zeit und Name)
# Keep everything EXCEPT the item targeted for deletion
updated_slots = [
slot for slot in current_slots
if not (isinstance(slot, (list, tuple)) and slot[0] == slot_time and slot[1] == client_name)
]
# In DB schreiben via deiner existierenden termin.update() Funktion
if termin.update(appointment_id, updated_slots):
flash('Buchung wurde erfolgreich gelöscht.', 'success')
else:
@@ -161,11 +160,11 @@ def client(appointment_id):
return redirect(url_for('terminplaner.client', appointment_id=appointment_id, tenant=_current_tenant_id() or None))
# Fall 2: NORMALER CLIENT bucht einen Termin
# Case 2: Client books a slot
elif action == 'book':
start_daytime = request.form.get('start_day_time')
username = request.form.get('client_name')
custom_answers = request.form.getlist('custom_answers')
custom_answers = tuple(request.form.getlist('custom_answers')) # Cast to tuple for DB safety
if not start_daytime or not username:
flash('Bitte Name und gewünschte Uhrzeit angeben.', 'error')
@@ -190,7 +189,7 @@ def client(appointment_id):
)
)
flash('Der Termin konnte nicht gespeichert werden.', 'error')
flash('Der Termin konnte nicht gespeichert werden. Eventuell ist der Slot bereits voll.', 'error')
return render_template(
'termin_client.html',
@@ -252,7 +251,7 @@ def delete_appointment(appointment_id):
@appoint_bp.route('/configure', methods=['GET', 'POST'])
def configure():
"""
Route for authenticated persons to configure a new appointment for them
Route for authenticated persons to configure a new appointment schedule
"""
guard = _require_module_enabled()
if guard:
@@ -273,6 +272,11 @@ def configure():
add_to_calendar = request.form.get('add_to_calendar') == 'on'
title = request.form.get('title', '').strip()
custom = request.form.getlist('custom_fields')
try:
clients_p_slot = int(request.form.get('clients_per_slot', 1))
except (ValueError, TypeError):
clients_p_slot = 1
if not start or not end or not time or not slots_amount or not slot_length or not title:
flash('Bitte alle Pflichtfelder ausfüllen.', 'error')
@@ -283,28 +287,54 @@ def configure():
email_service_enabled=cfg.EMAIL_ENABLED,
)
# Variablen im Funktionsaufruf aktualisiert
result = appointment_service.new(start, end, time, slots_amount, slot_length, session["username"], mail, note, calendar_enabled=add_to_calendar, title=title, custom_fields=custom)
# Call the database service function (standardized to match your underlying code)
inserted_id = appointment_service.add(
date_start=start,
date_end=end,
time_span=time,
slots=slots_amount,
slot_lenght=slot_length,
user=session["username"],
mail=mail,
note=note,
calendar_enabled=add_to_calendar,
title=title,
custom_fields=custom,
clients_p_slot=clients_p_slot
)
if not inserted_id:
flash('Fehler beim Erstellen des Terminplans.', 'error')
return redirect(url_for('terminplaner.configure'))
# Resolve the URL string here using Flask's native url_for instead of relying on the database layer
generated_link = url_for(
'terminplaner.client',
appointment_id=str(inserted_id),
tenant=_current_tenant_id() or None,
_external=True
)
flash('Der Terminplan wurde angelegt.', 'success')
return render_template(
'termin_configure.html',
school_periods=cfg.SCHOOL_PERIODS,
generated_link=result['link'],
calendar_link=result.get('calendar_link'),
generated_link=generated_link,
calendar_link=None, # Update with calendar service link generation if needed
add_to_calendar=add_to_calendar,
email_service_enabled=cfg.EMAIL_ENABLED,
title=title,
)
elif request.method == "GET":
return render_template(
'termin_configure.html',
school_periods=cfg.SCHOOL_PERIODS,
generated_link=None,
calendar_link=None,
add_to_calendar=False,
email_service_enabled=cfg.EMAIL_ENABLED,
title=None,
)
return render_template(
'termin_configure.html',
school_periods=cfg.SCHOOL_PERIODS,
generated_link=None,
calendar_link=None,
add_to_calendar=False,
email_service_enabled=cfg.EMAIL_ENABLED,
title=None,
)
@appoint_bp.route('/calendar/<appointment_id>.ics', methods=['GET'])