feat(appointments): close the three remaining design gaps
1. شارژ کیف پول is now functional end-to-end. New owner-gated
POST /api/v1/patient/{uuid}/wallet/charge creates a manual credit
WalletTransaction (computed balance_after); the patient detail's wallet tab
gains a top-up modal (PriceInput + description) and supports ?tab= deep
links. The deposit sections of the create drawer, the edit page and the
replace modal link to it via WalletChargeLink (record resolved by mobile).
2. جایگزینی نوبت now matches appointments-replace.pdf: patient search-or-new,
بخش/سرویس/پرسنل selects prefilled from the appointment, deposit toggle +
amount + charge link, read-only original date/time, status pick and notes —
all through the general PATCH.
3. The confirmed-appointments table is paginated (20/page, client-side so the
schedule view and doctor-tab derivation keep the whole day), resetting on
date/doctor/filter changes. The page-local STATUS_META also adopts the
design labels plus following_up/salon for the schedule cards.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -14,6 +14,7 @@ import type { Appointment } from '../types';
|
||||
import { formatRial } from '../lib/utils';
|
||||
import Modal from './ui/Modal';
|
||||
import PersianDateInput from './ui/PersianDateInput';
|
||||
import PriceInput from './ui/PriceInput';
|
||||
import AppointmentStatusDropdown from './ui/AppointmentStatusDropdown';
|
||||
|
||||
/** Row actions for the appointments table (Figma عملیات menu). */
|
||||
@@ -26,11 +27,32 @@ const toEpoch = (isoDate: string, time: string) =>
|
||||
* Resolve the patient-record uuid behind an appointment via the patient list
|
||||
* search (mobile is unique per user). Returns null when no record exists yet.
|
||||
*/
|
||||
async function findRecordUuid(mobile: string): Promise<string | null> {
|
||||
export async function findRecordUuid(mobile: string): Promise<string | null> {
|
||||
const res: any = await api.get(`/api/v1/patient?search=${encodeURIComponent(mobile)}&limit=1`);
|
||||
return res?.data?.[0]?.uuid ?? null;
|
||||
}
|
||||
|
||||
/**
|
||||
* «شارژ کیف پول» accent link (appointment create/edit forms) — deep-links the
|
||||
* patient's wallet tab, where the manual top-up modal lives.
|
||||
*/
|
||||
export function WalletChargeLink({ mobile }: { mobile?: string }) {
|
||||
const navigate = useNavigate();
|
||||
const go = async () => {
|
||||
if (!mobile || mobile.trim().length < 10) { toast.error('ابتدا شماره تماس مراجعه کننده را وارد کنید'); return; }
|
||||
try {
|
||||
const recordUuid = await findRecordUuid(mobile.trim());
|
||||
if (!recordUuid) { toast.error('پروندهای برای این بیمار یافت نشد'); return; }
|
||||
navigate(`/admin/patients/${recordUuid}?tab=wallet`);
|
||||
} catch { toast.error('خطا در یافتن پرونده بیمار'); }
|
||||
};
|
||||
return (
|
||||
<button type="button" className="btn sm ghost" style={{ color: 'var(--accent)' }} onClick={go}>
|
||||
شارژ کیف پول ‹
|
||||
</button>
|
||||
);
|
||||
}
|
||||
|
||||
export default function AppointmentActionsMenu({ appointment, queryKey }: {
|
||||
appointment: Appointment; queryKey: unknown[];
|
||||
}) {
|
||||
@@ -262,44 +284,167 @@ export function TransferReserveModal({ appointment: a, queryKey, onClose }: {
|
||||
|
||||
// ─────────────────────────────────────────────────────────────────────────────
|
||||
// جایگزینی نوبت — put a different patient into the same slot
|
||||
// (appointments-replace.pdf: patient search-or-new, بخش/سرویس, deposit,
|
||||
// locked date/time, پرسنل, وضعیت, توضیحات)
|
||||
// ─────────────────────────────────────────────────────────────────────────────
|
||||
|
||||
interface PickerOption { uuid: string; name?: string; full_name?: string }
|
||||
interface PickedPatient { uuid: string; user_name?: string; user_mobile?: string }
|
||||
|
||||
export function ReplaceAppointmentModal({ appointment: a, queryKey, onClose }: {
|
||||
appointment: Appointment; queryKey: unknown[]; onClose: () => void;
|
||||
}) {
|
||||
const qc = useQueryClient();
|
||||
|
||||
// patient: search an existing record or enter a new person
|
||||
const [patientSearch, setPatientSearch] = useState('');
|
||||
const [picked, setPicked] = useState<PickedPatient | null>(null);
|
||||
const [name, setName] = useState('');
|
||||
const [mobile, setMobile] = useState('');
|
||||
const patientsQ = useQuery<ApiResponse<PickedPatient[]>>({
|
||||
queryKey: ['replace-patients', patientSearch],
|
||||
queryFn: () => api.get(`/api/v1/patient?search=${encodeURIComponent(patientSearch)}&limit=10`),
|
||||
enabled: patientSearch.trim().length >= 2,
|
||||
});
|
||||
|
||||
// service specs + staff + status
|
||||
const [sectionUuid, setSectionUuid] = useState(a.service_section?.uuid ?? '');
|
||||
const [itemUuid, setItemUuid] = useState(a.service_item?.uuid ?? '');
|
||||
const [staffUuid, setStaffUuid] = useState(a.staff?.uuid ?? '');
|
||||
const [status, setStatus] = useState(a.status);
|
||||
const sectionsQ = useQuery<ApiResponse<PickerOption[]>>({ queryKey: ['service-sections'], queryFn: () => api.get('/api/v1/service-sections') });
|
||||
const itemsQ = useQuery<ApiResponse<PickerOption[]>>({
|
||||
queryKey: ['service-items', sectionUuid],
|
||||
queryFn: () => api.get(`/api/v1/service-items/${sectionUuid}`),
|
||||
enabled: !!sectionUuid,
|
||||
});
|
||||
const staffQ = useQuery<ApiResponse<PickerOption[]>>({ queryKey: ['staff-list'], queryFn: () => api.get('/api/v1/staff') });
|
||||
|
||||
// deposit
|
||||
const [depositRequired, setDepositRequired] = useState(!!a.deposit_required);
|
||||
const [depositRials, setDepositRials] = useState(a.deposit_amount_rials ?? 0);
|
||||
const [note, setNote] = useState('');
|
||||
|
||||
const effectiveName = picked?.user_name || name.trim();
|
||||
const effectiveMobile = picked?.user_mobile || mobile.trim();
|
||||
|
||||
const replace = useMutation({
|
||||
mutationFn: () => api.patch(`/api/v1/appointment/${a.uuid}`, {
|
||||
patient_name: name.trim(), patient_mobile: mobile.trim(),
|
||||
patient_name: effectiveName,
|
||||
patient_mobile: effectiveMobile,
|
||||
service_section_uuid: sectionUuid,
|
||||
service_item_uuid: itemUuid,
|
||||
staff_uuid: staffUuid,
|
||||
deposit_required: depositRequired,
|
||||
deposit_amount_rials: depositRequired ? depositRials : null,
|
||||
...(note.trim() ? { note: note.trim() } : {}),
|
||||
...(status !== a.status ? { status } : {}),
|
||||
version: a.version,
|
||||
}),
|
||||
onSuccess: () => { qc.invalidateQueries({ queryKey }); toast.success('نوبت جایگزین شد'); onClose(); },
|
||||
onError: (e: any) => toast.error(e.message || 'خطا در جایگزینی نوبت'),
|
||||
});
|
||||
|
||||
const label = { fontSize: 12.5, color: 'var(--text-3)' } as const;
|
||||
const sel = { width: '100%', height: 38, borderRadius: 'var(--r-sm)', border: '1px solid var(--border)', background: 'var(--surface)', fontSize: 13, fontFamily: 'inherit', padding: '0 10px' } as const;
|
||||
const lockedField = { margin: '6px 0 12px', opacity: 0.6 } as const;
|
||||
const patients = patientsQ.data?.data ?? [];
|
||||
|
||||
const statusOptions: [string, string][] = [
|
||||
['pending', 'ثبت شده'], ['confirmed', 'قطعی شده'], ['following_up', 'در حال پیگیری'],
|
||||
['salon', 'سالن'], ['completed', 'ویزیت شده'], ['cancelled_by_doctor', 'لغو شده'],
|
||||
];
|
||||
|
||||
return (
|
||||
<Modal open title="جایگزینی نوبت" onClose={onClose}>
|
||||
<div>
|
||||
<label style={{ fontSize: 12.5, color: 'var(--text-3)' }}>نام و نام خانوادگی</label>
|
||||
<div className="field" style={{ margin: '6px 0 12px' }}>
|
||||
<input value={name} onChange={e => setName(e.target.value)} placeholder="نام و نام خانوادگی مراجعه کننده" />
|
||||
<label style={label}>انتخاب مراجعه کننده</label>
|
||||
<div className="field" style={{ margin: '6px 0 8px' }}>
|
||||
<input value={picked ? `${picked.user_name ?? ''} — ${picked.user_mobile ?? ''}` : patientSearch}
|
||||
onChange={e => { setPicked(null); setPatientSearch(e.target.value); }}
|
||||
placeholder="جستجوی نام، شماره تماس، شماره پرونده..." />
|
||||
</div>
|
||||
<label style={{ fontSize: 12.5, color: 'var(--text-3)' }}>شماره تماس</label>
|
||||
<div className="field" style={{ margin: '6px 0 12px' }}>
|
||||
<input value={mobile} onChange={e => setMobile(e.target.value)} placeholder="شماره تماس" dir="ltr" />
|
||||
{!picked && patients.length > 0 && (
|
||||
<div style={{ border: '1px solid var(--border)', borderRadius: 'var(--r-sm)', marginBottom: 10, overflow: 'hidden' }}>
|
||||
{patients.map(p => (
|
||||
<button key={p.uuid} onClick={() => setPicked(p)} style={{
|
||||
display: 'block', width: '100%', padding: '8px 10px', fontSize: 13, textAlign: 'right',
|
||||
background: 'transparent', border: 'none', cursor: 'pointer', fontFamily: 'inherit',
|
||||
}}>
|
||||
{p.user_name} <span style={{ color: 'var(--text-3)', direction: 'ltr' }}>{p.user_mobile}</span>
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
{picked === null && (
|
||||
<div style={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: 10, marginBottom: 12 }}>
|
||||
<div className="field"><input value={name} onChange={e => setName(e.target.value)} placeholder="نام و نام خانوادگی" /></div>
|
||||
<div className="field"><input value={mobile} onChange={e => setMobile(e.target.value)} placeholder="شماره تماس" dir="ltr" /></div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div style={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: 10, marginBottom: 12 }}>
|
||||
<div>
|
||||
<label style={label}>بخش</label>
|
||||
<select aria-label="بخش" style={{ ...sel, marginTop: 6 }} value={sectionUuid} onChange={e => { setSectionUuid(e.target.value); setItemUuid(''); }}>
|
||||
<option value="">انتخاب بخش</option>
|
||||
{(sectionsQ.data?.data ?? []).map(o => <option key={o.uuid} value={o.uuid}>{o.name}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
<label style={label}>سرویس</label>
|
||||
<select aria-label="سرویس" style={{ ...sel, marginTop: 6 }} value={itemUuid} onChange={e => setItemUuid(e.target.value)} disabled={!sectionUuid}>
|
||||
<option value="">انتخاب زیر بخش</option>
|
||||
{(itemsQ.data?.data ?? []).map(o => <option key={o.uuid} value={o.uuid}>{o.name}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<label style={{ fontSize: 12.5, color: 'var(--text-3)' }}>توضیحات</label>
|
||||
|
||||
<div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 10, flexWrap: 'wrap', marginBottom: 12 }}>
|
||||
<label style={{ display: 'inline-flex', alignItems: 'center', gap: 8, fontSize: 13, cursor: 'pointer' }}>
|
||||
<input type="checkbox" checked={depositRequired} onChange={e => setDepositRequired(e.target.checked)} />
|
||||
بیعانه مورد نیاز است.
|
||||
</label>
|
||||
{depositRequired && <WalletChargeLink mobile={effectiveMobile} />}
|
||||
</div>
|
||||
{depositRequired && (
|
||||
<div style={{ marginBottom: 12 }}>
|
||||
<label style={label}>مبلغ بیعانه (تومان)</label>
|
||||
<div style={{ marginTop: 6 }}><PriceInput value={depositRials} onChange={setDepositRials} /></div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* the replacement keeps the original slot — date/time locked */}
|
||||
<div style={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: 10 }}>
|
||||
<div>
|
||||
<label style={label}>انتخاب تاریخ</label>
|
||||
<div className="field" style={lockedField}><input value={a.appointment_date} disabled dir="ltr" /></div>
|
||||
</div>
|
||||
<div>
|
||||
<label style={label}>ساعت شروع</label>
|
||||
<div className="field" style={lockedField}><input value={a.appointment_time} disabled dir="ltr" /></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<label style={label}>انتخاب پرسنل</label>
|
||||
<select aria-label="پرسنل" style={{ ...sel, margin: '6px 0 12px' }} value={staffUuid} onChange={e => setStaffUuid(e.target.value)}>
|
||||
<option value="">انتخاب...</option>
|
||||
{(staffQ.data?.data ?? []).map(o => <option key={o.uuid} value={o.uuid}>{o.full_name}</option>)}
|
||||
</select>
|
||||
|
||||
<label style={label}>انتخاب وضعیت</label>
|
||||
<select aria-label="وضعیت" style={{ ...sel, margin: '6px 0 12px' }} value={status} onChange={e => setStatus(e.target.value as Appointment['status'])}>
|
||||
{statusOptions.map(([v, l]) => <option key={v} value={v}>{l}</option>)}
|
||||
</select>
|
||||
|
||||
<label style={label}>توضیحات</label>
|
||||
<div className="field" style={{ height: 'auto', margin: '6px 0 16px' }}>
|
||||
<textarea value={note} onChange={e => setNote(e.target.value)} rows={3} placeholder="توضیحات..."
|
||||
style={{ width: '100%', border: 'none', background: 'transparent', fontFamily: 'inherit', resize: 'vertical' }} />
|
||||
</div>
|
||||
|
||||
<button className="btn primary" style={{ width: '100%' }}
|
||||
disabled={name.trim().length < 2 || mobile.trim().length < 10 || replace.isPending}
|
||||
disabled={effectiveName.length < 2 || effectiveMobile.length < 10 || replace.isPending}
|
||||
onClick={() => replace.mutate()}>
|
||||
ثبت نوبت
|
||||
</button>
|
||||
|
||||
Reference in New Issue
Block a user