diff --git a/susconecta/components/features/forms/availability-form.tsx b/susconecta/components/features/forms/availability-form.tsx
index 5b140f2..e449b86 100644
--- a/susconecta/components/features/forms/availability-form.tsx
+++ b/susconecta/components/features/forms/availability-form.tsx
@@ -1,6 +1,6 @@
"use client"
-import { useState, useEffect } from 'react'
+import { useState, useEffect, useMemo } from 'react'
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from '@/components/ui/dialog'
import { AlertDialog, AlertDialogContent, AlertDialogHeader, AlertDialogTitle, AlertDialogFooter, AlertDialogAction, AlertDialogCancel } from '@/components/ui/alert-dialog'
import { Button } from '@/components/ui/button'
@@ -18,9 +18,11 @@ export interface AvailabilityFormProps {
// when editing, pass the existing availability and set mode to 'edit'
availability?: DoctorAvailability | null
mode?: 'create' | 'edit'
+ // existing availabilities to prevent duplicate weekday selection
+ existingAvailabilities?: DoctorAvailability[]
}
-export function AvailabilityForm({ open, onOpenChange, doctorId = null, onSaved, availability = null, mode = 'create' }: AvailabilityFormProps) {
+export function AvailabilityForm({ open, onOpenChange, doctorId = null, onSaved, availability = null, mode = 'create', existingAvailabilities = [] }: AvailabilityFormProps) {
const [weekday, setWeekday] = useState('segunda')
const [startTime, setStartTime] = useState('09:00')
const [endTime, setEndTime] = useState('17:00')
@@ -31,6 +33,28 @@ export function AvailabilityForm({ open, onOpenChange, doctorId = null, onSaved,
const { toast } = useToast()
const [blockedException, setBlockedException] = useState(null)
+ // Normalize weekday to standard format for comparison
+ const normalizeWeekdayForComparison = (w?: string) => {
+ if (!w) return w;
+ const k = String(w).toLowerCase().normalize('NFD').replace(/\p{Diacritic}/gu, '').replace(/[^a-z0-9]/g, '');
+ const map: Record = {
+ 'segunda':'segunda','terca':'terca','quarta':'quarta','quinta':'quinta','sexta':'sexta','sabado':'sabado','domingo':'domingo',
+ 'monday':'segunda','tuesday':'terca','wednesday':'quarta','thursday':'quinta','friday':'sexta','saturday':'sabado','sunday':'domingo',
+ '1':'segunda','2':'terca','3':'quarta','4':'quinta','5':'sexta','6':'sabado','0':'domingo','7':'domingo'
+ };
+ return map[k] ?? k;
+ };
+
+ // Get list of already used weekdays (excluding current one in edit mode)
+ const usedWeekdays = useMemo(() => {
+ return new Set(
+ (existingAvailabilities || [])
+ .filter(a => mode === 'edit' ? a.id !== availability?.id : true)
+ .map(a => normalizeWeekdayForComparison(a.weekday))
+ .filter(Boolean)
+ );
+ }, [existingAvailabilities, mode, availability?.id]);
+
// When editing, populate state from availability prop
useEffect(() => {
if (mode === 'edit' && availability) {
@@ -47,6 +71,17 @@ export function AvailabilityForm({ open, onOpenChange, doctorId = null, onSaved,
}
}, [mode, availability])
+ // When creating and modal opens, set the first available weekday
+ useEffect(() => {
+ if (mode === 'create' && open) {
+ const allWeekdays = ['segunda', 'terca', 'quarta', 'quinta', 'sexta', 'sabado', 'domingo'];
+ const firstAvailable = allWeekdays.find(day => !usedWeekdays.has(day));
+ if (firstAvailable) {
+ setWeekday(firstAvailable);
+ }
+ }
+ }, [mode, open, usedWeekdays])
+
async function handleSubmit(e?: React.FormEvent) {
e?.preventDefault()
if (!doctorId) {
@@ -181,25 +216,25 @@ export function AvailabilityForm({ open, onOpenChange, doctorId = null, onSaved,