diff --git a/cope2n-ai-fi/modules/sdsvkvu b/cope2n-ai-fi/modules/sdsvkvu index 6907ea0..b6d4fab 160000 --- a/cope2n-ai-fi/modules/sdsvkvu +++ b/cope2n-ai-fi/modules/sdsvkvu @@ -1 +1 @@ -Subproject commit 6907ea0183b141e3b4f3c21758c9123f1e9b2a27 +Subproject commit b6d4fab46f7f8689dd6b050cfbff2faa6a6f3fec diff --git a/cope2n-fe/src/components/report-detail/report-overview-table.tsx b/cope2n-fe/src/components/report-detail/report-overview-table.tsx index fa411c8..af544ed 100644 --- a/cope2n-fe/src/components/report-detail/report-overview-table.tsx +++ b/cope2n-fe/src/components/report-detail/report-overview-table.tsx @@ -272,10 +272,10 @@ const ReportOverViewTable: React.FC = ({ scroll={{ x: 2000 }} pagination={{ current: pagination.page, - pageSize: pagination.page_size, - total: overviewDataResponse?.page.count, - showTotal: (total, range) => - `${range[0]}-${range[1]} of ${total} items`, + pageSize: 10, + total: dataSubsRows?.length, + // showTotal: (total, range) => + // `${range[0]}-${range[1]} of ${total} items`, onChange: (page, pageSize) => { setPagination({ page, diff --git a/cope2n-fe/src/components/report-detail/report-table.tsx b/cope2n-fe/src/components/report-detail/report-table.tsx index 7983fd8..cf7f511 100644 --- a/cope2n-fe/src/components/report-detail/report-table.tsx +++ b/cope2n-fe/src/components/report-detail/report-table.tsx @@ -19,10 +19,10 @@ const ReportTable: React.FC = () => { })); const handleDownloadReport = async (report_id: string) => { - const reportFile = await downloadReport(report_id); + const {file, filename} = await downloadReport(report_id); const anchorElement = document.createElement('a'); - anchorElement.href = URL.createObjectURL(reportFile); - anchorElement.download = `${report_id}.xlsx`; // Set the desired new filename + anchorElement.href = URL.createObjectURL(file); + anchorElement.download = filename; document.body.appendChild(anchorElement); anchorElement.click(); @@ -43,6 +43,9 @@ const ReportTable: React.FC = () => { title: 'Created Date', dataIndex: 'Created Date', key: 'Created Date', + render: (_, record) => { + return {record['Created Date'].toString().split('T')[0]}; + }, }, { title: 'No. Requests', diff --git a/cope2n-fe/src/pages/dashboard/index.tsx b/cope2n-fe/src/pages/dashboard/index.tsx index 3b71a0c..a3522f0 100644 --- a/cope2n-fe/src/pages/dashboard/index.tsx +++ b/cope2n-fe/src/pages/dashboard/index.tsx @@ -32,6 +32,8 @@ const Dashboard = () => { start_date: fromData.start_date, end_date: fromData.end_date, subsidiary: fromData.subsidiary, + page: pagination.page, + page_size: 30, }); const handleSubmit = (values: ReportFormValues) => { console.log('check values >>>', values); diff --git a/cope2n-fe/src/pages/reports/report_detail/index.tsx b/cope2n-fe/src/pages/reports/report_detail/index.tsx index 443cf51..57d4eb7 100644 --- a/cope2n-fe/src/pages/reports/report_detail/index.tsx +++ b/cope2n-fe/src/pages/reports/report_detail/index.tsx @@ -258,10 +258,10 @@ const ReportDetail = () => { }); const report_data = data as ReportDetailList; const handleDownloadReport = async () => { - const reportFile = await downloadReport(id); + const {file, filename} = await downloadReport(id); const anchorElement = document.createElement('a'); - anchorElement.href = URL.createObjectURL(reportFile); - anchorElement.download = `${id}.xlsx`; // Set the desired new filename + anchorElement.href = URL.createObjectURL(file); + anchorElement.download = filename; document.body.appendChild(anchorElement); anchorElement.click(); @@ -302,13 +302,13 @@ const ReportDetail = () => { Start date:{' '} - {report_data?.metadata?.start_at} + {report_data?.metadata?.start_at.split('T')[0]} End date:{' '} - {report_data?.metadata?.end_at} + {report_data?.metadata?.end_at.split('T')[0]} diff --git a/cope2n-fe/src/request/report.ts b/cope2n-fe/src/request/report.ts index d068283..2b65a48 100644 --- a/cope2n-fe/src/request/report.ts +++ b/cope2n-fe/src/request/report.ts @@ -93,12 +93,23 @@ export async function downloadReport(report_id: string) { const response = await API.get(`/ctel/get_report_file/${report_id}/`, { responseType: 'blob', // Important }); + let filename = "report.xlsx"; + try { + let basename = response.headers['content-disposition'].split('filename=')[1].split('.')[0]; + let extension = response.headers['content-disposition'].split('.')[1].split(';')[0]; + filename = `${basename}.${extension}` + } catch(err) { + console.log(err); + } const file = new Blob([response.data], { type: 'application/vnd.ms-excel', }); // const fileURL = URL.createObjectURL(file); // window.open(fileURL); - return file; + return { + file: file, + filename: filename, + } } catch (error) { notification.error({ message: `${error?.message}`,