From 74174618db945e8e31343cb4495dd4231f4d1ef7 Mon Sep 17 00:00:00 2001 From: Senthamilselvi Date: Thu, 6 Nov 2025 17:21:40 +0530 Subject: [PATCH] new updates & survey quater dropdown values updated --- .../src/components/admin/SubmissionTable.jsx | 4 ++-- .../src/pages/Admin/AdminDashboard.jsx | 17 +++++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ipi-survey-platform/src/components/admin/SubmissionTable.jsx b/ipi-survey-platform/src/components/admin/SubmissionTable.jsx index 054b2fe..5229c97 100644 --- a/ipi-survey-platform/src/components/admin/SubmissionTable.jsx +++ b/ipi-survey-platform/src/components/admin/SubmissionTable.jsx @@ -140,11 +140,11 @@ const SubmissionTable = ({ selectedQuarter, selectedYear }) => { }} >
-
+ {/*

{titleText}

-
+
*/} {loading ? (
diff --git a/ipi-survey-platform/src/pages/Admin/AdminDashboard.jsx b/ipi-survey-platform/src/pages/Admin/AdminDashboard.jsx index f39ff2b..c3b5026 100644 --- a/ipi-survey-platform/src/pages/Admin/AdminDashboard.jsx +++ b/ipi-survey-platform/src/pages/Admin/AdminDashboard.jsx @@ -29,9 +29,11 @@ const AdminDashboard = () => { try { setLoading(true); const response = await apiClient.get('/admin_dashboard'); + const data = response?.data?.summary || {}; - // const notStartedCombined = (data.not_started || 0) + (data.overdue || 0); - + const selectedQuarterFromApi = response?.data?.selected_quarter || 'All'; + const selectedYearFromApi = response?.data?.selected_year || 'All'; + setSummary({ total_establishments: data.total_establishments || 0, submitted: data.submitted || 0, @@ -40,15 +42,18 @@ const AdminDashboard = () => { not_started: data.not_started || 0, pending: data.pending || 0, }); + + setSelectedQuarter(selectedQuarterFromApi); + setSelectedYear(selectedYearFromApi); } catch (error) { console.error('Error fetching dashboard summary:', error); } finally { setLoading(false); } }; - + fetchDashboardData(); - }, []); + }, []); return (
@@ -70,7 +75,7 @@ const AdminDashboard = () => { onChange={(e) => setSelectedQuarter(e.target.value)} className="border border-[#D0D5DD] rounded-md h-8 px-2 text-sm focus:outline-none focus:ring-1 focus:ring-[#92722A]" > - + {/* */} @@ -82,7 +87,7 @@ const AdminDashboard = () => { onChange={(e) => setSelectedYear(e.target.value)} className="border border-[#D0D5DD] rounded-md h-8 px-2 text-sm focus:outline-none focus:ring-1 focus:ring-[#92722A]" > - + {/* */}