SS-FCSC/fcsc_ipi_frontend
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

admin dashoard & submission table empty column data added

Browse Source
This commit is contained in:
Senthamilselvi 2025-11-03 10:46:20 +05:30
parent 9d473ecaa8
commit aca131ae33
2 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ipi-survey-platform/src/components/admin/SubmissionTable.jsx
View File

@ -74,7 +74,7 @@ const SubmissionTable = ({ selectedQuarter, selectedYear }) => {
'Submission Date & Time', 'Submission Date & Time',
'Status', 'Status',
'Reviewer', 'Reviewer',
'Reviewer On', 'Reviewed On',
'Actions', 'Actions',
]; ];
@ -107,17 +107,22 @@ const SubmissionTable = ({ selectedQuarter, selectedYear }) => {
} }
}; };
const userProfile = JSON.parse(sessionStorage.getItem("user_profile"));
const tableRows = filtered.map((item) => [ const tableRows = filtered.map((item) => [
item?.establishment?.factory_name || '-', item?.establishment?.factory_name || '-',
item?.establishment?.establishment_emirate?.name || '-', item?.establishment?.establishment_emirate?.name || '-',
item?.year || '-', item?.year || '-',
item?.quarter || '-', item?.quarter || '-',
item?.product_count || '-', item?.product_count || '-',
item?.created_by || '-', // item?.created_by || '-',
userProfile?.name || '-',
<span className="whitespace-nowrap">{formatDate(item?.created_at)}</span>, <span className="whitespace-nowrap">{formatDate(item?.created_at)}</span>,
renderStatusBadge(item?.status), renderStatusBadge(item?.status),
item?.updated_by || '-', // item?.updated_by || '-',
<span className="whitespace-nowrap">{formatDate(item?.updated_at)}</span>, userProfile?.name || '-',
// <span className="whitespace-nowrap">{formatDate(item?.updated_at)}</span>,
<span className="whitespace-nowrap">{formatDate(item?.created_at)}</span>,
<div className="flex items-center justify-center gap-[10px]"> <div className="flex items-center justify-center gap-[10px]">
<div className="relative group"> <div className="relative group">
<CheckCircle2 size={22} className="text-green-600 cursor-pointer hover:scale-110 transition-transform" /> <CheckCircle2 size={22} className="text-green-600 cursor-pointer hover:scale-110 transition-transform" />
@ -146,6 +151,7 @@ const SubmissionTable = ({ selectedQuarter, selectedYear }) => {
</div>, </div>,
]); ]);
const columnWidths = [240, 120, 100, 100, 130, 150, 180, 150, 150, 180, 120]; const columnWidths = [240, 120, 100, 100, 130, 150, 180, 150, 150, 180, 120];
return ( return (

13
ipi-survey-platform/src/pages/Admin/Validations.jsx
View File

@ -107,7 +107,7 @@ const ManageSubmissions = () => {
try { try {
const result = await getSubmissions(); const result = await getSubmissions();
const data = result?.status === 'success' ? result.data : result; const data = result?.status === 'success' ? result.data : result;
const userProfile = JSON.parse(sessionStorage.getItem("user_profile"));
const mapped = (data || []).map((item) => ({ const mapped = (data || []).map((item) => ({
id: item.id, id: item.id,
establishment: item?.establishment?.factory_name || '-', establishment: item?.establishment?.factory_name || '-',
@ -115,11 +115,14 @@ const ManageSubmissions = () => {
year: String(item.year ?? '-'), year: String(item.year ?? '-'),
quarter: item.quarter ?? '-', quarter: item.quarter ?? '-',
products: item?.product_count || '-', products: item?.product_count || '-',
submittedBy: item.created_by ?? '-', // submittedBy: item.created_by ?? '-',
submittedBy: userProfile?.name || '-',
submittedAt: formatDateTime(item.created_at), submittedAt: formatDateTime(item.created_at),
status: item.status ?? '-', status: item.status ?? '-',
reviewer: item?.updated_by || '-', // reviewer: item?.updated_by || '-',
reviewerOn: formatDateTime(item?.updated_at), reviewer: userProfile?.name || '-',
// reviewerOn: formatDateTime(item?.updated_at),
reviewerOn: formatDateTime(item.created_at),
})); }));
setSubmissions(mapped); setSubmissions(mapped);
@ -190,7 +193,7 @@ const ManageSubmissions = () => {
item, item,
]); ]);
const columnWidths = [302, 105, 83, 91, 100, 152, 208, 120, 104, 140, 130]; const columnWidths = [302, 105, 83, 91, 100, 152, 208, 120, 120, 208, 130];
const toolbar = ( const toolbar = (
<div className="px-6 pt-6 pb-5 space-y-4"> <div className="px-6 pt-6 pb-5 space-y-4">