From 3303b333849b9ca5e7b9138d689152dde58ab10c Mon Sep 17 00:00:00 2001 From: Sriranjan Srivastava Date: Wed, 13 Mar 2024 09:03:41 +0530 Subject: [PATCH] removed mandtatory propety search --- .../citizen/SearchProperty/searchProperty.js | 6 ++ .../src/pageComponents/LocationDetails.js | 100 +++++++++++------- .../obps/src/pageComponents/OwnerDetails.js | 57 +++++----- 3 files changed, 93 insertions(+), 70 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/commonPt/src/pages/citizen/SearchProperty/searchProperty.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/commonPt/src/pages/citizen/SearchProperty/searchProperty.js index 3b4a34bf78c..49647ce1d6b 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/commonPt/src/pages/citizen/SearchProperty/searchProperty.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/commonPt/src/pages/citizen/SearchProperty/searchProperty.js @@ -649,9 +649,15 @@ setCityCode(city.code); onFormValueChange={onFormValueChange} cardStyle={{marginBottom:"0",maxWidth:"960px"}} > +
+ {t("CPT_REG_NEW_PROPERTY")} + {window.location.href.includes("/obps/bpa/") ? + {t("CORE_COMMON_SKIP_CONTINUE")} + :""} +
{showToast && ( formData?.address?.city || currCity ||propertyData.address.pincode || null); - const [street, setStreet] = useState(formData?.address?.street || propertyData.address.street||""); - const [landmark, setLandmark] = useState(formData?.address?.landmark || formData?.address?.Landmark || propertyData.address.landmark|| ""); + const [selectedCity, setSelectedCity] = useState(() => formData?.address?.city || currCity ||propertyData?.address?.pincode || null); + const [street, setStreet] = useState(formData?.address?.street || propertyData?.address?.street||""); + const [landmark, setLandmark] = useState(formData?.address?.landmark || formData?.address?.Landmark || propertyData?.address?.landmark|| ""); const [placeName, setplaceName] = useState(formData?.address?.placeName || formData?.placeName || ""); + const [localities, setLocalities] = useState(); + const [selectedLocality, setSelectedLocality] = useState(propertyData?.address?.locality||formData?.address?.locality ||null); //const { isLoading, data: citymodules } = Digit.Hooks.obps.useMDMS(stateId, "tenant", ["citymodule"]); let [cities, setcitiesopetions] = useState(allCities); let validation = { }; @@ -85,35 +87,39 @@ const LocationDetails = ({ t, config, onSelect, userType, formData, ownerIndex = let isSendBackTOCitizen = window.location.href.includes("sendbacktocitizen"); - const [localities, setLocalities] = useState(); - - const [selectedLocality, setSelectedLocality] = useState(propertyData.address.locality||formData.address.locality ||null); useEffect(() => { - // if (selectedCity && fetchedLocalities && !Pinerror) { - // let __localityList = fetchedLocalities; - // let filteredLocalityList = []; - // console.log("fetchedLocalities",fetchedLocalities) - // if (formData?.address?.locality && formData?.address?.locality?.code === selectedLocality?.code) { - // setSelectedLocality(formData.address.locality); - // } - - // if ((formData?.address?.pincode || pincode) && !Pinerror) { - // filteredLocalityList = __localityList.filter((obj) => obj.pincode?.find((item) => item == pincode)); - // if (!formData?.address?.locality && filteredLocalityList.length<=0) setSelectedLocality(); - // } - // if(!localities || (filteredLocalityList.length > 0 && localities.length !== filteredLocalityList.length) || (filteredLocalityList.length <=0 && localities && localities.length !==__localityList.length)) - // { - // console.log("filteredLocalityList",filteredLocalityList) - // setLocalities(() => (filteredLocalityList.length > 0 ? filteredLocalityList : __localityList)); - // } - // if (filteredLocalityList.length === 1 && ((selectedLocality == null) || (selectedLocality && filteredLocalityList[0]?.code !== selectedLocality?.code))) { - // setSelectedLocality(filteredLocalityList[0]); - // sessionStorage.setItem("currLocality", JSON.stringify(filteredLocalityList[0])); - // } - // } + if(!propertyData?.address?.locality) + { + if (selectedCity && fetchedLocalities && !Pinerror) { + let __localityList = fetchedLocalities; + let filteredLocalityList = []; + console.log("fetchedLocalities",fetchedLocalities) + if (formData?.address?.locality && formData?.address?.locality?.code === selectedLocality?.code) { + setSelectedLocality(formData.address.locality); + } + + if ((formData?.address?.pincode || pincode) && !Pinerror) { + filteredLocalityList = __localityList.filter((obj) => obj.pincode?.find((item) => item == pincode)); + if (!formData?.address?.locality && filteredLocalityList.length<=0) setSelectedLocality(); + } + if(!localities || (filteredLocalityList.length > 0 && localities.length !== filteredLocalityList.length) || (filteredLocalityList.length <=0 && localities && localities.length !==__localityList.length)) + { + console.log("filteredLocalityList",filteredLocalityList) + setLocalities(() => (filteredLocalityList.length > 0 ? filteredLocalityList : __localityList)); + } + if (filteredLocalityList.length === 1 && ((selectedLocality == null) || (selectedLocality && filteredLocalityList[0]?.code !== selectedLocality?.code))) { + setSelectedLocality(filteredLocalityList[0]); + sessionStorage.setItem("currLocality", JSON.stringify(filteredLocalityList[0])); + } + } + + } + else { + setSelectedLocality(propertyData?.address?.locality) + } + - setSelectedLocality(propertyData.address.locality) }, [selectedCity, formData?.pincode, fetchedLocalities, pincode,geoLocation]); @@ -251,7 +257,7 @@ const LocationDetails = ({ t, config, onSelect, userType, formData, ownerIndex = name="pincode" onChange={selectPincode} value={pincode} - disabled={true} + disabled={propertyData?.address ? true:false} />} {`${t("BPA_CITY_LABEL")}*`} {!isOpen && } - + {!isOpen && selectedCity && localities && !propertyData?.address ?( {`${t("BPA_LOC_MOHALLA_LABEL")}*`} - a.name.localeCompare(b.name))} + selectedOption={selectedLocality} optionKey="i18nkey" + onSelect={selectLocality} t={t} isDependent={true} labelKey={`${stringReplaceAll(selectedCity?.code,".","_").toUpperCase()}_REVENUE`} - disabled={true} + //disabled={isEdit} /> + ): + {`${t("BPA_LOC_MOHALLA_LABEL")}*`} + + } + {`${t("BPA_DETAILS_SRT_NAME_LABEL")}`} {!isOpen && } {`${t("ES_NEW_APPLICATION_LOCATION_LANDMARK")}`} {!isOpen && { const [genderList, setGenderList] = useState([]); const [ownershipCategory, setOwnershipCategory] = useState(formData?.owners?.ownershipCategory); const [name, setName] = useState(formData?.owners?.name || ""); - const [emailId, setEmail] = useState(formData?.owners?.emailId || ""); const [isPrimaryOwner, setisPrimaryOwner] = useState(false); const [gender, setGender] = useState(formData?.owners?.gender); const [mobileNumber, setMobileNumber] = useState(formData?.owners?.mobileNumber || ""); const [showToast, setShowToast] = useState(null); const [isDisable, setIsDisable] = useState(false); - const [ownerRoleCheck, setownerRoleCheck] = useState({}); let Webview = !Digit.Utils.browser.isMobile(); const ismultiple = ownershipCategory?.code.includes("MULTIPLEOWNERS") ? true : false; formData?.owners?.owners?.forEach(owner => { if(owner.isPrimaryOwner == "false" ) owner.isPrimaryOwner = false }) - let [fields, setFeilds] = useState( - (formData?.owners && formData?.owners?.owners) || [{ name: "",emailId:"", gender: "", mobileNumber: null, isPrimaryOwner: true }] + const [fields, setFeilds] = useState( + (formData?.owners && formData?.owners?.owners) || [{ name: "", gender: "", mobileNumber: null, isPrimaryOwner: true }] ); useEffect(() => { @@ -96,7 +94,7 @@ const OwnerDetails = ({ t, config, onSelect, userType, formData }) => { function handleAdd() { const values = [...fields]; - values.push({ name: "",emailId:"", gender: "", mobileNumber: null, isPrimaryOwner: false }); + values.push({ name: "", gender: "", mobileNumber: null, isPrimaryOwner: false }); setFeilds(values); setCanmovenext(true); @@ -328,7 +326,6 @@ const OwnerDetails = ({ t, config, onSelect, userType, formData }) => { // Additonal details payload.additionalDetails = {GISPlaceName:formData?.address?.placeName}; if (formData?.data?.holdingNumber) payload.additionalDetails.holdingNo = formData?.data?.holdingNumber; - //if (formData?.data?.boundaryWallLength) payload.additionalDetails.boundaryWallLength = formData?.data?.boundaryWallLength; if (formData?.data?.registrationDetails) payload.additionalDetails.registrationDetails = formData?.data?.registrationDetails; if (formData?.data?.applicationType) payload.additionalDetails.applicationType = formData?.data?.applicationType; if (formData?.data?.serviceType) payload.additionalDetails.serviceType = formData?.data?.serviceType; @@ -403,29 +400,31 @@ const OwnerDetails = ({ t, config, onSelect, userType, formData }) => { else return true; } -let propertyData =JSON.parse(sessionStorage.getItem("Digit_OBPS_PT")) -fields =propertyData.owners.map((owner) =>{ - let gender - if (owner.gender =="FEMALE") - { - gender={ - "code": "FEMALE", - "active": true, - "i18nKey": "COMMON_GENDER_FEMALE" + let propertyData =JSON.parse(sessionStorage.getItem("Digit_OBPS_PT")) +if(propertyData?.owners.length >0) +{ + fields = propertyData.owners.map((owner) => { + let gender + if (owner.gender == "FEMALE") { + gender = { + "code": "FEMALE", + "active": true, + "i18nKey": "COMMON_GENDER_FEMALE" + } + return { "name": owner.name, "emailId": owner.emailId, "mobileNumber": owner.mobileNumber, gender: gender, isPrimaryOwner } } - return {"name":owner.name,"emailId":owner.emailId, "mobileNumber":owner.mobileNumber, gender:gender,isPrimaryOwner} - } - else if (owner.gender =="MALE") - { - gender={ - "code": "MALE", - "active": true, - "i18nKey": "COMMON_GENDER_MALE" + else if (owner.gender == "MALE") { + gender = { + "code": "MALE", + "active": true, + "i18nKey": "COMMON_GENDER_MALE" + } + return { "name": owner.name, "emailId": owner.emailId, "mobileNumber": owner.mobileNumber, gender: gender, isPrimaryOwner } } - return {"name":owner.name, "emailId":owner.emailId, "mobileNumber":owner.mobileNumber, gender:gender,isPrimaryOwner} - } -}) + }) +} + useEffect(()=>{ let propertyData =JSON.parse(sessionStorage.getItem("Digit_OBPS_PT")) if(propertyData.owners.length == 1) @@ -465,7 +464,6 @@ useEffect(()=>{ value={ownershipCategory} labelKey="PT_OWNERSHIP" isDependent={true} - disabled = {true} /> {fields.map((field, index) => { @@ -496,7 +494,6 @@ useEffect(()=>{ type: "tel", title: t("CORE_COMMON_APPLICANT_MOBILE_NUMBER_INVALID"), })} - disabled={true} />
getOwnerDetails(index, e)}>
@@ -517,7 +514,6 @@ useEffect(()=>{ type: "text", title: t("TL_NAME_ERROR_MESSAGE"), })} - disabled={true} /> {`${t("BPA_APPLICANT_GENDER_LABEL")} *`} { optionKey="i18nKey" onSelect={(e) => setGenderName(index, e)} t={t} - disabled={true} /> {`${t("CORE_EMAIL_ID")}`} { ); }; -export default OwnerDetails; +export default OwnerDetails; \ No newline at end of file