|
@@ -307,13 +307,9 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) => |
|
|
); |
|
|
); |
|
|
return displayOptions; |
|
|
return displayOptions; |
|
|
}, |
|
|
}, |
|
|
<<<<<<< Updated upstream |
|
|
|
|
|
getOptionLabel: (item) => item ? typeof item === 'number' ? item + "" : (item["brNo"] ? |
|
|
getOptionLabel: (item) => item ? typeof item === 'number' ? item + "" : (item["brNo"] ? |
|
|
<div>BR No.: {item["brNo"]}<div>Org. Name(Eng): {item["enCompanyName"] === null ? "N/A" : item["enCompanyName"]}</div><div>Org. Name(CH): {item["chCompanyName"] === null ? "N/A" : item["chCompanyName"]}</div></div>: "") |
|
|
<div>BR No.: {item["brNo"]}<div>Org. Name(Eng): {item["enCompanyName"] === null ? "N/A" : item["enCompanyName"]}</div><div>Org. Name(CH): {item["chCompanyName"] === null ? "N/A" : item["chCompanyName"]}</div></div>: "") |
|
|
: "", |
|
|
: "", |
|
|
======= |
|
|
|
|
|
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) => { |
|
|
isOptionEqualToValue: (option, newValue, setValue, setInputValue) => { |
|
|
if (option.id == newValue || option.id == newValue.id) { |
|
|
if (option.id == newValue || option.id == newValue.id) { |
|
|
setValue(option); |
|
|
setValue(option); |
|
@@ -323,12 +319,7 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) => |
|
|
return option == newValue || option.id == newValue.id; |
|
|
return option == newValue || option.id == newValue.id; |
|
|
}, |
|
|
}, |
|
|
onInputChange: (event, newValue, setInputValue) => { |
|
|
onInputChange: (event, newValue, setInputValue) => { |
|
|
<<<<<<< Updated upstream |
|
|
|
|
|
if (newValue !== "[object Object]" ) { |
|
|
if (newValue !== "[object Object]" ) { |
|
|
======= |
|
|
|
|
|
console.log(newValue) |
|
|
|
|
|
if (newValue != null) { |
|
|
|
|
|
>>>>>>> Stashed changes |
|
|
|
|
|
setInputValue(newValue); |
|
|
setInputValue(newValue); |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|