Merge branch 'master' into Paging_Enhancement

# Conflicts:
#	src/pages/Organization/DetailPage/OrganizationCard.js

src/pages/Organization/DetailPage/OrganizationCard.js

@@ -42,6 +42,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
     const [errorMsg, setErrorMsg] = useState("");
     const [minDate] = React.useState(new Date().setDate(new Date().getDate() + 1));
     const [fromDate, setFromDate] = React.useState(null);
+    const [currentFromDate, setCurrentFromDate] = React.useState(null);
     const [fromDateValue, setFromDateValue] = React.useState(null);
     const {register, handleSubmit, reset} = useForm()
 
@@ -53,11 +54,14 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
         //if state data are ready and assign to different field
         // console.log(currentApplicationDetailData)
         if (Object.keys(currentUserData).length > 0) {
+            console.log(currentUserData)
             if(DateUtils.dateValue(currentUserData.brExpiryDate)>DateUtils.dateValue(minDate)){
                 setFromDate(currentUserData.brExpiryDate);
             }else{
-                setErrorMsg("Please select a date after today.")
+                setCurrentFromDate(currentUserData.brExpiryDate);
+                // setErrorMsg("Please select a date after today.")
             }
+            
             setOnReady(true);
         }
     }, [currentUserData]);
@@ -80,7 +84,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
         validationSchema: yup.object().shape({
             enCompanyName: yup.string().max(255, getMaxErrStr(255)).required(displayErrorMsg(intl.formatMessage({ id: 'userRequireEnglishName' }))),
             chCompanyName: yup.string().max(255, displayErrorMsg(intl.formatMessage({ id: 'userRequireChineseName' }))).nullable(),
-            orgShortName: yup.string().max(24, getMaxErrStr(24)).required(getRequiredErrStr("Org. Short Name")),
+            orgShortName: yup.string().max(24, getMaxErrStr(24)).required(getRequiredErrStr("orgShortName")),
             addressLine1: yup.string().max(40, getMaxErrStr(40)).required(displayErrorMsg(intl.formatMessage({ id: 'validateAddressLine1' }))),
             addressLine2: yup.string().max(40, getMaxErrStr(40)),
             addressLine3: yup.string().max(40, getMaxErrStr(40)),
@@ -101,7 +105,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                 }
             }),
         }),
-        onSubmit: values => {
+        onSubmit: (values) => {
             if (values.country == null) {
                 setErrorMsg(intl.formatMessage({ id: 'pleaseFillInCountry' }))
             } else {
@@ -119,7 +123,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                                 id: id > 0 ? id : null,
                                 enCompanyName: values.enCompanyName,
                                 chCompanyName: values.chCompanyName,
-                                orgShortName: values.creditor?values.orgShortName:"",
+                                orgShortName: values.orgShortName==="N/A"?"":values.orgShortName,
                                 brNo: values.brNo,
                                 // brExpiryDate: values.brExpiryDate,
                                 brExpiryDate: sentDateFrom,
@@ -184,9 +188,9 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
 
     const onSubmit = (data) => {
         let sentOrgShortName = "";
-        if (data.orgShortName != null && data.orgShortName != "") {
-            sentOrgShortName = data.orgShortName
-            if (sentOrgShortName.length <= 24) {
+        if(data.orgShortName!=null && data.orgShortName!="" && data.orgShortName!="N/A"){
+            sentOrgShortName = data.orgShortName 
+            if (sentOrgShortName.length <=24){
                 const temp = {
                     orgShortName: sentOrgShortName,
                 };
@@ -392,59 +396,61 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                                     <Typography variant="pnspsFormParagraphBold">{FieldUtils.notNullFieldLabel("Expiry Date:")}</Typography>
                                 </Grid>
                                 <Grid item xs={12} md={6} lg={6}>
-                                    <LocalizationProvider dateAdapter={AdapterDayjs}>
-                                        <DemoItem  components={['DatePicker']}>
-                                            <DatePicker
-                                                id="brExpiryDate"
-                                                name="brExpiryDate"
-                                                // onError={Boolean(formik.errors["brExpiryDate"])}
-                                                slotProps={{
-                                                    field: { readOnly: true, },
-                                                    textField: {
-                                                        helperText:fromDate == null ? intl.formatMessage({ id: 'pleaseFillInBusinessRegCertValidityDate' }):""
-                                                    },
-                                                }}
-                                                format="DD/MM/YYYY"
-                                                // label={"Submit Date (From)"}
-                                                value={fromDate == null ? null : dayjs(fromDate)}
-                                                minDate={minDate == null ? null : dayjs(minDate)}
-                                                disabled={(!editMode && !createMode)}
-                                                onChange={(newValue) => {
-                                                    setErrorMsg("")
-                                                    if(DateUtils.dateValue(newValue)>DateUtils.dateValue(new Date())){
-                                                        setFromDate(newValue);
-                                                    }else{
-                                                        setErrorMsg("Please select a date after today.")
-                                                    }
-                                                }}
-                                            />
-                                        </DemoItem >
-                                    </LocalizationProvider>
-                                    {/* <TextField
-                                        fullWidth
-                                        id="brExpiryDate"
-                                        type="date"
-                                        name="brExpiryDate"
-                                        error={Boolean(formik.errors["brExpiryDate"])}
-                                        helperText={formik.errors["brExpiryDate"] ? formik.errors["brExpiryDate"] : ''}
-                                        defaultValue={fromDate}
-                                        InputProps={{
-                                            inputComponent: FormDateInputComponent,
-                                        }}
-                                        onChange={(newValue) => {
-                                            if (newValue.target.value > DateUtils.dateValue(minDate)) {
-                                                setFromDate(newValue.target.value);
-                                            } else {
-                                                alert("Please select a date after today.")
-                                            }
-                                        }}
-                                        InputLabelProps={{
-                                            shrink: true
-                                        }}
-                                        disabled={(!editMode && !createMode)}
-                                        sx={{ "& .MuiInputBase-input": {display:"block", textIndent: "-9999px"} }}
-                                    /> */}
+                                    {(!editMode && !createMode)?
+                                        <TextField
+                                            fullWidth
+                                            id="currentExDate"
+                                            // error={(fromDate===null)}
+                                            // type="date"
+                                            name="currentExDate"
+                                            value={fromDate!=null?DateUtils.dateStr(fromDate):DateUtils.dateStr(currentFromDate)}
+                                            disabled={true}
+                                        />:
+                                        <LocalizationProvider dateAdapter={AdapterDayjs}>
+                                            <DemoItem  components={['DatePicker']}>
+                                                <DatePicker
+                                                    id="brExpiryDate"
+                                                    name="brExpiryDate"
+                                                    // error={fromDate===null}
+                                                    slotProps={{
+                                                        field: { readOnly: true, },
+                                                        // textField: {
+                                                        //     helperText:fromDate == null ? intl.formatMessage({ id: 'pleaseFillInBusinessRegCertValidityDate' }):""
+                                                        // },
+                                                    }}
+                                                    format="DD/MM/YYYY"
+                                                    // label={"Submit Date (From)"}
+                                                    value={fromDate == null ? null : dayjs(fromDate)}
+                                                    minDate={minDate == null ? null : dayjs(minDate)}
+                                                    disabled={(!editMode && !createMode)}
+                                                    onChange={(newValue) => {
+                                                        // console.log(newValue)
+                                                        // setErrorMsg("")
+                                                        if(DateUtils.dateValue(newValue)>DateUtils.dateValue(new Date())){
+                                                            setFromDate(newValue);
+                                                        }else{
+                                                            // setErrorMsg("Please select a date after today.")
+                                                        }
+                                                    }}
+                                                />
+                                            </DemoItem >
+                                        </LocalizationProvider>
+                                    }
                                 </Grid>
+                                {
+                                    fromDate==null?
+                                        (!editMode && !createMode)?
+                                            <FormHelperText error id="helper-text-date">
+                                                Please select a date after today.
+                                            </FormHelperText>
+                                        :
+                                            <FormHelperText error id="helper-text-date">
+                                                {intl.formatMessage({ id: 'pleaseFillInBusinessRegCertValidityDate' })}
+                                            </FormHelperText>
+                                    :
+                                        null
+                                        
+                                }   
                             </Grid>
 
                         </Grid>
@@ -560,7 +566,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                                         {...register("orgShortName")}
                                         id='orgShortName'
                                         label="Organisation Short Name"
-                                        defaultValue={currentUserData.orgShortName}
+                                        defaultValue={currentUserData.orgShortName!="N/A"?currentUserData.orgShortName:""}
                                         InputLabelProps={{
                                             shrink: true
                                         }}

src/pages/Organization/DetailPage/index.js

@@ -85,7 +85,7 @@ const OrganizationDetailPage = () => {
                         response.data["fax_countryCode"] = response.data.faxNo?.countryCode;
     
                         response.data["brExpiryDate"] = response.data.brExpiryDate ? DateUtils.dateValue(response.data.brExpiryDate) : "";
-                        response.data["orgShortName"] = response.data.orgShortName !=null ? response.data.orgShortName : "";
+                        response.data["orgShortName"] = response.data.orgShortName ? response.data.orgShortName : "N/A" ;
                         setFormData(response.data)
                         setList(response.historyList)
                     }
@@ -110,7 +110,7 @@ const OrganizationDetailPage = () => {
                     response.data["faxNumber"] = response.data.faxNo?.faxNumber;
                     response.data["fax_countryCode"] = response.data.faxNo?.countryCode;
 
-                    response.data["brExpiryDate"] = response.data.brExpiryDate ? DateUtils.dateStr(response.data.brExpiryDate) : "";
+                    response.data["brExpiryDate"] = response.data.brExpiryDate ? DateUtils.dateStr(response.data.brExpiryDate) : "" ;
                     setFormData(response.data)
                     setList(response.historyList)
                 }

src/translations/en.json

@@ -195,6 +195,7 @@
   "userEmailAddress": "Email Address",
   "userPhoneNumber": "Mobile Phone Number",
   "userAddress": "Address",
+  "orgShortName":"Org. Short Name",
 
   "personalInformation": "Personal Information",
   "yourPersonalInformation": "Your Personal Information",