RiseUP/riseup-squad20
1
0
Fork 3
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

develop #83

Merged
M-Gabrielly merged 426 commits from develop into main 2025-12-04 04:13:15 +00:00
Conversation 0 Commits 426 Files Changed 170 +30 -39
1 changed files with 30 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 47965fe78a - Show all commits

57
susconecta/components/features/forms/calendar-registration-form.tsx
View File

@ -414,36 +414,32 @@ export function CalendarRegistrationForm({ formData, onFormChange, createMode =
} catch (e) {} } catch (e) {}
const generatedSet = new Set<string>(); const generatedSet = new Set<string>();
// Helper to create ISO-like string without timezone conversion
const toLocalISOString = (date: Date) => {
const year = date.getFullYear();
const month = String(date.getMonth() + 1).padStart(2, '0');
const day = String(date.getDate()).padStart(2, '0');
const hours = String(date.getHours()).padStart(2, '0');
const minutes = String(date.getMinutes()).padStart(2, '0');
const seconds = String(date.getSeconds()).padStart(2, '0');
return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}`;
};
windows.forEach((w: any) => { windows.forEach((w: any) => {
try { try {
const perWindowStep = Number(w.slotMinutes) || stepMinutes; const perWindowStep = Number(w.slotMinutes) || stepMinutes;
const startMs = w.winStart.getTime(); const startMs = w.winStart.getTime();
const endMs = w.winEnd.getTime(); const endMs = w.winEnd.getTime();
const lastStartMs = endMs - perWindowStep * 60000; const lastStartMs = endMs - perWindowStep * 60000;
const backendSlotsInWindow = (av.slots || []).filter((s: any) => {
try {
const sd = new Date(s.datetime);
const sm = sd.getHours() * 60 + sd.getMinutes();
const wmStart = w.winStart.getHours() * 60 + w.winStart.getMinutes();
const wmEnd = w.winEnd.getHours() * 60 + w.winEnd.getMinutes();
return sm >= wmStart && sm <= wmEnd;
} catch (e) { return false; }
}).map((s: any) => new Date(s.datetime).getTime()).sort((a: number, b: number) => a - b);
if (!backendSlotsInWindow.length) { // Always generate slots from the start of the window to the end
// This ensures slots start at the configured availability start time
let cursorMs = startMs; let cursorMs = startMs;
while (cursorMs <= lastStartMs) { while (cursorMs <= lastStartMs) {
generatedSet.add(new Date(cursorMs).toISOString()); generatedSet.add(toLocalISOString(new Date(cursorMs)));
cursorMs += perWindowStep * 60000; cursorMs += perWindowStep * 60000;
} }
} else {
const lastBackendMs = backendSlotsInWindow[backendSlotsInWindow.length - 1];
let cursorMs = lastBackendMs + perWindowStep * 60000;
while (cursorMs <= lastStartMs) {
generatedSet.add(new Date(cursorMs).toISOString());
cursorMs += perWindowStep * 60000;
}
}
} catch (e) {} } catch (e) {}
}); });
@ -463,15 +459,10 @@ export function CalendarRegistrationForm({ formData, onFormChange, createMode =
} catch (e) { return null; } } catch (e) { return null; }
}; };
(existingInWindow || []).forEach((s: any) => { // Use only generated slots based on availability windows
const sm = findWindowSlotMinutes(s.datetime);
mergedMap.set(s.datetime, sm ? { ...s, slot_minutes: sm } : { ...s });
});
Array.from(generatedSet).forEach((dt) => { Array.from(generatedSet).forEach((dt) => {
if (!mergedMap.has(dt)) {
const sm = findWindowSlotMinutes(dt) || stepMinutes; const sm = findWindowSlotMinutes(dt) || stepMinutes;
mergedMap.set(dt, { datetime: dt, available: true, slot_minutes: sm }); mergedMap.set(dt, { datetime: dt, available: true, slot_minutes: sm });
}
}); });
const merged = Array.from(mergedMap.values()).sort((a, b) => new Date(a.datetime).getTime() - new Date(b.datetime).getTime()); const merged = Array.from(mergedMap.values()).sort((a, b) => new Date(a.datetime).getTime() - new Date(b.datetime).getTime());
@ -1071,7 +1062,8 @@ export function CalendarRegistrationForm({ formData, onFormChange, createMode =
} }
const hh = String(dt.getHours()).padStart(2, '0'); const hh = String(dt.getHours()).padStart(2, '0');
const mm = String(dt.getMinutes()).padStart(2, '0'); const mm = String(dt.getMinutes()).padStart(2, '0');
const dateOnly = dt.toISOString().split('T')[0]; // Keep the existing appointmentDate, don't override it
const currentDate = (formData as any).appointmentDate;
// set duration from slot if available // set duration from slot if available
const sel = (availableSlots || []).find((s) => s.datetime === value) as any; const sel = (availableSlots || []).find((s) => s.datetime === value) as any;
const slotMinutes = sel && sel.slot_minutes ? Number(sel.slot_minutes) : null; const slotMinutes = sel && sel.slot_minutes ? Number(sel.slot_minutes) : null;
@ -1082,11 +1074,11 @@ export function CalendarRegistrationForm({ formData, onFormChange, createMode =
const endM = String(endDt.getMinutes()).padStart(2, '0'); const endM = String(endDt.getMinutes()).padStart(2, '0');
const endStr = `${endH}:${endM}`; const endStr = `${endH}:${endM}`;
if (slotMinutes) { if (slotMinutes) {
onFormChange({ ...formData, appointmentDate: dateOnly, startTime: `${hh}:${mm}`, duration_minutes: slotMinutes, endTime: endStr }); onFormChange({ ...formData, appointmentDate: currentDate, startTime: `${hh}:${mm}`, duration_minutes: slotMinutes, endTime: endStr });
try { setLockedDurationFromSlot(true); } catch (e) {} try { setLockedDurationFromSlot(true); } catch (e) {}
try { (lastAutoEndRef as any).current = endStr; } catch (e) {} try { (lastAutoEndRef as any).current = endStr; } catch (e) {}
} else { } else {
onFormChange({ ...formData, appointmentDate: dateOnly, startTime: `${hh}:${mm}`, endTime: endStr }); onFormChange({ ...formData, appointmentDate: currentDate, startTime: `${hh}:${mm}`, endTime: endStr });
try { (lastAutoEndRef as any).current = endStr; } catch (e) {} try { (lastAutoEndRef as any).current = endStr; } catch (e) {}
} }
} catch (e) { } catch (e) {
@ -1188,9 +1180,8 @@ export function CalendarRegistrationForm({ formData, onFormChange, createMode =
type="button" type="button"
className={`h-10 rounded-md border ${formData.startTime === `${hh}:${mm}` ? 'bg-blue-600 text-white' : 'bg-background'}`} className={`h-10 rounded-md border ${formData.startTime === `${hh}:${mm}` ? 'bg-blue-600 text-white' : 'bg-background'}`}
onClick={() => { onClick={() => {
// when selecting a slot, set appointmentDate (if missing) and startTime and duration // when selecting a slot, keep the existing appointmentDate and only update time
const isoDate = dt.toISOString(); const currentDate = (formData as any).appointmentDate;
const dateOnly = isoDate.split('T')[0];
const slotMinutes = s.slot_minutes || null; const slotMinutes = s.slot_minutes || null;
// compute endTime based on duration // compute endTime based on duration
const durationForCalc = slotMinutes || (formData as any).duration_minutes || 0; const durationForCalc = slotMinutes || (formData as any).duration_minutes || 0;
@ -1199,11 +1190,11 @@ export function CalendarRegistrationForm({ formData, onFormChange, createMode =
const endM = String(endDt.getMinutes()).padStart(2, '0'); const endM = String(endDt.getMinutes()).padStart(2, '0');
const endStr = `${endH}:${endM}`; const endStr = `${endH}:${endM}`;
if (slotMinutes) { if (slotMinutes) {
onFormChange({ ...formData, appointmentDate: dateOnly, startTime: `${hh}:${mm}`, duration_minutes: Number(slotMinutes), endTime: endStr }); onFormChange({ ...formData, appointmentDate: currentDate, startTime: `${hh}:${mm}`, duration_minutes: Number(slotMinutes), endTime: endStr });
try { setLockedDurationFromSlot(true); } catch (e) {} try { setLockedDurationFromSlot(true); } catch (e) {}
try { (lastAutoEndRef as any).current = endStr; } catch (e) {} try { (lastAutoEndRef as any).current = endStr; } catch (e) {}
} else { } else {
onFormChange({ ...formData, appointmentDate: dateOnly, startTime: `${hh}:${mm}`, endTime: endStr }); onFormChange({ ...formData, appointmentDate: currentDate, startTime: `${hh}:${mm}`, endTime: endStr });
try { (lastAutoEndRef as any).current = endStr; } catch (e) {} try { (lastAutoEndRef as any).current = endStr; } catch (e) {}
} }
}} }}