diff --git a/backend/src/admin/hermes/corporate.service.ts b/backend/src/admin/hermes/corporate.service.ts index 4bf68d65..2401514d 100644 --- a/backend/src/admin/hermes/corporate.service.ts +++ b/backend/src/admin/hermes/corporate.service.ts @@ -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 = {}; + 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 }, ); diff --git a/frontend/admin-panel/src/pages/CorporateTasksPage.tsx b/frontend/admin-panel/src/pages/CorporateTasksPage.tsx index 9d526a14..f9199a12 100644 --- a/frontend/admin-panel/src/pages/CorporateTasksPage.tsx +++ b/frontend/admin-panel/src/pages/CorporateTasksPage.tsx @@ -23,6 +23,7 @@ import { type TaskDepartment, type TaskPriority, type TaskStatus, + type TasksResponse, } from '../services/hermesApi'; const deptConfig: Record = { @@ -58,7 +59,8 @@ const date = (val?: string | null) => export default function CorporateTasksPage() { const [tasks, setTasks] = useState([]); const [page, setPage] = useState(1); - const [meta, setMeta] = useState({ total: 0, totalPages: 0, hasNextPage: false, hasPrevPage: false }); + const [meta, setMeta] = useState({ total: 0, totalPages: 0, hasNextPage: false, hasPrevPage: false, page: 1, limit: 10 }); + const [deptCounts, setDeptCounts] = useState>({}); 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() { {error &&

وظایف در دسترس نیست؛ دریافت از سرور ناموفق بود.

} - {/* خلاصه ظرفیت دپارتمان‌ها */} -
+ {/* تب‌ها و فیلتر دپارتمان‌ها */} +
+ + {(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 ( -
{ 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' }`} > -
- {cfg.label} (این صفحه) - - {error || loading ? 'ناموجود' : count} +
+ + {cfg.label} + + + {error ? '—' : count}
-
+ ); })}
@@ -307,7 +340,7 @@ export default function CorporateTasksPage() { )} {/* لیست وظایف (سازگار با موبایل و دسکتاپ) */} -
+
@@ -321,10 +354,10 @@ export default function CorporateTasksPage() { )} - + {!loading && !error && tasks.length === 0 && ( - - + {/* کد و عنوان */} - @@ -407,10 +447,11 @@ export default function CorporateTasksPage() { {/* وضعیت */} - {/* ستون موضوعی */} - {/* تاریخ ثبت */} - {/* دکمه عملیات */} - diff --git a/frontend/admin-panel/src/services/hermesApi.ts b/frontend/admin-panel/src/services/hermesApi.ts index 0fb86d9a..91ccd7c1 100644 --- a/frontend/admin-panel/src/services/hermesApi.ts +++ b/frontend/admin-panel/src/services/hermesApi.ts @@ -79,6 +79,7 @@ export interface TasksResponse { totalPages: number; hasNextPage: boolean; hasPrevPage: boolean; + departmentCounts?: Record; }; }
وظایف دپارتمان‌های کنینا
+

تسک فعالی با این فیلترها یافت نشد.

@@ -354,37 +387,44 @@ export default function CorporateTasksPage() { return (
-
-
- - {task.taskCode} - +
+
+ {/* بج‌های بالای کارت موبایل */} +
+
+ + {task.taskCode} + + + {dept.label} + +
- {dept.label} - - {prio.label}
+ {/* کد تسک دسکتاپ */}
- + {task.taskCode}
- + {/* عنوان تسک */} + {task.title} -

{task.description}

+

+ {task.description} +

-
+
+
+ وضعیت تسک: {stat.label} @@ -418,26 +459,33 @@ export default function CorporateTasksPage() {
- ستون: - {task.targetPillar || 'عمومی'} + +
+ ستون موضوعی: + + {task.targetPillar || 'عمومی'} + +
-
- - {date(task.createdAt)} +
+
+ زمان ثبت: +
+ + {date(task.createdAt)} +
+