From e4a3c1735c1c892ce0005757a1de2628c1fb3da0 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Thu, 31 Aug 2023 14:23:37 +0800
Subject: [PATCH] fix bug

---
 .../OrganizationCard_loadFromUser.js          | 10 +++----
 .../UserInformationCard_Organization.js       | 27 ++++++++++++-------
 src/pages/pnspsUserSearchPage/UserTable.js    | 19 -------------
 src/utils/DateUtils.js                        |  4 +--
 4 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/src/pages/OrganizationDetailPage_FromUser/OrganizationCard_loadFromUser.js b/src/pages/OrganizationDetailPage_FromUser/OrganizationCard_loadFromUser.js
index 2fac9e8..8c4d14c 100644
--- a/src/pages/OrganizationDetailPage_FromUser/OrganizationCard_loadFromUser.js
+++ b/src/pages/OrganizationDetailPage_FromUser/OrganizationCard_loadFromUser.js
@@ -2,14 +2,13 @@
 import {
     Grid, TextField, Typography, Button
 } from '@mui/material';
-import { DatePicker } from '@mui/x-date-pickers/DatePicker';
 import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
 import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
 import MainCard from "../../components/MainCard";
 import * as React from "react";
 import {useForm} from "react-hook-form";
 import {useEffect, useState} from "react";
-//import * as DateUtils from '../../utils/DateUtils';
+import * as DateUtils from '../../utils/DateUtils';
 import * as HttpUtils from '../../utils/HttpUtils';
 import * as UrlUtils from "../../utils/ApiPathConst";
 import {useNavigate} from "react-router-dom";
@@ -39,7 +38,7 @@ const OrganizationCard_loadFromUser = ({userData, id}) => {
             userData["faxNumber"] = userData.faxNo?.faxNumber;
             userData["fax_countryCode"] = userData.faxNo?.countryCode;
 
-            userData["brExpiryDate"] = userData.brExpiryDate?userData.brExpiryDate: "";
+            userData["brExpiryDate"] = userData.brExpiryDate?DateUtils.dateStr(userData.brExpiryDate): "";
             userData["brExpiryDateTemp"] = userData.brExpiryDateTemp?userData.brExpiryDate: "";
         }else{
             setCreateMode(id==0);
@@ -192,13 +191,10 @@ const OrganizationCard_loadFromUser = ({userData, id}) => {
 
                                 <Grid item xs={7} s={7} md={7} lg={6}>
                                 <LocalizationProvider fullWidth dateAdapter={AdapterDayjs}>
-                                 
-                                    <DatePicker
+                                    <TextField
                                         fullWidth
                                         {...register("brExpiryDate")}
                                         id='brExpiryDate'
-                                        name='brExpiryDate'
-                             
                                     />
                                     </LocalizationProvider>
                                 </Grid>
diff --git a/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js b/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js
index a36d9a1..969599a 100644
--- a/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js
+++ b/src/pages/pnspsUserDetailPage_Organization/UserInformationCard_Organization.js
@@ -1,7 +1,8 @@
 // material-ui
 import {
     Grid, TextField, Typography, Button,
-    OutlinedInput, FormHelperText, Autocomplete
+    Autocomplete,
+   // OutlinedInput, FormHelperText
 } from '@mui/material';
 import MainCard from "../../components/MainCard";
 import * as React from "react";
@@ -76,7 +77,7 @@ const UserInformationCard_Organization = ({userData, loadDataFun}) => {
         userData["faxNumber"] = userData.faxNo?.faxNumber;
         userData["fax_countryCode"] = userData.faxNo?.countryCode;
 
-        userData["brExpiryDate"] = userData.brExpiryDate?DateUtils.convertToDate(brExpiryDate):"";
+        userData["brExpiryDate"] = userData.brExpiryDate?DateUtils.dateStr(brExpiryDate):"";
 
 
         setDistrict(userData.district);
@@ -121,7 +122,7 @@ const UserInformationCard_Organization = ({userData, loadDataFun}) => {
                 chCompanyName: _data.chCompanyName,
                 emailVerifyHash: orgId,
                 brNo: _data.brNo,
-                brExpiryDate: formik.values.brExpiryDate,
+                //brExpiryDate: _data.brExpiryDate,
 
             },
             onSuccess: function(){
@@ -669,6 +670,13 @@ const UserInformationCard_Organization = ({userData, loadDataFun}) => {
                                 </Grid>
 
                                 <Grid item xs={7} s={7} md={7} lg={6}>
+                                <TextField
+                                        fullWidth
+                                        {...register("brExpiryDate")}
+                                        id='brExpiryDate'
+                                        disabled={!editMode}
+                                    />
+                                    {/* {
                                     <OutlinedInput
                                             fullWidth
                                             disabled={!editMode}
@@ -677,7 +685,7 @@ const UserInformationCard_Organization = ({userData, loadDataFun}) => {
                                             id="brExpiryDate"
                                             type="date"
                                             value={formik.values.brExpiryDate}
-                                            format="dd/MM/yyyy"
+                                            format="yyyy-MM-"
                                             name="brExpiryDate"
                                             onChange={formik.handleChange}
                                             placeholder="與與商業登記證相同如有"
@@ -689,11 +697,12 @@ const UserInformationCard_Organization = ({userData, loadDataFun}) => {
                                                 },
                                             }}
                                         />
-                                        {formik.touched.brExpiryDate && formik.errors.brExpiryDate && (
-                                            <FormHelperText error id="brExpiryDate">
-                                            {formik.errors.brExpiryDate}
-                                            </FormHelperText>
-                                        )}
+                                        // {formik.touched.brExpiryDate && formik.errors.brExpiryDate && (
+                                        //     <FormHelperText error id="brExpiryDate">
+                                        //     {formik.errors.brExpiryDate}
+                                        //     </FormHelperText>
+                                        // )}
+                                    } */}
                                 </Grid>
                             </Grid>
                         </Grid>
diff --git a/src/pages/pnspsUserSearchPage/UserTable.js b/src/pages/pnspsUserSearchPage/UserTable.js
index ed2ab25..95f838c 100644
--- a/src/pages/pnspsUserSearchPage/UserTable.js
+++ b/src/pages/pnspsUserSearchPage/UserTable.js
@@ -77,25 +77,6 @@ export default function UserTable({recordList}) {
             headerName: 'Sub-Division',
             flex: 1,
         },
-        {
-            id: 'lotusNotesUser',
-            field: 'lotusNotesUser',
-            type: 'bool',
-            headerName: 'Lotus Notes User',
-            flex: 1,
-            renderCell: (params) => {
-                return (
-                    <Checkbox
-                        theme={theme}
-                        key="locked"
-                        checked={params.row.lotusNotesUser}
-                        color="primary"
-                        size="small"
-                        //onChange={handleChange}
-                    />
-                );
-            },
-        },
         {
             id: 'locked',
             field: 'locked',
diff --git a/src/utils/DateUtils.js b/src/utils/DateUtils.js
index 0009fef..551cc01 100644
--- a/src/utils/DateUtils.js
+++ b/src/utils/DateUtils.js
@@ -7,7 +7,7 @@ export const datetimeStr = (date) =>{
 
 export const dateStr = (date) =>{
     date = convertToDate(date);
-    return dayjs(date).format("DD-MM-YYYY")
+    return dayjs(date).format("YYYY-MM-DD")
 };
 
 export const convertToDate = (date)=>{
@@ -15,7 +15,7 @@ export const convertToDate = (date)=>{
         return new Date(date[0],date[1],date[2],date[3],date[4],date[5]);
     }
     if(typeof date == 'number'){
-        return new Date(date);
+        return dayjs(date*1000);
     }
     return date;
 }
\ No newline at end of file