fix(hermes-tasks): department counts stability and mobile responsive cards
Deploy Canina / deploy (push) Successful in 2m33s
Deploy Canina / deploy (push) Successful in 2m33s
This commit is contained in:
1 parent
8c4faf8820
commit
a6d0269427
3 files changed
+112
-48
No files matched your search
@@ -120,7 +120,22 @@ export class CorporateService {
|
||||
take: p.limit,
|
||||
orderBy: [{ [p.sortBy]: p.sortOrder }, { id: 'asc' }],
|
||||
});
|
||||
return publicData({ data, meta: meta(total, p.page, p.limit) });
|
||||
const deptGroup = await tx.corporateTask.groupBy({
|
||||
by: ['department'],
|
||||
_count: { id: true },
|
||||
});
|
||||
const departmentCounts: Record<string, number> = {};
|
||||
for (const d of departments) departmentCounts[d] = 0;
|
||||
for (const row of deptGroup) {
|
||||
departmentCounts[row.department] = row._count.id;
|
||||
}
|
||||
return publicData({
|
||||
data,
|
||||
meta: {
|
||||
...meta(total, p.page, p.limit),
|
||||
departmentCounts,
|
||||
},
|
||||
});
|
||||
},
|
||||
{ isolationLevel: Prisma.TransactionIsolationLevel.RepeatableRead },
|
||||
);
|
||||
|
||||
@@ -23,6 +23,7 @@ import {
|
||||
type TaskDepartment,
|
||||
type TaskPriority,
|
||||
type TaskStatus,
|
||||
type TasksResponse,
|
||||
} from '../services/hermesApi';
|
||||
|
||||
const deptConfig: Record<TaskDepartment, { label: string; bg: string; text: string; border: string }> = {
|
||||
@@ -58,7 +59,8 @@ const date = (val?: string | null) =>
|
||||
export default function CorporateTasksPage() {
|
||||
const [tasks, setTasks] = useState<CorporateTaskItem[]>([]);
|
||||
const [page, setPage] = useState(1);
|
||||
const [meta, setMeta] = useState({ total: 0, totalPages: 0, hasNextPage: false, hasPrevPage: false });
|
||||
const [meta, setMeta] = useState<TasksResponse['meta']>({ total: 0, totalPages: 0, hasNextPage: false, hasPrevPage: false, page: 1, limit: 10 });
|
||||
const [deptCounts, setDeptCounts] = useState<Record<string, number>>({});
|
||||
const [search, setSearch] = useState('');
|
||||
const [department, setDepartment] = useState('');
|
||||
const [status, setStatus] = useState('');
|
||||
@@ -110,6 +112,9 @@ export default function CorporateTasksPage() {
|
||||
if (!controller.signal.aborted) {
|
||||
setTasks(res.data);
|
||||
setMeta(res.meta);
|
||||
if (res.meta.departmentCounts) {
|
||||
setDeptCounts(res.meta.departmentCounts);
|
||||
}
|
||||
}
|
||||
})
|
||||
.catch(() => { if (!controller.signal.aborted) setError(true); })
|
||||
@@ -183,31 +188,59 @@ export default function CorporateTasksPage() {
|
||||
</header>
|
||||
{error && <p role="alert">وظایف در دسترس نیست؛ دریافت از سرور ناموفق بود.</p>}
|
||||
|
||||
{/* خلاصه ظرفیت دپارتمانها */}
|
||||
<div className="grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-5 gap-3">
|
||||
{/* تبها و فیلتر دپارتمانها */}
|
||||
<div className="grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-6 gap-2.5">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
setDepartment('');
|
||||
setPage(1);
|
||||
}}
|
||||
className={`p-3 rounded-2xl border text-right transition-all cursor-pointer ${
|
||||
department === ''
|
||||
? 'bg-amber-400 text-slate-950 border-amber-400 shadow-sm ring-2 ring-amber-400/30 font-black'
|
||||
: 'bg-white text-slate-700 border-slate-200 hover:border-slate-300 hover:bg-slate-50 font-bold'
|
||||
}`}
|
||||
>
|
||||
<div className="flex items-center justify-between gap-1.5">
|
||||
<span className="text-xs">همه دپارتمانها</span>
|
||||
<span
|
||||
className={`text-xs px-2 py-0.5 rounded-md font-bold ${
|
||||
department === '' ? 'bg-amber-500/40 text-slate-950' : 'bg-slate-100 text-slate-600'
|
||||
}`}
|
||||
>
|
||||
{error ? '—' : meta?.total ?? tasks.length}
|
||||
</span>
|
||||
</div>
|
||||
</button>
|
||||
|
||||
{(Object.keys(deptConfig) as TaskDepartment[]).map((dept) => {
|
||||
const cfg = deptConfig[dept];
|
||||
const count = tasks.filter((t) => t.department === dept).length;
|
||||
const count = deptCounts[dept] ?? tasks.filter((t) => t.department === dept).length;
|
||||
const isSelected = department === dept;
|
||||
return (
|
||||
<div
|
||||
<button
|
||||
type="button"
|
||||
key={dept}
|
||||
onClick={() => {
|
||||
setDepartment((prev) => (prev === dept ? '' : dept));
|
||||
setPage(1);
|
||||
}}
|
||||
className={`p-3.5 rounded-2xl border transition-all cursor-pointer ${
|
||||
department === dept
|
||||
? 'bg-amber-50/70 border-amber-300 ring-2 ring-amber-400/30'
|
||||
: 'bg-white border-slate-200/80 hover:border-slate-300'
|
||||
className={`p-3 rounded-2xl border text-right transition-all cursor-pointer ${
|
||||
isSelected
|
||||
? 'bg-amber-50 border-amber-400 ring-2 ring-amber-400/30 shadow-sm'
|
||||
: 'bg-white border-slate-200 hover:border-slate-300 hover:bg-slate-50/60'
|
||||
}`}
|
||||
>
|
||||
<div className="flex items-center justify-between">
|
||||
<span className="text-xs font-bold text-slate-600">{cfg.label} (این صفحه)</span>
|
||||
<span className={`text-xs px-2 py-0.5 rounded-md font-bold ${cfg.bg} ${cfg.text}`}>
|
||||
{error || loading ? 'ناموجود' : count}
|
||||
<div className="flex items-center justify-between gap-1.5">
|
||||
<span className={`text-xs font-bold truncate ${isSelected ? 'text-amber-950 font-black' : 'text-slate-700'}`}>
|
||||
{cfg.label}
|
||||
</span>
|
||||
<span className={`text-xs px-2 py-0.5 rounded-md font-bold shrink-0 ${cfg.bg} ${cfg.text}`}>
|
||||
{error ? '—' : count}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
@@ -307,7 +340,7 @@ export default function CorporateTasksPage() {
|
||||
)}
|
||||
|
||||
{/* لیست وظایف (سازگار با موبایل و دسکتاپ) */}
|
||||
<div className="bg-white rounded-2xl border border-slate-200/90 shadow-sm overflow-hidden">
|
||||
<div className="bg-transparent md:bg-white md:rounded-2xl md:border md:border-slate-200/90 md:shadow-sm overflow-hidden">
|
||||
<table className="w-full text-right" aria-busy={loading}>
|
||||
<caption className="sr-only">وظایف دپارتمانهای کنینا</caption>
|
||||
<thead className="hidden md:table-header-group bg-slate-50/80 border-b border-slate-200 text-slate-700 text-xs font-bold uppercase tracking-wider">
|
||||
@@ -321,10 +354,10 @@ export default function CorporateTasksPage() {
|
||||
)}
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody className="divide-y divide-slate-100 block md:table-row-group">
|
||||
<tbody className="space-y-3.5 md:space-y-0 md:divide-y md:divide-slate-100 block md:table-row-group">
|
||||
{!loading && !error && tasks.length === 0 && (
|
||||
<tr className="block md:table-row">
|
||||
<td colSpan={7} className="p-12 text-center text-slate-500 text-sm block md:table-cell">
|
||||
<tr className="block md:table-row bg-white rounded-2xl md:rounded-none border border-slate-200/80 md:border-0 p-8 md:p-0">
|
||||
<td colSpan={7} className="p-6 md:p-12 text-center text-slate-500 text-sm block md:table-cell">
|
||||
<div className="max-w-xs mx-auto space-y-2">
|
||||
<FileText className="w-8 h-8 text-slate-300 mx-auto" />
|
||||
<p className="font-semibold text-slate-700">تسک فعالی با این فیلترها یافت نشد.</p>
|
||||
@@ -354,37 +387,44 @@ export default function CorporateTasksPage() {
|
||||
return (
|
||||
<tr
|
||||
key={task.id}
|
||||
className="block md:table-row p-4 sm:p-5 md:p-0 border-b md:border-b-0 border-slate-100 hover:bg-slate-50/60 transition-colors"
|
||||
className="block md:table-row bg-white rounded-2xl md:rounded-none border border-slate-200/80 md:border-0 md:border-b md:border-slate-100 p-4 sm:p-5 md:p-0 shadow-sm md:shadow-none hover:bg-slate-50/80 transition-all space-y-3 md:space-y-0"
|
||||
>
|
||||
{/* کد و عنوان */}
|
||||
<td className="block md:table-cell p-0 md:p-3.5 md:pr-5 pb-2 md:pb-3.5 align-top">
|
||||
<div className="space-y-1">
|
||||
<div className="flex flex-wrap items-center gap-2 mb-1.5 md:hidden">
|
||||
<span className="font-mono text-xs font-bold text-slate-500 bg-slate-100 px-2 py-0.5 rounded">
|
||||
{task.taskCode}
|
||||
</span>
|
||||
<td className="block md:table-cell p-0 md:p-3.5 md:pr-5 align-top">
|
||||
<div className="space-y-2 md:space-y-1">
|
||||
{/* بجهای بالای کارت موبایل */}
|
||||
<div className="flex flex-wrap items-center justify-between gap-2 md:hidden pb-2.5 border-b border-slate-100">
|
||||
<div className="flex items-center gap-1.5">
|
||||
<span className="font-mono text-[11px] font-bold text-slate-600 bg-slate-100 px-2 py-0.5 rounded-lg border border-slate-200/60">
|
||||
{task.taskCode}
|
||||
</span>
|
||||
<span
|
||||
className={`text-[11px] px-2 py-0.5 rounded-lg font-bold border ${dept.bg} ${dept.text} ${dept.border}`}
|
||||
>
|
||||
{dept.label}
|
||||
</span>
|
||||
</div>
|
||||
<span
|
||||
className={`text-xs px-2.5 py-0.5 rounded-full font-semibold border ${dept.bg} ${dept.text} ${dept.border}`}
|
||||
>
|
||||
{dept.label}
|
||||
</span>
|
||||
<span
|
||||
className={`text-xs px-2.5 py-0.5 rounded-full border ${prio.badge}`}
|
||||
className={`text-[11px] px-2 py-0.5 rounded-lg font-bold border ${prio.badge}`}
|
||||
>
|
||||
{prio.label}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
{/* کد تسک دسکتاپ */}
|
||||
<div className="hidden md:flex items-center gap-2 mb-1">
|
||||
<span className="font-mono text-[11px] font-bold text-slate-500 bg-slate-100 px-1.5 py-0.5 rounded">
|
||||
<span className="font-mono text-[11px] font-bold text-slate-500 bg-slate-100 px-1.5 py-0.5 rounded border border-slate-200/60">
|
||||
{task.taskCode}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<strong className="block text-sm sm:text-base font-bold text-slate-900 leading-snug">
|
||||
{/* عنوان تسک */}
|
||||
<strong className="block text-sm sm:text-base font-black text-slate-900 leading-snug">
|
||||
{task.title}
|
||||
</strong>
|
||||
<p className="text-xs text-slate-500 line-clamp-2 md:line-clamp-1">{task.description}</p>
|
||||
<p className="text-xs text-slate-600 leading-relaxed line-clamp-2 md:line-clamp-1">
|
||||
{task.description}
|
||||
</p>
|
||||
</div>
|
||||
</td>
|
||||
|
||||
@@ -407,10 +447,11 @@ export default function CorporateTasksPage() {
|
||||
</td>
|
||||
|
||||
{/* وضعیت */}
|
||||
<td className="block md:table-cell p-0 md:p-3.5 py-2 md:py-3.5 align-top">
|
||||
<div className="flex items-center gap-2">
|
||||
<td className="block md:table-cell p-0 md:p-3.5 align-top">
|
||||
<div className="flex items-center justify-between md:justify-start gap-2">
|
||||
<span className="md:hidden text-xs text-slate-500 font-bold">وضعیت تسک:</span>
|
||||
<span
|
||||
className={`inline-flex items-center px-2.5 py-1 rounded-full text-xs font-semibold border ${stat.bg} ${stat.text} ${stat.border}`}
|
||||
className={`inline-flex items-center px-2.5 py-1 rounded-full text-xs font-bold border ${stat.bg} ${stat.text} ${stat.border}`}
|
||||
>
|
||||
{stat.label}
|
||||
</span>
|
||||
@@ -418,26 +459,33 @@ export default function CorporateTasksPage() {
|
||||
</td>
|
||||
|
||||
{/* ستون موضوعی */}
|
||||
<td className="block md:table-cell p-0 md:p-3.5 py-1 md:py-3.5 align-top text-xs text-slate-600">
|
||||
<span className="md:hidden font-semibold text-slate-400 ml-1">ستون: </span>
|
||||
<span>{task.targetPillar || 'عمومی'}</span>
|
||||
<td className="block md:table-cell p-0 md:p-3.5 align-top text-xs text-slate-600">
|
||||
<div className="flex items-center justify-between md:justify-start gap-1">
|
||||
<span className="md:hidden text-slate-500 font-bold">ستون موضوعی:</span>
|
||||
<span className="bg-slate-50 md:bg-transparent px-2 md:px-0 py-0.5 rounded text-slate-700 font-medium">
|
||||
{task.targetPillar || 'عمومی'}
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
|
||||
{/* تاریخ ثبت */}
|
||||
<td className="block md:table-cell p-0 md:p-3.5 py-1 md:py-3.5 align-top text-xs text-slate-500">
|
||||
<div className="flex items-center gap-1">
|
||||
<Calendar className="w-3.5 h-3.5 text-slate-400 md:hidden" />
|
||||
<span>{date(task.createdAt)}</span>
|
||||
<td className="block md:table-cell p-0 md:p-3.5 align-top text-xs text-slate-500">
|
||||
<div className="flex items-center justify-between md:justify-start gap-1">
|
||||
<span className="md:hidden text-slate-500 font-bold">زمان ثبت:</span>
|
||||
<div className="flex items-center gap-1 font-mono text-slate-600">
|
||||
<Calendar className="w-3.5 h-3.5 text-slate-400" />
|
||||
<span>{date(task.createdAt)}</span>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
|
||||
{/* دکمه عملیات */}
|
||||
<td className="block md:table-cell p-0 md:p-3.5 md:pl-5 pt-3 md:pt-3.5 align-top">
|
||||
<td className="block md:table-cell p-0 md:p-3.5 md:pl-5 pt-2 md:pt-3.5 align-top">
|
||||
<button
|
||||
className="w-full md:w-auto inline-flex items-center justify-center gap-2 px-3.5 py-2 rounded-xl text-xs sm:text-sm font-semibold text-slate-700 bg-slate-100 hover:bg-slate-200 border border-slate-200 shadow-sm active:scale-[0.98] transition-all cursor-pointer"
|
||||
className="w-full md:w-auto inline-flex items-center justify-center gap-2 px-4 py-2.5 md:py-2 rounded-xl text-xs sm:text-sm font-bold text-slate-800 bg-amber-50 hover:bg-amber-100 border border-amber-200/80 shadow-sm active:scale-[0.98] transition-all cursor-pointer"
|
||||
onClick={() => setDetailId(task.id)}
|
||||
>
|
||||
<Eye className="w-4 h-4 text-slate-600" />
|
||||
<Eye className="w-4 h-4 text-amber-700" />
|
||||
<span>جزئیات و مکالمات</span>
|
||||
</button>
|
||||
</td>
|
||||
|
||||
@@ -79,6 +79,7 @@ export interface TasksResponse {
|
||||
totalPages: number;
|
||||
hasNextPage: boolean;
|
||||
hasPrevPage: boolean;
|
||||
departmentCounts?: Record<string, number>;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user