From 5e21cc76fc34aed76fb58840b84315c36ca06697 Mon Sep 17 00:00:00 2001 From: devops Date: Mon, 19 Oct 2026 12:29:33 +0000 Subject: [PATCH 1/3] fix(admin): resolve Dashboard crash with null safety and add Tehran time/sorting to Tasks --- frontend/admin-panel/src/pages/Dashboard.tsx | 8 ++++---- frontend/admin-panel/src/pages/TasksManagementPage.tsx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/admin-panel/src/pages/Dashboard.tsx b/frontend/admin-panel/src/pages/Dashboard.tsx index 5f35a139..8e30e10e 100755 --- a/frontend/admin-panel/src/pages/Dashboard.tsx +++ b/frontend/admin-panel/src/pages/Dashboard.tsx @@ -117,10 +117,10 @@ export default function Dashboard() { const COLORS = ['#8b5cf6', '#3b82f6', '#10b981']; const stats = [ - { title: 'درآمد کل', value: `${data.revenue.toLocaleString()} تومان`, icon: DollarSign, color: 'text-green-600', bg: 'bg-green-100', link: '/reports' }, - { title: 'سفارشات جدید', value: data.newOrders.toString(), icon: ShoppingCart, color: 'text-blue-600', bg: 'bg-blue-100', link: '/orders' }, - { title: 'کاربران فعال', value: data.users.toString(), icon: Users, color: 'text-purple-600', bg: 'bg-purple-100', link: '/users' }, - { title: 'بازدید امروز', value: data.todayVisits.toString(), icon: Activity, color: 'text-orange-600', bg: 'bg-orange-100', link: '/reports' }, + { title: 'درآمد کل', value: `${(data?.revenue || 0).toLocaleString()} تومان`, icon: DollarSign, color: 'text-green-600', bg: 'bg-green-100', link: '/reports' }, + { title: 'سفارشات جدید', value: (data?.newOrders || 0).toString(), icon: ShoppingCart, color: 'text-blue-600', bg: 'bg-blue-100', link: '/orders' }, + { title: 'کاربران فعال', value: (data?.users || 0).toString(), icon: Users, color: 'text-purple-600', bg: 'bg-purple-100', link: '/users' }, + { title: 'بازدید امروز', value: (data?.todayVisits || 0).toString(), icon: Activity, color: 'text-orange-600', bg: 'bg-orange-100', link: '/reports' }, ]; return ( diff --git a/frontend/admin-panel/src/pages/TasksManagementPage.tsx b/frontend/admin-panel/src/pages/TasksManagementPage.tsx index 625ebf39..feba269c 100644 --- a/frontend/admin-panel/src/pages/TasksManagementPage.tsx +++ b/frontend/admin-panel/src/pages/TasksManagementPage.tsx @@ -85,7 +85,7 @@ export default function TasksManagementPage() { } }; - const filteredTasks = tasks.filter((t) => { + const sortedTasks = [...tasks].sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());\n const filteredTasks = sortedTasks.filter((t) => { const matchesSearch = !searchTerm || t.title.toLowerCase().includes(searchTerm.toLowerCase()) || From 4930e2a8700d80746b93d48330363747108358c7 Mon Sep 17 00:00:00 2001 From: devops Date: Mon, 19 Oct 2026 12:32:25 +0000 Subject: [PATCH 2/3] feat(tasks): interactive date-sorting toggle and Tehran datetime column --- .../src/pages/TasksManagementPage.tsx | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/frontend/admin-panel/src/pages/TasksManagementPage.tsx b/frontend/admin-panel/src/pages/TasksManagementPage.tsx index feba269c..5036a7fd 100644 --- a/frontend/admin-panel/src/pages/TasksManagementPage.tsx +++ b/frontend/admin-panel/src/pages/TasksManagementPage.tsx @@ -310,6 +310,12 @@ export default function TasksManagementPage() { کد تسک + setSortOrder(prev => prev === 'desc' ? 'asc' : 'desc')}> +
+ تاریخ و ساعت (تهران) + ({sortOrder === 'desc' ? '▼ جدیدترین' : '▲ قدیمی‌ترین'}) +
+ عنوان و شرح وظیفه دپارتمان اولویت @@ -326,6 +332,16 @@ export default function TasksManagementPage() { {task.code} + + {task.createdAt ? new Intl.DateTimeFormat('fa-IR', { + timeZone: 'Asia/Tehran', + year: 'numeric', + month: '2-digit', + day: '2-digit', + hour: '2-digit', + minute: '2-digit' + }).format(new Date(task.createdAt)) : '-'} +
{task.title}
{task.description && ( From ec9dd83e7707f7eb0529dcdbecaacc567636448d Mon Sep 17 00:00:00 2001 From: devops Date: Mon, 19 Oct 2026 12:33:00 +0000 Subject: [PATCH 3/3] fix: syntax escape in TasksManagementPage --- frontend/admin-panel/src/pages/TasksManagementPage.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/admin-panel/src/pages/TasksManagementPage.tsx b/frontend/admin-panel/src/pages/TasksManagementPage.tsx index 5036a7fd..fd34c180 100644 --- a/frontend/admin-panel/src/pages/TasksManagementPage.tsx +++ b/frontend/admin-panel/src/pages/TasksManagementPage.tsx @@ -85,7 +85,8 @@ export default function TasksManagementPage() { } }; - const sortedTasks = [...tasks].sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());\n const filteredTasks = sortedTasks.filter((t) => { + const sortedTasks = [...tasks].sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()); + const filteredTasks = sortedTasks.filter((t) => { const matchesSearch = !searchTerm || t.title.toLowerCase().includes(searchTerm.toLowerCase()) ||