From acb7436ae45f7b28d56fe610f6c0b684a9f78143 Mon Sep 17 00:00:00 2001
From: Alex Cheung <alex.cheung@2fi-solutions.com.hk>
Date: Tue, 21 May 2024 14:47:44 +0800
Subject: [PATCH] fix bug

---
 .../Details_GLD/ApplicationDetailCard.js      | 26 ++++++++++++++++---
 src/pages/User/DetailPage/index.js            | 26 ++++++++++++++++---
 .../User/DetailsPage_Individual/index.js      |  4 +--
 .../User/DetailsPage_Organization/index.js    |  4 +--
 4 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js
index 84b880f..f6482d1 100644
--- a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js
+++ b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js
@@ -352,19 +352,39 @@ const ApplicationDetailCard = (
                                         </Grid>
                                     </Grid>
                                 </Grid>
-                                <Grid item xs={12} sm={12} md={5.5} lg={5.5} sx={{ mb: 1, ml: { md: 1, lg: 3 } }}>
+                                <Grid item xs={12} sm={12} md={5.5} lg={5} sx={{ mb: 1}}>
                                     <Grid container alignItems={"center"}>
-                                        <Grid item xs={12} md={4} lg={4}
+                                        <Grid item xs={12} md={3} lg={3}
                                             sx={{ display: 'flex', alignItems: 'center' }}>
                                             <FormLabel><Typography variant="h5">Status:</Typography></FormLabel>
                                         </Grid>
 
-                                        <Grid item xs={12} md={8} lg={8}>
+                                        <Grid item xs={12} md={9} lg={9}>
                                             <FormControl variant="outlined">
                                                 {StatusUtils.getStatusByTextEng(currentApplicationDetailData.status, currentApplicationDetailData.creditor)}
                                             </FormControl>
                                         </Grid>
                                     </Grid>
+                                    {
+                                        currentApplicationDetailData.reason ?
+                                            <Grid item xs={12} md={12} lg={12}>
+                                                <Grid container alignItems={"center"} direction="row" >
+
+                                                    <Grid item xs={12} md={3} lg={3}>
+                                                        <FormLabel><Typography variant="h5">Reason:</Typography></FormLabel>
+                                                    </Grid>
+                                                    <Grid item xs={12} md={9} lg={9}>
+                                                        <FormLabel>
+                                                            <Typography id='reason' variant="pnspsFormParagraph">
+                                                                {currentApplicationDetailData.reason}
+                                                            </Typography>
+                                                        </FormLabel>
+                                                    </Grid>
+
+                                                </Grid>
+                                            </Grid>
+                                            : ""
+                                    }
                                 </Grid>
                             </Grid>
                             <Grid container direction="row" justifyContent="flex-start"
diff --git a/src/pages/User/DetailPage/index.js b/src/pages/User/DetailPage/index.js
index 2386133..86c0570 100644
--- a/src/pages/User/DetailPage/index.js
+++ b/src/pages/User/DetailPage/index.js
@@ -5,7 +5,11 @@ import {
     Typography,
     Stack,
     Box,
+    Tab
 } from '@mui/material';
+import { TabPanel, TabContext, TabList } from '@mui/lab';
+import MainCard from "components/MainCard";
+
 import { useEffect, useState, lazy } from "react";
 import axios from "axios";
 import { useNavigate, useParams } from "react-router-dom";
@@ -56,6 +60,7 @@ const UserMaintainPage = () => {
     const [refUserData, setRefUserData] = useState({});
     const [editMode, setEditMode] = useState(false);
     const [createMode, setCreateMode] = useState(false);
+    const [selectedTab, setSelectedTab] = useState("1");
 
     function updateUserObject(userData) {
         setEditedCustomerData(userData);
@@ -74,6 +79,10 @@ const UserMaintainPage = () => {
         setIsCollectData(!isCollectData);
     }
 
+    const handleChange = (event, newValue) => {
+        setSelectedTab(newValue);
+    }
+
     // ==============================|| DELETE WINDOW RELATED ||============================== //
     const [isWindowOpen, setIsWindowOpen] = useState(false);
     const handleClose = () => {
@@ -390,9 +399,20 @@ const UserMaintainPage = () => {
                 </Grid>
                 <Grid item xs={12} md={12} lg={12}>
                     <Box xs={12} ml={2} mt={2} mr={3} sx={{ borderRadius: '10px', backgroundColor: '#fff' }}>
-                        <LoginGrid
-                            userId={params.id}
-                        />
+                        <MainCard elevation={0} border={false} content={false} sx={{maxWidth: '100%', mr:2, width: "-webkit-fill-available"}}>
+                            <TabContext value={selectedTab}>
+                                <Box sx={{ borderBottom: 1, borderColor: 'divider' }}>
+                                    <TabList  variant="scrollable" onChange={handleChange} aria-label="lab API tabs example">
+                                        <Tab label="Login Log" value="1" />
+                                    </TabList>
+                                </Box>
+                                <TabPanel value="1">
+                                    <LoginGrid
+                                        userId = {params.id}
+                                    />
+                                </TabPanel>
+                            </TabContext>
+                        </MainCard>
                     </Box>
                 </Grid>
             </Grid>
diff --git a/src/pages/User/DetailsPage_Individual/index.js b/src/pages/User/DetailsPage_Individual/index.js
index af6c517..3a1af5e 100644
--- a/src/pages/User/DetailsPage_Individual/index.js
+++ b/src/pages/User/DetailsPage_Individual/index.js
@@ -180,8 +180,8 @@ const UserMaintainPage_Individual = () => {
                                     <TabContext value={selectedTab}>
                                         <Box sx={{ borderBottom: 1, borderColor: 'divider' }}>
                                             <TabList  variant="scrollable" onChange={handleChange} aria-label="lab API tabs example">
-                                                <Tab label="Files" value="1" />
-                                                <Tab label="Login" value="2" />
+                                                <Tab label="Attachments" value="1" />
+                                                <Tab label="Login Log" value="2" />
                                             </TabList>
                                         </Box>
                                         <TabPanel value="1">
diff --git a/src/pages/User/DetailsPage_Organization/index.js b/src/pages/User/DetailsPage_Organization/index.js
index fce8a34..94843d2 100644
--- a/src/pages/User/DetailsPage_Organization/index.js
+++ b/src/pages/User/DetailsPage_Organization/index.js
@@ -249,8 +249,8 @@ const UserMaintainPage_Organization = () => {
                                     <TabContext value={selectedTab}>
                                         <Box sx={{ borderBottom: 1, borderColor: 'divider' }}>
                                             <TabList  variant="scrollable" onChange={handleChange} aria-label="lab API tabs example">
-                                                <Tab label="Files" value="1" />
-                                                <Tab label="Login" value="2" />
+                                                <Tab label="Attachments" value="1" />
+                                                <Tab label="Login Log" value="2" />
                                             </TabList>
                                         </Box>
                                         <TabPanel value="1">