From 458dfe66c22541acbe5bfdb71ac86c8da1fba2f0 Mon Sep 17 00:00:00 2001
From: Viet Anh Nguyen <nv.anh5@samsung.com>
Date: Tue, 6 Feb 2024 13:36:43 +0700
Subject: [PATCH] Minor UI improvements

---
 .../report-detail/report-overview-table.tsx    |  3 ++-
 cope2n-fe/src/pages/dashboard/index.tsx        |  6 ------
 .../src/pages/reports/report_detail/index.tsx  | 18 +++++++++++++++---
 3 files changed, 17 insertions(+), 10 deletions(-)

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 5f0f1c1..243742b 100644
--- a/cope2n-fe/src/components/report-detail/report-overview-table.tsx
+++ b/cope2n-fe/src/components/report-detail/report-overview-table.tsx
@@ -48,7 +48,7 @@ const columns: TableColumnsType<DataType> = [
     title: 'OCR extraction date',
     dataIndex: 'extractionDate',
     key: 'extractionDate',
-    width: '130px',
+    width: 180,
     render: (_, record) => {
       if (record.extractionDate.includes('Subtotal'))
         return (
@@ -262,6 +262,7 @@ const ReportOverViewTable: React.FC<ReportOverViewTableProps> = ({
         bordered
         size='small'
         scroll={{ x: 2000 }}
+        pagination={false} 
       />
     </div>
   );
diff --git a/cope2n-fe/src/pages/dashboard/index.tsx b/cope2n-fe/src/pages/dashboard/index.tsx
index 3924e6f..6d998cf 100644
--- a/cope2n-fe/src/pages/dashboard/index.tsx
+++ b/cope2n-fe/src/pages/dashboard/index.tsx
@@ -107,12 +107,6 @@ const Dashboard = () => {
             }}
           />
         </Form.Item>
-        <Form.Item>
-          <Button type='primary' style={{ height: 38 }}
-          >
-            View
-          </Button>
-        </Form.Item>
       </Form>
       <ReportOverViewTable
         isLoading={isLoading}
diff --git a/cope2n-fe/src/pages/reports/report_detail/index.tsx b/cope2n-fe/src/pages/reports/report_detail/index.tsx
index d6ae296..970e0c9 100644
--- a/cope2n-fe/src/pages/reports/report_detail/index.tsx
+++ b/cope2n-fe/src/pages/reports/report_detail/index.tsx
@@ -14,7 +14,7 @@ import { useEffect, useState } from 'react';
 import { useParams } from 'react-router-dom';
 import { downloadReport } from 'request/report';
 import styled from 'styled-components';
-import { SheetViewer } from "react-office-viewer"
+import { SheetViewer } from "react-office-viewer";
 
 export interface ReportFormValues {
   dateRange: [Dayjs, Dayjs];
@@ -138,9 +138,21 @@ const ReportDetail = () => {
         </Typography.Title>
       </HeaderContainer>
       <ReportContainer>
-        {(fileObject && !error) && <SheetViewer file={fileObject} />}
+        {(fileObject && !error) && <>
+          <div style={{ width: '100%', marginBottom: '10px' }}>
+            <b>Note: </b><i>All changes here will not be saved into server.</i>
+          </div>
+          <SheetViewer file={fileObject} />
+        </>}
         {(!fileObject && !error) && <Typography.Title level={5}>Loading...</Typography.Title>}
-        {error && <Typography.Title level={5}>{error}</Typography.Title>}
+        {error && <>
+          <Typography.Title level={5}>
+          {error}</Typography.Title>
+          <div>Try downloading the file:</div>
+           <a href={fileObject.url} download={fileObject.name}>
+             {fileObject.name}
+           </a>
+        </>}
       </ReportContainer>
     </>
   );