feat(patients): inline tag popover + advanced filters on the records list
Port the remaining pieces of tauri /files list into /admin/patients:
- inline tag assignment: the برچسبها cell (table + card) opens a popover to
assign/remove tenant tags without leaving the list. Uses existing endpoints
(GET /api/v1/tenant-tags + PATCH /api/v1/patient/{uuid} { tags:[uuid] }).
New component assets/admin/components/PatientTagsCell.tsx.
- advanced filter modal (PatientsFilterModal): admission date range, insurance,
service status (pending/completed), has-debt, gender, tags — wired to the
list query with an active-filter badge on the button.
Backend: GET /api/v1/patients gains tags/gender/insurance_id/admitted_from/
admitted_to/service_status/has_debt filters via a shared applyFilters() on
PatientRecordRepository (findByEntity + countByEntity stay consistent). Debt
and service status derive from unpaid sessions (payment_method='pending'),
documented in docs/api/patient.md.
Tests: tests/Patient/PatientListFilterTest.php (5) + PatientsListPage tag-popover
and filter-apply tests. Pre-existing LoginPage.test failures are unrelated.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -8,25 +8,27 @@ import {
|
||||
import { api } from '../lib/api';
|
||||
import type { ApiResponse } from '../lib/api';
|
||||
import type { PatientRecord } from '../types';
|
||||
import { formatNumber } from '../lib/utils';
|
||||
import { formatNumber, toDate } from '../lib/utils';
|
||||
import Pagination from '../components/ui/Pagination';
|
||||
import PatientTagsCell from '../components/PatientTagsCell';
|
||||
import PatientsFilterModal, { type PatientFilters } from '../components/PatientsFilterModal';
|
||||
|
||||
const LIMIT = 20;
|
||||
const EMPTY: PatientRecord[] = [];
|
||||
|
||||
function TagDots({ tags }: { tags?: PatientRecord['tags'] }) {
|
||||
if (!tags || tags.length === 0) return null;
|
||||
return (
|
||||
<span style={{ display: 'inline-flex', alignItems: 'center' }}>
|
||||
{tags.slice(0, 3).map((t, i) => (
|
||||
<span key={t.uuid} title={t.name} style={{
|
||||
width: 16, height: 16, borderRadius: '50%', background: t.color,
|
||||
border: '2px solid var(--surface)', marginInlineStart: i === 0 ? 0 : -6,
|
||||
}} />
|
||||
))}
|
||||
{tags.length > 3 && <span style={{ fontSize: 11, color: 'var(--text-3)', marginInlineStart: 4 }}>+{formatNumber(tags.length - 3)}</span>}
|
||||
</span>
|
||||
);
|
||||
/** unix start-of-day for `from`, end-of-day for `to`, from a gregorian Y-m-d. */
|
||||
function dayBound(value: string | undefined, end: boolean): number | undefined {
|
||||
if (!value) return undefined;
|
||||
const d = toDate(value);
|
||||
if (!d) return undefined;
|
||||
const secs = Math.floor(d.setHours(0, 0, 0, 0) / 1000);
|
||||
return end ? secs + 86399 : secs;
|
||||
}
|
||||
|
||||
/** Number of filters currently applied (for the button badge). */
|
||||
function countFilters(f: PatientFilters): number {
|
||||
return [f.gender, f.insurance_id, f.admitted_from, f.admitted_to, f.service_status, f.has_debt || undefined, f.tags?.length ? '1' : undefined]
|
||||
.filter(Boolean).length;
|
||||
}
|
||||
|
||||
/** پروندهها — patient records list (table + card views) matching the Figma design. */
|
||||
@@ -35,12 +37,28 @@ export default function PatientsListPage() {
|
||||
const [page, setPage] = useState(1);
|
||||
const [search, setSearch] = useState('');
|
||||
const [view, setView] = useState<'table' | 'card'>('table');
|
||||
const [filterOpen, setFilterOpen] = useState(false);
|
||||
const [filters, setFilters] = useState<PatientFilters>({});
|
||||
|
||||
const qs = new URLSearchParams({ page: String(page), limit: String(LIMIT) });
|
||||
if (search) qs.set('search', search);
|
||||
if (filters.gender) qs.set('gender', filters.gender);
|
||||
if (filters.insurance_id) qs.set('insurance_id', filters.insurance_id);
|
||||
if (filters.service_status) qs.set('service_status', filters.service_status);
|
||||
if (filters.has_debt) qs.set('has_debt', '1');
|
||||
if (filters.tags?.length) qs.set('tags', filters.tags.join(','));
|
||||
const af = dayBound(filters.admitted_from, false);
|
||||
const at = dayBound(filters.admitted_to, true);
|
||||
if (af) qs.set('admitted_from', String(af));
|
||||
if (at) qs.set('admitted_to', String(at));
|
||||
|
||||
const { data, isLoading } = useQuery<ApiResponse<PatientRecord[]> & { meta?: { totalRecords: number } }>({
|
||||
queryKey: ['patients', page, search],
|
||||
queryFn: () => api.get(`/api/v1/patients?page=${page}&limit=${LIMIT}&search=${encodeURIComponent(search)}`),
|
||||
queryKey: ['patients', qs.toString()],
|
||||
queryFn: () => api.get(`/api/v1/patients?${qs.toString()}`),
|
||||
});
|
||||
|
||||
const activeFilters = countFilters(filters);
|
||||
|
||||
const records = data?.data ?? EMPTY;
|
||||
const total = data?.meta?.totalRecords ?? 0;
|
||||
|
||||
@@ -70,8 +88,11 @@ export default function PatientsListPage() {
|
||||
<TableCellsIcon style={{ width: 18 }} />
|
||||
</button>
|
||||
</div>
|
||||
<button className="btn" aria-label="فیلترها" style={{ height: 40, width: 44, padding: 0, display: 'grid', placeItems: 'center' }}>
|
||||
<button className="btn" aria-label="فیلترها" onClick={() => setFilterOpen(true)} style={{ height: 40, position: 'relative', width: 44, padding: 0, display: 'grid', placeItems: 'center', color: activeFilters ? 'var(--primary)' : undefined }}>
|
||||
<AdjustmentsHorizontalIcon style={{ width: 18 }} />
|
||||
{activeFilters > 0 && (
|
||||
<span style={{ position: 'absolute', top: -6, insetInlineEnd: -6, minWidth: 16, height: 16, padding: '0 4px', borderRadius: 999, background: 'var(--primary)', color: '#fff', fontSize: 10, display: 'grid', placeItems: 'center' }}>{formatNumber(activeFilters)}</span>
|
||||
)}
|
||||
</button>
|
||||
<button className="btn primary" style={{ height: 40 }} onClick={() => navigate('/admin/patients/new')}>
|
||||
<PlusIcon style={{ width: 16 }} /> تشکیل پرونده
|
||||
@@ -107,7 +128,7 @@ export default function PatientsListPage() {
|
||||
</span>
|
||||
</td>
|
||||
<td style={{ padding: '12px 14px' }}>
|
||||
{r.tags && r.tags.length > 0 ? <TagDots tags={r.tags} /> : <Link to={editHref(r)} style={{ color: 'var(--primary)', fontSize: 12.5, textDecoration: 'none' }}>+ اضافه کردن</Link>}
|
||||
<PatientTagsCell record={r} />
|
||||
</td>
|
||||
<td style={{ padding: '12px 14px' }}>{r.record_number || '—'}</td>
|
||||
<td style={{ padding: '12px 14px', direction: 'ltr' }}>{r.user_mobile || '—'}</td>
|
||||
@@ -129,7 +150,7 @@ export default function PatientsListPage() {
|
||||
<div key={r.uuid} style={{ background: 'var(--surface)', border: '1px solid var(--border)', borderRadius: 'var(--r-lg)', padding: 16 }}>
|
||||
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'flex-start', marginBottom: 10 }}>
|
||||
<span style={{ fontWeight: 700, fontSize: 15 }}>{r.user_name || '—'}</span>
|
||||
<TagDots tags={r.tags} />
|
||||
<PatientTagsCell record={r} />
|
||||
</div>
|
||||
<div style={{ fontSize: 12.5, color: 'var(--text-3)', display: 'flex', flexDirection: 'column', gap: 4 }}>
|
||||
<span>شماره پرونده: {r.record_number || '—'}</span>
|
||||
@@ -148,6 +169,13 @@ export default function PatientsListPage() {
|
||||
<div style={{ marginTop: 20, display: 'flex', justifyContent: 'center' }}>
|
||||
<Pagination page={page} total={total} limit={LIMIT} onPageChange={setPage} />
|
||||
</div>
|
||||
|
||||
<PatientsFilterModal
|
||||
open={filterOpen}
|
||||
value={filters}
|
||||
onClose={() => setFilterOpen(false)}
|
||||
onApply={(f) => { setFilters(f); setPage(1); setFilterOpen(false); }}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user