diff --git a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js index 825c857..443f80d 100644 --- a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js +++ b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js @@ -307,13 +307,9 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) => ); return displayOptions; }, -<<<<<<< Updated upstream getOptionLabel: (item) => item ? typeof item === 'number' ? item + "" : (item["brNo"] ?
BR No.: {item["brNo"]}
Org. Name(Eng): {item["enCompanyName"] === null ? "N/A" : item["enCompanyName"]}
Org. Name(CH): {item["chCompanyName"] === null ? "N/A" : item["chCompanyName"]}
: "") : "", -======= - getOptionLabel: (item) => item ? typeof item === 'number' ? item + "" : (item["brNo"] ? `BR No: ${item["brNo"]} \n Org Name: ${item["enCompanyName"]} BR Expiry Date: ${item["brExpiryDate"]}`: "") : "", ->>>>>>> Stashed changes isOptionEqualToValue: (option, newValue, setValue, setInputValue) => { if (option.id == newValue || option.id == newValue.id) { setValue(option); @@ -323,12 +319,7 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) => return option == newValue || option.id == newValue.id; }, onInputChange: (event, newValue, setInputValue) => { -<<<<<<< Updated upstream if (newValue !== "[object Object]" ) { -======= - console.log(newValue) - if (newValue != null) { ->>>>>>> Stashed changes setInputValue(newValue); } },