diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json index 027021b90af..10afd52e538 100644 --- a/frontend/micro-ui/web/micro-ui-internals/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/package.json @@ -12,7 +12,8 @@ "packages/modules/commonPt", "packages/modules/dss", "packages/modules/pt", - "packages/modules/tl" + "packages/modules/tl", + "packages/modules/obps" ], "author": "Abhinav Kushwaha ", "license": "MIT", @@ -63,7 +64,7 @@ "build:tl": "cd packages/modules/tl && yarn build", "buildD:ptr": "cd packages/modules/ptr && yarn build", "buildD:hrms": "cd packages/modules/hrms && yarn build", - "buildD:obps": "cd packages/modules/obps && yarn build", + "build:obps": "cd packages/modules/obps && yarn build", "buildD:engagement": "cd packages/modules/engagement && yarn build", "buildD:noc": "cd packages/modules/noc && yarn build", "buildD:ws": "cd packages/modules/ws && yarn build", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/BPANewBuildingdetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/BPANewBuildingdetails.js index 4d0b5e810fc..967f38e30d8 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/BPANewBuildingdetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/BPANewBuildingdetails.js @@ -1,813 +1,809 @@ - import React, { useEffect, useState, Fragment } from "react"; - import { FormStep, TextInput, CardLabel, Dropdown,UploadFile,SearchIcon } from "@upyog/digit-ui-react-components"; - import Timeline from "../components/Timeline"; - import { useLocation, useRouteMatch } from "react-router-dom"; - import { Controller, useForm } from "react-hook-form"; - - - const BPANewBuildingdetails = ({ t, config, onSelect, formData }) => { - const { pathname: url } = useLocation(); - let index = window.location.href.charAt(window.location.href.length - 1); - let validation = {}; - const [approvedColony, setapprovedColony] = useState(formData?.owners?.approvedColony || ""); - const [masterPlan, setmasterPlan] = useState(formData?.owners?.masterPlan || ""); - const [UlbName, setUlbName] = useState(formData?.owners?.UlbName || ""); - const [buildingStatus, setbuildingStatus] = useState(formData?.owners?.buildingStatus || ""); - const [schemes, setschemes] = useState(formData?.owners?.schemes || ""); - const [purchasedFAR, setpurchasedFAR] = useState(formData?.owners?.purchasedFAR || ""); - const [greenbuilding, setgreenbuilding] = useState(formData?.owners?.greenbuilding || ""); - const [restrictedArea, setrestrictedArea] = useState(formData?.owners?.restrictedArea || ""); - const [District, setDistrict] = useState(formData?.owners?.District || ""); - const [proposedSite, setproposedSite] = useState(formData?.owners?.proposedSite || ""); - const [nameofApprovedcolony, setnameofApprovedcolony] = useState(formData?.owners?.nameofApprovedcolony || ""); - const [NocNumber, setNocNumber] = useState(formData?.owners?.NocNumber || ""); - const [schemesselection, setschemesselection] = useState(formData?.owners?.schemesselection || ""); - const [schemeName, setschemeName] = useState(formData?.owners?.schemeName || ""); - const [transferredscheme, settransferredscheme] = useState("Pre-Approved Standard Designs" || ""); - const [rating, setrating] = useState(formData?.owners?.rating || ""); - const [use, setUse] = useState(formData?.owners?.use || ""); - - - const [Ulblisttype, setUlblisttype] = useState(formData?.owners?.Ulblisttype || ""); - const [uploadedFile, setUploadedFile] = useState(formData?.owners?.uploadedFile); - - const [greenuploadedFile, setGreenUploadedFile] = useState(formData?.owners?.greenuploadedFile); - - - const [files, setFiles] = useState(); - - const [file, setFile] = useState(); - const [error, setError] = useState(null); - const [uploadMessage, setUploadMessage] = useState(""); - let Webview = !Digit.Utils.browser.isMobile(); - let acceptFormat = ".pdf" - useEffect(() => { - (async () => { - setError(null); - if (file&& file?.type) { - if(!(acceptFormat?.split(",")?.includes(`.${file?.type?.split("/")?.pop()}`))) - { - setError(t("PT_UPLOAD_FORMAT_NOT_SUPPORTED")); - } - else if (file.size >= 2000000) { - setError(t("PT_MAXIMUM_UPLOAD_SIZE_EXCEEDED")); - } else { - try { - const response = await Digit.UploadServices.Filestorage("property-upload", file, Digit.ULBService.getStateId()); - if (response?.data?.files?.length > 0) { - setUploadedFile(response?.data?.files[0]?.fileStoreId); - } else { - setError(t("PT_FILE_UPLOAD_ERROR")); - } - } catch (err) { +import React, { useEffect, useState, Fragment } from "react"; +import { FormStep, TextInput, CardLabel, Dropdown,UploadFile,SearchIcon } from "@upyog/digit-ui-react-components"; +import Timeline from "../components/Timeline"; +import { useLocation, useRouteMatch } from "react-router-dom"; +import { Controller, useForm } from "react-hook-form"; + + +const BPANewBuildingdetails = ({ t, config, onSelect, formData }) => { + const { pathname: url } = useLocation(); + let index = window.location.href.charAt(window.location.href.length - 1); + let validation = {}; + const convertToObject = (String) => String ? { i18nKey: String, code: String, value: String } : null; + + const [approvedColony, setapprovedColony] = useState(formData?.owners?.approvedColony || convertToObject(formData?.additionalDetails?.approvedColony) || ""); + const [masterPlan, setmasterPlan] = useState(formData?.owners?.masterPlan || convertToObject(formData?.additionalDetails?.masterPlan) || ""); + const [UlbName, setUlbName] = useState(formData?.owners?.UlbName || convertToObject(formData?.additionalDetails?.UlbName) ||""); + const [buildingStatus, setbuildingStatus] = useState(formData?.owners?.buildingStatus || convertToObject(formData?.additionalDetails?.buildingStatus) ||""); + const [schemes, setschemes] = useState(formData?.owners?.schemes || convertToObject(formData?.additionalDetails?.schemes) || ""); + const [purchasedFAR, setpurchasedFAR] = useState(formData?.owners?.purchasedFAR || convertToObject(formData?.additionalDetails?.purchasedFAR) || ""); + const [greenbuilding, setgreenbuilding] = useState(formData?.owners?.greenbuilding || convertToObject(formData?.additionalDetails?.greenbuilding) || ""); + const [restrictedArea, setrestrictedArea] = useState(formData?.owners?.restrictedArea || convertToObject(formData?.additionalDetails?.restrictedArea) || ""); + const [District, setDistrict] = useState(formData?.owners?.District || convertToObject(formData?.additionalDetails?.District) || ""); + const [proposedSite, setproposedSite] = useState(formData?.owners?.proposedSite || convertToObject(formData?.additionalDetails?.proposedSite) || ""); + const [nameofApprovedcolony, setnameofApprovedcolony] = useState(formData?.owners?.nameofApprovedcolony || formData?.additionalDetails?.nameofApprovedcolony || ""); + const [NocNumber, setNocNumber] = useState(formData?.owners?.NocNumber || formData?.additionalDetails?.NocNumber || ""); + const [schemesselection, setschemesselection] = useState(formData?.owners?.schemesselection || convertToObject(formData?.additionalDetails?.schemesselection) || ""); + const [schemeName, setschemeName] = useState(formData?.owners?.schemeName || formData?.additionalDetails?.schemeName || ""); + const [transferredscheme, settransferredscheme] = useState("Pre-Approved Standard Designs" || ""); + const [rating, setrating] = useState(formData?.owners?.rating || convertToObject(formData?.additionalDetails?.rating) || ""); + const [use, setUse] = useState(formData?.owners?.use || convertToObject(formData?.additionalDetails?.use) || ""); + const [Ulblisttype, setUlblisttype] = useState(formData?.owners?.Ulblisttype || convertToObject(formData?.additionalDetails?.Ulblisttype) || ""); + const [uploadedFile, setUploadedFile] = useState(formData?.owners?.uploadedFile); + const [greenuploadedFile, setGreenUploadedFile] = useState(formData?.owners?.greenuploadedFile); + + + const [files, setFiles] = useState(); + + const [file, setFile] = useState(); + const [error, setError] = useState(null); + const [uploadMessage, setUploadMessage] = useState(""); + let Webview = !Digit.Utils.browser.isMobile(); + let acceptFormat = ".pdf" + useEffect(() => { + (async () => { + setError(null); + if (file&& file?.type) { + if(!(acceptFormat?.split(",")?.includes(`.${file?.type?.split("/")?.pop()}`))) + { + setError(t("PT_UPLOAD_FORMAT_NOT_SUPPORTED")); + } + else if (file.size >= 2000000) { + setError(t("PT_MAXIMUM_UPLOAD_SIZE_EXCEEDED")); + } else { + try { + const response = await Digit.UploadServices.Filestorage("property-upload", file, Digit.ULBService.getStateId()); + if (response?.data?.files?.length > 0) { + setUploadedFile(response?.data?.files[0]?.fileStoreId); + } else { + setError(t("PT_FILE_UPLOAD_ERROR")); } + } catch (err) { } } - })(); - }, [file]); - - useEffect(() => { - (async () => { - setError(null); - if (files&& files?.type) { - if(!(acceptFormat?.split(",")?.includes(`.${files?.type?.split("/")?.pop()}`))) - { - setError(t("PT_UPLOAD_FORMAT_NOT_SUPPORTED")); - } - else if (files.size >= 2000000) { - setError(t("PT_MAXIMUM_UPLOAD_SIZE_EXCEEDED")); - } else { - try { - const response = await Digit.UploadServices.Filestorage("property-upload", files, Digit.ULBService.getStateId()); - if (response?.data?.files?.length > 0) { - setGreenUploadedFile(response?.data?.files[0]?.fileStoreId); - } else { - setError(t("PT_FILE_UPLOAD_ERROR")); - } - } catch (err) { + } + })(); + }, [file]); + + useEffect(() => { + (async () => { + setError(null); + if (files&& files?.type) { + if(!(acceptFormat?.split(",")?.includes(`.${files?.type?.split("/")?.pop()}`))) + { + setError(t("PT_UPLOAD_FORMAT_NOT_SUPPORTED")); + } + else if (files.size >= 2000000) { + setError(t("PT_MAXIMUM_UPLOAD_SIZE_EXCEEDED")); + } else { + try { + const response = await Digit.UploadServices.Filestorage("property-upload", files, Digit.ULBService.getStateId()); + if (response?.data?.files?.length > 0) { + setGreenUploadedFile(response?.data?.files[0]?.fileStoreId); + } else { + setError(t("PT_FILE_UPLOAD_ERROR")); } + } catch (err) { } } - })(); - }, [files]); + } + })(); + }, [files]); + + + const approvedcolonyStatus = [ + { + code: "YES", + i18nKey: "YES" + }, + { + code: "NO", + i18nKey: "NO" + }, + { + code: "LAL_LAKEER", + i18nKey: "LAL LAKEER" + } + ] + const common = [ + { + code: "YES", + i18nKey: "YES" + }, + { + code: "NO", + i18nKey: "NO" + } + ] + + const Typeofproposedsite = [ + { + code: "PROPOSED", + i18nKey: "Proposed" + } + ] + + const stateId = Digit.ULBService.getStateId(); + + const { data: ulbList } = Digit.Hooks.obps.useUlbType(stateId, "BPA", "UlbType"); + + const { data: districtMenu } = Digit.Hooks.obps.useDistricts(stateId, "BPA", "Districts"); + const { data: ULB } = Digit.Hooks.obps.useULBList(stateId, "BPA", "Ulb"); + + let ulblists = []; + + let menu = []; + let ulb = []; + + ulbList && + ulbList.map((ulbtypelist) => { + if(ulbtypelist?.Districts === UlbName?.code) + ulblists.push({ i18nKey: `${ulbtypelist.name}`, code: `${ulbtypelist.code}`, value: `${ulbtypelist.name}` }); + }); + + districtMenu && + districtMenu.map((districts) => { + // if(districts.UlbType == Ulblisttype?.code) + menu.push({ i18nKey: `${districts.name}`, code: `${districts.code}`, value: `${districts.name}` }); + }); + + ULB && + ULB.map((ulblist) => { + if (ulblist.Districts == UlbName?.code) { + ulb.push({ + i18nKey: `${ulblist.name}`, + code: `${ulblist.code}`, + value: `${ulblist.name}` + }); + } - const approvedcolonyStatus = [ - { - code: "YES", - i18nKey: "YES" - }, - { - code: "NO", - i18nKey: "NO" + }); + + + // Custom hooks to get the Data directly from MDMS, No need to make file inside Libraries --> Hooks Folder + + const { data: commonBuilding } = Digit.Hooks.useCustomMDMS(Digit.ULBService.getStateId(), "BPA", [{ name: "BuildingStatus" }], + { + select: (data) => { + const formattedData = data?.["BPA"]?.["BuildingStatus"] + return formattedData; }, - { - code: "LAL_LAKEER", - i18nKey: "LAL LAKEER" - } - ] - const common = [ - { - code: "YES", - i18nKey: "YES" + }); + let building_status = []; + + commonBuilding && commonBuilding.map((selectBuilding) => { + building_status.push({i18nKey: `BPA_${selectBuilding.code}`, code: `${selectBuilding.code}`, value: `${selectBuilding.name}`}) + }) + + const { data: commonrating } = Digit.Hooks.useCustomMDMS(Digit.ULBService.getStateId(), "BPA", [{ name: "RatingValue" }], + { + select: (data) => { + const formattedData = data?.["BPA"]?.["RatingValue"] + return formattedData; }, - { - code: "NO", - i18nKey: "NO" - } - ] - - const Typeofproposedsite = [ - { - code: "PROPOSED", - i18nKey: "Proposed" - } - ] + }); + let selectRating = []; - - const stateId = Digit.ULBService.getStateId(); - - const { data: ulbList } = Digit.Hooks.obps.useUlbType(stateId, "BPA", "UlbType"); - - const { data: districtMenu } = Digit.Hooks.obps.useDistricts(stateId, "BPA", "Districts"); - const { data: ULB } = Digit.Hooks.obps.useULBList(stateId, "BPA", "Ulb"); - - let ulblists = []; - - let menu = []; - let ulb = []; - - ulbList && - ulbList.map((ulbtypelist) => { - if(ulbtypelist?.Districts === UlbName?.code) - ulblists.push({ i18nKey: `${ulbtypelist.name}`, code: `${ulbtypelist.code}`, value: `${ulbtypelist.name}` }); - }); - - districtMenu && - districtMenu.map((districts) => { - // if(districts.UlbType == Ulblisttype?.code) - menu.push({ i18nKey: `${districts.name}`, code: `${districts.code}`, value: `${districts.name}` }); - }); - - ULB && - ULB.map((ulblist) => { - if (ulblist.Districts == UlbName?.code) { - ulb.push({ - i18nKey: `${ulblist.name}`, - code: `${ulblist.code}`, - value: `${ulblist.name}` - }); - } + commonrating && commonrating.map((selectRatings) => { + selectRating.push({i18nKey: `BPA_${selectRatings.code}`, code: `${selectRatings.code}`, value: `${selectRatings.name}`}) + }) + + const { data: commonmasterFields } = Digit.Hooks.useCustomMDMS(Digit.ULBService.getStateId(), "BPA", [{ name: "MasterFields" }], + { + select: (data) => { + const formattedData = data?.["BPA"]?.["MasterFields"] + return formattedData; + }, + }); + let selectmasterDrop = []; + + commonmasterFields && commonmasterFields.map((selectMaster) => { + selectmasterDrop.push({i18nKey: `BPA_${selectMaster.code}`, code: `${selectMaster.code}`, value: `${selectMaster.name}`}) + }) + + const { data: commonScheme } = Digit.Hooks.useCustomMDMS(Digit.ULBService.getStateId(), "BPA", [{ name: "Scheme" }], + { + select: (data) => { + const formattedData = data?.["BPA"]?.["Scheme"] + return formattedData; + }, + }); + let selectscheme = []; + + commonScheme && commonScheme.map((selectScheme) => { + selectscheme.push({i18nKey: `BPA_${selectScheme.code}`, code: `${selectScheme.code}`, value: `${selectScheme.name}`}) + }) + + const { data: commonSchemeType } = Digit.Hooks.useCustomMDMS(Digit.ULBService.getStateId(), "BPA", [{ name: "SchemeType" }], + { + select: (data) => { + const formattedData = data?.["BPA"]?.["SchemeType"] + return formattedData; + }, + }); + let selectschemetypes = []; - }); - - - // Custom hooks to get the Data directly from MDMS, No need to make file inside Libraries --> Hooks Folder - - const { data: commonBuilding } = Digit.Hooks.useCustomMDMS(Digit.ULBService.getStateId(), "BPA", [{ name: "BuildingStatus" }], - { - select: (data) => { - const formattedData = data?.["BPA"]?.["BuildingStatus"] - return formattedData; - }, - }); - let building_status = []; - - commonBuilding && commonBuilding.map((selectBuilding) => { - building_status.push({i18nKey: `BPA_${selectBuilding.code}`, code: `${selectBuilding.code}`, value: `${selectBuilding.name}`}) - }) - - const { data: commonrating } = Digit.Hooks.useCustomMDMS(Digit.ULBService.getStateId(), "BPA", [{ name: "RatingValue" }], - { - select: (data) => { - const formattedData = data?.["BPA"]?.["RatingValue"] - return formattedData; - }, - }); - let selectRating = []; - - commonrating && commonrating.map((selectRatings) => { - selectRating.push({i18nKey: `BPA_${selectRatings.code}`, code: `${selectRatings.code}`, value: `${selectRatings.name}`}) - }) - - const { data: commonmasterFields } = Digit.Hooks.useCustomMDMS(Digit.ULBService.getStateId(), "BPA", [{ name: "MasterFields" }], - { - select: (data) => { - const formattedData = data?.["BPA"]?.["MasterFields"] - return formattedData; - }, - }); - let selectmasterDrop = []; - - commonmasterFields && commonmasterFields.map((selectMaster) => { - selectmasterDrop.push({i18nKey: `BPA_${selectMaster.code}`, code: `${selectMaster.code}`, value: `${selectMaster.name}`}) - }) - - const { data: commonScheme } = Digit.Hooks.useCustomMDMS(Digit.ULBService.getStateId(), "BPA", [{ name: "Scheme" }], - { - select: (data) => { - const formattedData = data?.["BPA"]?.["Scheme"] - return formattedData; - }, - }); - let selectscheme = []; - - commonScheme && commonScheme.map((selectScheme) => { - selectscheme.push({i18nKey: `BPA_${selectScheme.code}`, code: `${selectScheme.code}`, value: `${selectScheme.name}`}) - }) - - const { data: commonSchemeType } = Digit.Hooks.useCustomMDMS(Digit.ULBService.getStateId(), "BPA", [{ name: "SchemeType" }], - { - select: (data) => { - const formattedData = data?.["BPA"]?.["SchemeType"] - return formattedData; - }, - }); - let selectschemetypes = []; - - commonSchemeType && commonSchemeType.map((selectscheme) => { - selectschemetypes.push({i18nKey: `BPA_${selectscheme.code}`, code: `${selectscheme.code}`, value: `${selectscheme.name}`}) - }) + commonSchemeType && commonSchemeType.map((selectscheme) => { + selectschemetypes.push({i18nKey: `BPA_${selectscheme.code}`, code: `${selectscheme.code}`, value: `${selectscheme.name}`}) + }) - - const { control } = useForm(); + + const { control } = useForm(); - function setApprovedColony(e) { - setapprovedColony(e.target.value); - } + function setApprovedColony(e) { + setapprovedColony(e.target.value); + } - function setMasterPlan(e) { - setmasterPlan(e.target.value); - } + function setMasterPlan(e) { + setmasterPlan(e.target.value); + } - function setRatings(e) { - setrating(e.target.value) - } + function setRatings(e) { + setrating(e.target.value) + } - function setulbname(e) { - setUlbName(e.target.value); - } + function setulbname(e) { + setUlbName(e.target.value); + } - function setulblisttype(e) { - setUlblisttype(e.target.value); - } + function setulblisttype(e) { + setUlblisttype(e.target.value); + } - function setBuildingStatus(e) { - setbuildingStatus(e.target.value); - } - function setSchemes(e) { - setschemes(e.target.value); - } + function setBuildingStatus(e) { + setbuildingStatus(e.target.value); + } + function setSchemes(e) { + setschemes(e.target.value); + } - function setSchemeselection(e) { - setschemesselection(e.target.value); - } - function setPurchasedFAR(e) { - setpurchasedFAR(e.target.value); - } - function setGreenbuilding(e) { - setgreenbuilding(e.target.value); - } - function setRestrictedArea(e) { - setrestrictedArea(e.target.value); - } - function setdistrict(e) { - setDistrict(e.target.value); - } - function setProposedSite(e) { - setproposedSite(e.target.value); - } + function setSchemeselection(e) { + setschemesselection(e.target.value); + } + function setPurchasedFAR(e) { + setpurchasedFAR(e.target.value); + } + function setGreenbuilding(e) { + setgreenbuilding(e.target.value); + } + function setRestrictedArea(e) { + setrestrictedArea(e.target.value); + } + function setdistrict(e) { + setDistrict(e.target.value); + } + function setProposedSite(e) { + setproposedSite(e.target.value); + } - function setNameapprovedcolony(e) { - setnameofApprovedcolony(e.target.value); - } + function setNameapprovedcolony(e) { + setnameofApprovedcolony(e.target.value); + } - function setnocNumber(e) { - setNocNumber(e.target.value); - } + function setnocNumber(e) { + setNocNumber(e.target.value); + } - function setSchemename(e) { - setschemeName(e.target.value); - } + function setSchemename(e) { + setschemeName(e.target.value); + } - function TransferredScheme(e){ - settransferredscheme(e.target.value); - } - function selectfile(e) { - setUploadedFile(e.target.files[0]); - setFile(e.target.files[0]); - } - function onClick(e){ - console.log("inside_NOC_search") - } - function selectfiles(e) { - setGreenUploadedFile(e.target.files[0]); - setFiles(e.target.files[0]); - } + function TransferredScheme(e){ + settransferredscheme(e.target.value); + } + function selectfile(e) { + setUploadedFile(e.target.files[0]); + setFile(e.target.files[0]); + } + function onClick(e){ + console.log("inside_NOC_search") + } + function selectfiles(e) { + setGreenUploadedFile(e.target.files[0]); + setFiles(e.target.files[0]); + } - function setuse(e) { - setUse(e.target.value); - } + function setuse(e) { + setUse(e.target.value); + } - const goNext = () => { - let owners = formData.owners && formData.owners[index]; - let ownerStep = { ...owners, approvedColony, use, UlbName, Ulblisttype, District, rating, masterPlan, buildingStatus, schemes, schemesselection, purchasedFAR, greenbuilding, restrictedArea, proposedSite, nameofApprovedcolony, schemeName, transferredscheme, NocNumber, uploadedFile,greenuploadedFile }; - let updatedFormData = { ...formData }; + const goNext = () => { + let owners = formData.owners && formData.owners[index]; + let ownerStep = { ...owners, approvedColony, use, UlbName, Ulblisttype, District, rating, masterPlan, buildingStatus, schemes, schemesselection, purchasedFAR, greenbuilding, restrictedArea, proposedSite, nameofApprovedcolony, schemeName, transferredscheme, NocNumber, uploadedFile,greenuploadedFile }; + let updatedFormData = { ...formData }; - // Check if owners array exists in formData if not , then it will add it - if (!updatedFormData.owners) { - updatedFormData.owners = []; + // Check if owners array exists in formData if not , then it will add it + if (!updatedFormData.owners) { + updatedFormData.owners = []; + } + if((approvedColony?.code=="NO") ) + { if(NocNumber || uploadedFile || formData?.owners?.uploadedFile ){ + if((greenbuilding?.code==="YES")) + { if(greenuploadedFile || formData?.owners?.greenuploadedFile){ + onSelect(config.key, { ...formData[config.key], ...ownerStep }, updatedFormData, false, index); } - if((approvedColony?.code=="NO") ) - { if(NocNumber || uploadedFile || formData?.owners?.uploadedFile ){ - if((greenbuilding?.code==="YES")) - { if(greenuploadedFile || formData?.owners?.greenuploadedFile){ - onSelect(config.key, { ...formData[config.key], ...ownerStep }, updatedFormData, false, index); - } - else{ - alert("Please Upload Document") - } } - else{ - onSelect(config.key, { ...formData[config.key], ...ownerStep }, updatedFormData, false, index); - } + else{ + alert("Please Upload Document") + } } + else{ + onSelect(config.key, { ...formData[config.key], ...ownerStep }, updatedFormData, false, index); + } + } + else{ + alert("Please fill NOC number or Upload NOC Document") + } } + + else{ + if((greenbuilding?.code==="YES")) + { if(greenuploadedFile || formData?.owners?.greenuploadedFile){ + onSelect(config.key, { ...formData[config.key], ...ownerStep }, updatedFormData, false, index); } else{ - alert("Please fill NOC number or Upload NOC Document") + alert("Please Upload Document") } } - else{ - if((greenbuilding?.code==="YES")) - { if(greenuploadedFile || formData?.owners?.greenuploadedFile){ - onSelect(config.key, { ...formData[config.key], ...ownerStep }, updatedFormData, false, index); - } - else{ - alert("Please Upload Document") - } } - else{ - onSelect(config.key, { ...formData[config.key], ...ownerStep }, updatedFormData, false, index); - } - } - }; + onSelect(config.key, { ...formData[config.key], ...ownerStep }, updatedFormData, false, index); + } + } + }; + + const onSkip = () => onSelect(); - - const onSkip = () => onSelect(); - - const renderFields = () => { - switch (approvedColony?.code) { - case "YES": - return ( - <> - {`${t("BPA_APPROVED_COLONY_NAME")}`} - - - ); - case "NO": - return ( - <> - {`${t("BPA_NOC_NUMBER")}`} -
- -
onClick( e)}>
-
-
OR
- { + switch (approvedColony?.code) { + case "YES": + return ( + <> + {`${t("BPA_APPROVED_COLONY_NAME")}`} + + + ); + case "NO": + return ( + <> + {`${t("BPA_NOC_NUMBER")}`} +
+ +
onClick( e)}>
+
+
OR
+ { + setUploadedFile(null); + setFile(""); + }} + message={uploadedFile ? `1 ${t(`FILEUPLOADED`)}` : t(`ES_NO_FILE_SELECTED_LABEL`)} + error={error} + uploadMessage={uploadMessage} + /> + + ); + default: + return null; + } + } + + const renderGreenbuildingfields = () => { + switch (greenbuilding?.code) { + case "YES": + return( + <> + { - setUploadedFile(null); - setFile(""); + setGreenUploadedFile(null); + setFiles(""); }} - message={uploadedFile ? `1 ${t(`FILEUPLOADED`)}` : t(`ES_NO_FILE_SELECTED_LABEL`)} + message={greenuploadedFile ? `1 ${t(`FILEUPLOADED`)}` : t(`ES_NO_FILE_SELECTED_LABEL`)} error={error} uploadMessage={uploadMessage} /> - - ); - default: - return null; - } +

+ + {`${t("BPA_SELECT_RATINGS")}`} + ( + + )} + /> + + + ); + case "NO": + return null; + + default: + return null; } + } - const renderGreenbuildingfields = () => { - switch (greenbuilding?.code) { - case "YES": - return( + const Master_plan_render_fields = () => { + switch(masterPlan?.code) { + case "YES": + return( <> - { - setGreenUploadedFile(null); - setFiles(""); - }} - message={greenuploadedFile ? `1 ${t(`FILEUPLOADED`)}` : t(`ES_NO_FILE_SELECTED_LABEL`)} - error={error} - uploadMessage={uploadMessage} - /> -

- - {`${t("BPA_SELECT_RATINGS")}`} - ( - - )} - /> + {`${t("BPA_USE")}`} + ( + + )} + /> - ); - case "NO": - return null; - - default: - return null; - } - } + ); + case "NO": + return null; - const Master_plan_render_fields = () => { - switch(masterPlan?.code) { - case "YES": - return( - <> - {`${t("BPA_USE")}`} - ( - - )} - /> - - - ); - case "NO": - return null; + default: + return null; - default: - return null; + } + }; + + const renderschemedropdown = () => { + switch (schemes?.code) { + case "SCHEME": + return ( + <> + {`${t("BPA_SCHEME_TYPE_LABEL")}`} + ( + + )} + /> - } - }; - - const renderschemedropdown = () => { - switch (schemes?.code) { - case "SCHEME": - return ( - <> - {`${t("BPA_SCHEME_TYPE_LABEL")}`} - ( - - )} - /> + {`${t("BPA_SCHEME_NAME")}`} + - {`${t("BPA_SCHEME_NAME")}`} - + {`${t("BPA_TRANFERRED_SCHEME_LABEL")}`} + - {`${t("BPA_TRANFERRED_SCHEME_LABEL")}`} - + + ); + case "NON_SCHEME": + return null; + + default: + return null; + } - - ); - case "NON_SCHEME": - return null; - - default: - return null; - } + }; + + + return ( + + + +
+ {`${t("BPA_APPROVED_COLONY")}`} + ( + - }; + )} + /> - return ( - - - -
- {`${t("BPA_APPROVED_COLONY")}`} - ( - - - )} - - /> - - {renderFields()} - - - {`${t("BPA_MASTER_PLAN")}`} - ( - - - )} - /> - {Master_plan_render_fields()} - - {`${t("BPA_ULB_NAME")}`} - ( - - )} + {`${t("BPA_MASTER_PLAN")}`} + ( + - {`${t("BPA_DISTRICT")}`} - ( - - )} - /> + )} - {`${t("BPA_ULB_TYPE")}`} - ( - - )} + /> + {Master_plan_render_fields()} + + {`${t("BPA_ULB_NAME")}`} + ( + - {`${t("BPA_BUILDING_STATUS")}`} - ( - - )} - /> - {`${t("BPA_SCHEMES")}`} - ( - - )} - /> - {renderschemedropdown()} - - {`${t("BPA_PURCHASED_FAR")}`} - ( - - )} + )} /> - {`${t("BPA_GREEN_BUIDINGS")}`} - ( - - )} - /> - {renderGreenbuildingfields()} - - {`${t("BPA_RESTRICTED_AREA")}`} - ( - - )} - /> - {`${t("BPA_PROPOSED_SITE_TYPE")}`} - ( - - )} + + {`${t("BPA_DISTRICT")}`} + ( + + )} + /> + + {`${t("BPA_ULB_TYPE")}`} + ( + + )} /> + {`${t("BPA_BUILDING_STATUS")}`} + ( + + )} + /> + {`${t("BPA_SCHEMES")}`} + ( + + )} + /> + {renderschemedropdown()} + + {`${t("BPA_PURCHASED_FAR")}`} + ( + + )} + /> + {`${t("BPA_GREEN_BUIDINGS")}`} + ( + + )} + /> + {renderGreenbuildingfields()} + + {`${t("BPA_RESTRICTED_AREA")}`} + ( + + )} + /> + {`${t("BPA_PROPOSED_SITE_TYPE")}`} + ( + + )} + /> -
- - - ); - }; +
+ + + ); +}; - export default BPANewBuildingdetails; \ No newline at end of file +export default BPANewBuildingdetails; \ No newline at end of file diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/PlotDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/PlotDetails.js index 1e8fd9238f9..c5b2b83fb66 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/PlotDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/PlotDetails.js @@ -55,7 +55,7 @@ const PlotDetails = ({ formData, onSelect, config }) => { return (
- + diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/NewConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/NewConfig.js index 81e6ff2c098..7b4a813374f 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/NewConfig.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/NewConfig.js @@ -55,7 +55,8 @@ export const newConfig1=[ "label": "BPA_WARD_NUMBER_LABEL", "type": "text", "validation": { - "pattern": "^[a-zA-Z0-9 -]+$", + "pattern": "^[a-zA-Z0-9]*$", + "title": "Special Character are not allowed", "required": true }, "name": "wardnumber" @@ -63,19 +64,25 @@ export const newConfig1=[ { "label": "BPA_ZONE_NUMBER_LABEL", "type": "text", - "validation": {}, + "validation": { + "pattern": "^[a-zA-Z0-9]*$", + "required": false}, "name": "zonenumber" }, { "label": "BPA_KHASRA_NUMBER_LABEL", "type": "text", - "validation": {"required": true}, + "validation": { + "pattern": "^[a-zA-Z0-9/]*$", + "required": true}, "name": "khasraNumber" }, { "label": "BPA_ARCHITECT_ID", "type": "text", - "validation": {"required": true}, + "validation": { + "pattern": "^[a-zA-Z0-9/]*$", + "required": true}, "name": "architectid" }, { diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json index f5a9948e0ad..35249c021e4 100644 --- a/frontend/micro-ui/web/package.json +++ b/frontend/micro-ui/web/package.json @@ -11,7 +11,9 @@ "micro-ui-internals/packages/modules/commonPt", "micro-ui-internals/packages/modules/dss", "micro-ui-internals/packages/modules/pt", - "micro-ui-internals/packages/modules/tl" + "micro-ui-internals/packages/modules/tl", + "micro-ui-internals/packages/modules/obps" + ], "engines": { "node": ">=14"