Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 71e2895362 | |||
| d2c7e57f8d | |||
| 111d40b787 | |||
| 1a9513d442 | |||
| 3900059eb1 |
@@ -288,19 +288,19 @@ def configure():
|
||||
)
|
||||
|
||||
# Call the database service function (standardized to match your underlying code)
|
||||
inserted_id = appointment_service.add(
|
||||
inserted_id = appointment_service.new(
|
||||
date_start=start,
|
||||
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:
|
||||
|
||||
@@ -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 || '');
|
||||
|
||||
@@ -203,16 +203,31 @@
|
||||
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(':')) {
|
||||
return 0; // Return 0 instead of NaN for empty or missing values
|
||||
}
|
||||
const parts = timeString.split(':');
|
||||
const hours = parseInt(parts[0], 10);
|
||||
const minutes = parseInt(parts[1], 10);
|
||||
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]'));
|
||||
|
||||
@@ -224,19 +239,20 @@
|
||||
|
||||
if (!startTime || !endTime) return;
|
||||
|
||||
const startMins = timeToMinutes(startTime);
|
||||
const endMins = timeToMinutes(endTime);
|
||||
const pauseStartMins = timeToMinutes(pauseStart);
|
||||
const pauseEndMins = timeToMinutes(pauseEnd);
|
||||
// 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 (endMins <= startMins) return; // Ungültige Zeit
|
||||
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;
|
||||
@@ -248,8 +264,12 @@
|
||||
totalSlots += Math.floor((endMins - startMins) / slotLength);
|
||||
}
|
||||
});
|
||||
totalSlotscomplete = totalSlots * Number(clientsperslot)
|
||||
updateSlotsDisplay(totalSlotscomplete);
|
||||
|
||||
// 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);
|
||||
}
|
||||
|
||||
// Synchronisiert das Textfeld und fügt den Break-Cut hinzu
|
||||
@@ -414,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