Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b8beec8209 | |||
| dd9390c649 | |||
| f31c4e2ff7 | |||
| 71e2895362 | |||
| d2c7e57f8d | |||
| 111d40b787 |
@@ -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 = (), client_per_slot: int=1) -> 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 = (), clients_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, clients_p_slot=client_per_slot)
|
||||
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=clients_per_slot)
|
||||
id_str = str(id)
|
||||
tenant_id = _current_tenant_id()
|
||||
|
||||
|
||||
@@ -293,34 +293,27 @@ def configure():
|
||||
date_end=end,
|
||||
time_span=time,
|
||||
slots=slots_amount,
|
||||
slot_lenght=slot_length,
|
||||
slot_length=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
|
||||
clients_per_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')
|
||||
#flash('Der Terminplan wurde angelegt.', 'success')
|
||||
flash(f'{inserted_id['link']}', 'warning')
|
||||
return render_template(
|
||||
'termin_configure.html',
|
||||
school_periods=cfg.SCHOOL_PERIODS,
|
||||
generated_link=generated_link,
|
||||
calendar_link=None, # Update with calendar service link generation if needed
|
||||
generated_link=inserted_id['link'],
|
||||
calendar_link=None,
|
||||
add_to_calendar=add_to_calendar,
|
||||
email_service_enabled=cfg.EMAIL_ENABLED,
|
||||
title=title,
|
||||
|
||||
@@ -452,7 +452,7 @@ document.addEventListener('DOMContentLoaded', function () {
|
||||
const slotStartSet = new Set(candidateSlots.map(function (slot) { return slot.start; }));
|
||||
const allDays = dateRangeInclusive(String(available.date_start || ''), String(available.date_end || ''));
|
||||
|
||||
let slotMinTime = '08:15:00';
|
||||
let slotMinTime = '08:00:00';
|
||||
let slotMaxTime = '20:00:00';
|
||||
|
||||
const visibleStart = allDays[0] || String(available.date_start || '');
|
||||
|
||||
@@ -82,7 +82,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div id="custom-fields-container" class="mt-4">
|
||||
<h3 class="mb-3">Custom Fields</h3>
|
||||
<h3 class="mb-3">Benutzerdefinierte Felder</h3>
|
||||
|
||||
<div class="mb-3 custom-field-row">
|
||||
<input type="text"
|
||||
@@ -202,7 +202,7 @@
|
||||
if (slotsAmountsInput) slotsAmountsInput.value = totalSlots;
|
||||
if (slotsAmountsDisplay) slotsAmountsDisplay.innerText = totalSlots + " Slots gesamt";
|
||||
}
|
||||
|
||||
|
||||
// Helper utility in case your timeToMinutes handler doesn't catch empty strings safely
|
||||
function safeTimeToMinutes(timeString) {
|
||||
if (!timeString || typeof timeString !== 'string' || !timeString.includes(':')) {
|
||||
@@ -214,45 +214,45 @@
|
||||
if (isNaN(hours) || isNaN(minutes)) return 0;
|
||||
return (hours * 60) + minutes;
|
||||
}
|
||||
|
||||
|
||||
// Berechnet die Slots basierend auf den konfigurierten Zeiten & Pausen
|
||||
function calculateSlots() {
|
||||
if (!slotLengthInput || !slotsAmountsInput || !clientsperslot) return;
|
||||
|
||||
|
||||
const slotLength = parseInt(slotLengthInput.value, 10);
|
||||
if (isNaN(slotLength) || slotLength <= 0) {
|
||||
updateSlotsDisplay(0);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// FIX 1: Make sure we parse the input VALUE, defaulting to 1 if empty or invalid
|
||||
const multiplier = parseInt(clientsperslot.value, 10) || 1;
|
||||
|
||||
|
||||
let totalSlots = 0;
|
||||
const rows = Array.from(daysContainer.querySelectorAll('[data-day-row]'));
|
||||
|
||||
|
||||
rows.forEach(row => {
|
||||
const startTime = row.querySelector('[data-time-start]')?.value;
|
||||
const endTime = row.querySelector('[data-time-end]')?.value;
|
||||
const pauseStart = row.querySelector('[data-time-pause-start]')?.value;
|
||||
const pauseEnd = row.querySelector('[data-time-pause-end]')?.value;
|
||||
|
||||
|
||||
if (!startTime || !endTime) return;
|
||||
|
||||
|
||||
// Using safety parsing to prevent missing values from generating NaN
|
||||
const startMins = safeTimeToMinutes(startTime);
|
||||
const endMins = safeTimeToMinutes(endTime);
|
||||
const pauseStartMins = safeTimeToMinutes(pauseStart);
|
||||
const pauseEndMins = safeTimeToMinutes(pauseEnd);
|
||||
|
||||
|
||||
if (isNaN(startMins) || isNaN(endMins) || endMins <= startMins) return;
|
||||
|
||||
|
||||
// Wenn eine gültige Pause innerhalb der Start/Endzeit existiert
|
||||
if (pauseStartMins > 0 && pauseEndMins > 0 && pauseStartMins < pauseEndMins && pauseStartMins > startMins && pauseStartMins < endMins) {
|
||||
// Segment 1 (Vor der Pause)
|
||||
const segment1 = pauseStartMins - startMins;
|
||||
totalSlots += Math.floor(segment1 / slotLength);
|
||||
|
||||
|
||||
// Segment 2 (Nach der Pause)
|
||||
const effectivePauseEnd = Math.min(pauseEndMins, endMins);
|
||||
const segment2 = endMins - effectivePauseEnd;
|
||||
@@ -264,10 +264,10 @@
|
||||
totalSlots += Math.floor((endMins - startMins) / slotLength);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
// FIX 2: Multiply by our safely parsed input value scalar
|
||||
const totalSlotscomplete = totalSlots * multiplier;
|
||||
|
||||
|
||||
// Safety check: if anything went wrong anyway, fallback to 0 instead of displaying NaN
|
||||
updateSlotsDisplay(isNaN(totalSlotscomplete) ? 0 : totalSlotscomplete);
|
||||
}
|
||||
@@ -434,6 +434,10 @@
|
||||
slotLengthInput.addEventListener('input', calculateSlots);
|
||||
slotLengthInput.addEventListener('change', calculateSlots);
|
||||
}
|
||||
if (clientsperslot) {
|
||||
clientsperslot.addEventListener('input', calculateSlots);
|
||||
clientsperslot.addEventListener('change', calculateSlots);
|
||||
}
|
||||
|
||||
if (startDateInput.value && endDateInput.value) {
|
||||
renderRows();
|
||||
|
||||
Reference in New Issue
Block a user