diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/Module.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/Module.js index b370a10b5d0..392f282e9af 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/Module.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/Module.js @@ -15,6 +15,7 @@ import ScrutinyDetails from "./pageComponents/ScrutinyDetails"; import OwnerDetails from "./pageComponents/OwnerDetails"; import DocumentDetails from "./pageComponents/DocumentDetails"; import NOCDetails from "./pageComponents/NOCDetails"; +import NOCNumber from "./pageComponents/NOCNumber"; import LocationDetails from "./pageComponents/LocationDetails"; import StakeholderDocsRequired from "./pageComponents/StakeholderDocsRequired"; import GIS from "./pageComponents/GIS"; @@ -115,6 +116,7 @@ const componentsToRegister = { OwnerDetails, DocumentDetails, NOCDetails, + NOCNumber, LocationDetails, GIS, OCEDCRDocsRequired, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/config/ocbuildingPermitConfig.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/config/ocbuildingPermitConfig.js index 13aaa867e35..fe516406c88 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/config/ocbuildingPermitConfig.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/config/ocbuildingPermitConfig.js @@ -39,12 +39,6 @@ export const newConfig = [ validation: {}, name: "registrationDetails" }, - { - label: "BPA_BOUNDARY_WALL_LENGTH_LABEL", - type: "text", - validation: {}, - name: "boundaryWallLength" - }, ] }, { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/NOCNumber.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/NOCNumber.js new file mode 100644 index 00000000000..241ea05fd38 --- /dev/null +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/NOCNumber.js @@ -0,0 +1,211 @@ +import React, { useState } from "react"; +import { FormStep} from "@upyog/digit-ui-react-components"; +import Timeline from "../components/Timeline"; + +const NOCNumber = ({ t, config, onSelect, userType, formData, setError: setFormError, clearErrors: clearFormErrors, formState }) => { + const [nocNumber,setValueNoc]=useState(null); + const tenantId = Digit.ULBService.getCurrentTenantId(); + + function onChange(data) { + setValueNoc(data.target.value); + } + + function onClick(){ + console.log("inside_search") + } + + function getusageCategoryAPI(arr){ + let usageCat = "" + arr.map((ob,i) => { + usageCat = usageCat + (i !==0?",":"") + ob.code; + }); + return usageCat; + } + + function getUnitsForAPI(subOccupancyData){ + const ob = subOccupancyData?.subOccupancy; + const blocksDetails = subOccupancyData?.data?.edcrDetails?.planDetail?.blocks || []; + let units=[]; + if(ob) { + let result = Object.entries(ob); + result.map((unit,index)=>{ + units.push({ + blockIndex:index, + floorNo:unit[0].split("_")[1], + unitType:"Block", + occupancyType: blocksDetails?.[index]?.building?.occupancies?.[0]?.typeHelper?.type?.code || "A", + usageCategory:getusageCategoryAPI(unit[1]), + }); + }) + } + return units; + } + + function getBlockIds(arr){ + let blockId = {}; + arr.map((ob,ind)=>{ + blockId[`Block_${ob.floorNo}`]=ob.id; + }); + return blockId; + } + + const handleSubmit = () => { + let owner = formData.owners; + let ownerStep; + ownerStep = { ...owner}; + + if (!formData?.id) { + //setIsDisable(true); + //for owners conversion + let ownershipCategory=formData?.owners?.ownershipCategory; + let conversionOwners = []; + ownerStep?.owners?.map(owner => { + conversionOwners.push({ + ...owner, + active:true, + name: owner.name, + emailId:owner.emailId, + mobileNumber: owner.mobileNumber, + isPrimaryOwner: owner.isPrimaryOwner, + gender: owner.gender.code, + fatherOrHusbandName: "NAME" + }) + }); + let payload = {}; + payload.edcrNumber = formData?.edcrNumber?.edcrNumber ? formData?.edcrNumber?.edcrNumber :formData?.data?.scrutinyNumber?.edcrNumber; + payload.riskType = formData?.data?.riskType; + payload.applicationType = formData?.data?.applicationType; + payload.serviceType = formData?.data?.serviceType; + + const userInfo = Digit.UserService.getUser(); + const accountId = userInfo?.info?.uuid; + payload.tenantId = formData?.address?.city?.code; + payload.workflow = { action: "INITIATE", assignes : [userInfo?.info?.uuid] }; + payload.accountId = accountId; + payload.documents = null; + + // Additonal details + payload.additionalDetails = {GISPlaceName:formData?.address?.placeName}; + payload.additionalDetails.boundaryWallLength = formData?.data?.boundaryWallLength || "NA"; + payload.additionalDetails.area = (formData?.data.edcrDetails.planDetail.planInformation.plotArea).toString()|| "NA"; + payload.additionalDetails.height = (formData?.data.edcrDetails.planDetail.blocks[0].building.buildingHeight).toString() || "NA"; + payload.additionalDetails.usage = formData?.data.occupancyType || "NA"; + payload.additionalDetails.builtUpArea =(formData?.data.edcrDetails.planDetail.blocks[0].building.totalBuitUpArea).toString(); + payload.additionalDetails.nocNumber=nocNumber; + if (formData?.data?.holdingNumber) payload.additionalDetails.holdingNo = formData?.data?.holdingNumber; + 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; + //For LandInfo + payload.landInfo = {}; + //For Address + payload.landInfo.address = {}; + if (formData?.address?.city?.code) payload.landInfo.address.city = formData?.address?.city?.code; + if (formData?.address?.locality?.code) payload.landInfo.address.locality = { code: formData?.address?.locality?.code }; + if (formData?.address?.pincode) payload.landInfo.address.pincode = formData?.address?.pincode; + if (formData?.address?.landmark) payload.landInfo.address.landmark = formData?.address?.landmark; + if (formData?.address?.street) payload.landInfo.address.street = formData?.address?.street; + if (formData?.address?.geoLocation) payload.landInfo.address.geoLocation = formData?.address?.geoLocation; + + payload.landInfo.owners = conversionOwners; + payload.landInfo.ownershipCategory = ownershipCategory.code; + payload.landInfo.tenantId = formData?.address?.city?.code; + + //for units + const blockOccupancyDetails = formData; + payload.landInfo.unit = getUnitsForAPI(blockOccupancyDetails); + + let nameOfAchitect = sessionStorage.getItem("BPA_ARCHITECT_NAME"); + let parsedArchitectName = nameOfAchitect ? JSON.parse(nameOfAchitect) : "ARCHITECT"; + payload.additionalDetails.typeOfArchitect = parsedArchitectName; + let isSelfCertificationRequired=sessionStorage.getItem("isSelfCertificationRequired"); + if(isSelfCertificationRequired==="undefined"){ + isSelfCertificationRequired="false"; + } + payload.additionalDetails.isSelfCertificationRequired = isSelfCertificationRequired.toString(); + // create BPA call + if(isSelfCertificationRequired===true && formData?.data.occupancyType==="Residential" && (parsedArchitectName=="ARCHITECT" || parsedArchitectName=="ENGINEER"|| parsedArchitectName=="DESIGNER" || parsedArchitectName=="SUPERVISOR")){ + if(formData?.data.edcrDetails.planDetail.blocks[0].building.buildingHeight > 15){ + alert("Height should not be more than 15 metres"); + } + else if((parsedArchitectName=="ARCHITECT" || parsedArchitectName=="ENGINEER") && formData?.data.edcrDetails.planDetail.planInformation.plotArea>500){ + alert("Architect/Engineer can apply for area less then 500 sq. yards. in self declaration") + } + else if((parsedArchitectName=="DESIGNER" || parsedArchitectName=="SUPERVISOR") && formData?.data.edcrDetails.planDetail.planInformation.plotArea>250){ + alert("Designer/Supervisor can apply for area less then 500 sq. yards. in self declaration") + } + else{ + Digit.OBPSService.create({ BPA: payload }, tenantId) + .then((result, err) => { + if (result?.BPA?.length > 0) { + result?.BPA?.[0]?.landInfo?.owners?.forEach(owner => { + owner.gender = { code: owner.gender, active: true, i18nKey: `COMMON_GENDER_${owner.gender}` } + }); + result.BPA[0].owners = { ...owner, owners: result?.BPA?.[0]?.landInfo?.owners, ownershipCategory: ownershipCategory }; + result.BPA[0].address = result?.BPA?.[0]?.landInfo?.address; + result.BPA[0].address.city = formData.address.city; + result.BPA[0].address.locality = formData.address.locality; + result.BPA[0].placeName = formData?.address?.placeName; + result.BPA[0].data = formData.data; + result.BPA[0].BlockIds = getBlockIds(result.BPA[0].landInfo.unit); + result.BPA[0].subOccupancy= formData?.subOccupancy; + result.BPA[0].uiFlow = formData?.uiFlow; + //setIsDisable(false); + onSelect("", result.BPA[0], "", true); + } + }) + .catch((e) => { + // setIsDisable(false); + setShowToast({ key: "true", error: true, message: e?.response?.data?.Errors[0]?.message }); + }); + } + + } + else{ + Digit.OBPSService.create({ BPA: payload }, tenantId) + .then((result, err) => { + if (result?.BPA?.length > 0) { + result?.BPA?.[0]?.landInfo?.owners?.forEach(owner => { + owner.gender = { code: owner.gender, active: true, i18nKey: `COMMON_GENDER_${owner.gender}` } + }); + result.BPA[0].owners = { ...owner, owners: result?.BPA?.[0]?.landInfo?.owners, ownershipCategory: ownershipCategory }; + result.BPA[0].address = result?.BPA?.[0]?.landInfo?.address; + result.BPA[0].address.city = formData.address.city; + result.BPA[0].address.locality = formData.address.locality; + result.BPA[0].placeName = formData?.address?.placeName; + result.BPA[0].data = formData.data; + result.BPA[0].BlockIds = getBlockIds(result.BPA[0].landInfo.unit); + result.BPA[0].subOccupancy= formData?.subOccupancy; + result.BPA[0].uiFlow = formData?.uiFlow; + // setIsDisable(false); + onSelect("", result.BPA[0], "", true); + } + }) + .catch((e) => { + //setIsDisable(false); + setShowToast({ key: "true", error: true, message: e?.response?.data?.Errors[0]?.message }); + }); + } + } else { + onSelect(config.key, ownerStep); + } + }; + + return ( +
+ + + SEARCH NOC + +
+ + ); +} + +export default NOCNumber \ No newline at end of file diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/OwnerDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/OwnerDetails.js index 820562a275f..719abee217d 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/OwnerDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/OwnerDetails.js @@ -290,146 +290,13 @@ const OwnerDetails = ({ t, config, onSelect, userType, formData }) => { window.scrollTo(0,0); setError("BPA_ERROR_MULTIPLE_OWNER"); } - else { + else{ let owner = formData.owners; let ownerStep; ownerStep = { ...owner, owners: fields, ownershipCategory: ownershipCategory }; - - if (!formData?.id) { - setIsDisable(true); - //for owners conversion - let conversionOwners = []; - ownerStep?.owners?.map(owner => { - conversionOwners.push({ - ...owner, - active:true, - name: owner.name, - emailId:owner.emailId, - mobileNumber: owner.mobileNumber, - isPrimaryOwner: owner.isPrimaryOwner, - gender: owner.gender.code, - fatherOrHusbandName: "NAME" - }) - }); - let payload = {}; - payload.edcrNumber = formData?.edcrNumber?.edcrNumber ? formData?.edcrNumber?.edcrNumber :formData?.data?.scrutinyNumber?.edcrNumber; - payload.riskType = formData?.data?.riskType; - payload.applicationType = formData?.data?.applicationType; - payload.serviceType = formData?.data?.serviceType; - - const userInfo = Digit.UserService.getUser(); - const accountId = userInfo?.info?.uuid; - payload.tenantId = formData?.address?.city?.code; - payload.workflow = { action: "INITIATE", assignes : [userInfo?.info?.uuid] }; - payload.accountId = accountId; - payload.documents = null; - - // Additonal details - payload.additionalDetails = {GISPlaceName:formData?.address?.placeName}; - payload.additionalDetails.boundaryWallLength = formData?.data?.boundaryWallLength || "NA"; - payload.additionalDetails.area = (formData?.data.edcrDetails.planDetail.planInformation.plotArea).toString()|| "NA"; - payload.additionalDetails.height = (formData?.data.edcrDetails.planDetail.blocks[0].building.buildingHeight).toString() || "NA"; - payload.additionalDetails.usage = formData?.data.occupancyType || "NA"; - payload.additionalDetails.builtUpArea =(formData?.data.edcrDetails.planDetail.blocks[0].building.totalBuitUpArea).toString(); - - if (formData?.data?.holdingNumber) payload.additionalDetails.holdingNo = formData?.data?.holdingNumber; - 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; - //For LandInfo - payload.landInfo = {}; - //For Address - payload.landInfo.address = {}; - if (formData?.address?.city?.code) payload.landInfo.address.city = formData?.address?.city?.code; - if (formData?.address?.locality?.code) payload.landInfo.address.locality = { code: formData?.address?.locality?.code }; - if (formData?.address?.pincode) payload.landInfo.address.pincode = formData?.address?.pincode; - if (formData?.address?.landmark) payload.landInfo.address.landmark = formData?.address?.landmark; - if (formData?.address?.street) payload.landInfo.address.street = formData?.address?.street; - if (formData?.address?.geoLocation) payload.landInfo.address.geoLocation = formData?.address?.geoLocation; - - payload.landInfo.owners = conversionOwners; - payload.landInfo.ownershipCategory = ownershipCategory.code; - payload.landInfo.tenantId = formData?.address?.city?.code; - - //for units - const blockOccupancyDetails = formData; - payload.landInfo.unit = getUnitsForAPI(blockOccupancyDetails); - - let nameOfAchitect = sessionStorage.getItem("BPA_ARCHITECT_NAME"); - let parsedArchitectName = nameOfAchitect ? JSON.parse(nameOfAchitect) : "ARCHITECT"; - payload.additionalDetails.typeOfArchitect = parsedArchitectName; - let isSelfCertificationRequired=sessionStorage.getItem("isSelfCertificationRequired"); - if(isSelfCertificationRequired==="undefined"){ - isSelfCertificationRequired="false"; - } - payload.additionalDetails.isSelfCertificationRequired = isSelfCertificationRequired.toString(); - // create BPA call - if(isSelfCertificationRequired===true && formData?.data.occupancyType==="Residential" && (parsedArchitectName=="ARCHITECT" || parsedArchitectName=="ENGINEER"|| parsedArchitectName=="DESIGNER" || parsedArchitectName=="SUPERVISOR")){ - if(formData?.data.edcrDetails.planDetail.blocks[0].building.buildingHeight > 15){ - alert("Height should not be more than 15 metres"); - } - else if((parsedArchitectName=="ARCHITECT" || parsedArchitectName=="ENGINEER") && formData?.data.edcrDetails.planDetail.planInformation.plotArea>500){ - alert("Architect/Engineer can apply for area less then 500 sq. yards. in self declaration") - } - else if((parsedArchitectName=="DESIGNER" || parsedArchitectName=="SUPERVISOR") && formData?.data.edcrDetails.planDetail.planInformation.plotArea>250){ - alert("Designer/Supervisor can apply for area less then 500 sq. yards. in self declaration") - } - else{ - Digit.OBPSService.create({ BPA: payload }, tenantId) - .then((result, err) => { - if (result?.BPA?.length > 0) { - result?.BPA?.[0]?.landInfo?.owners?.forEach(owner => { - owner.gender = { code: owner.gender, active: true, i18nKey: `COMMON_GENDER_${owner.gender}` } - }); - result.BPA[0].owners = { ...owner, owners: result?.BPA?.[0]?.landInfo?.owners, ownershipCategory: ownershipCategory }; - result.BPA[0].address = result?.BPA?.[0]?.landInfo?.address; - result.BPA[0].address.city = formData.address.city; - result.BPA[0].address.locality = formData.address.locality; - result.BPA[0].placeName = formData?.address?.placeName; - result.BPA[0].data = formData.data; - result.BPA[0].BlockIds = getBlockIds(result.BPA[0].landInfo.unit); - result.BPA[0].subOccupancy= formData?.subOccupancy; - result.BPA[0].uiFlow = formData?.uiFlow; - setIsDisable(false); - onSelect("", result.BPA[0], "", true); - } - }) - .catch((e) => { - setIsDisable(false); - setShowToast({ key: "true", error: true, message: e?.response?.data?.Errors[0]?.message }); - }); - } - - } - else{ - Digit.OBPSService.create({ BPA: payload }, tenantId) - .then((result, err) => { - if (result?.BPA?.length > 0) { - result?.BPA?.[0]?.landInfo?.owners?.forEach(owner => { - owner.gender = { code: owner.gender, active: true, i18nKey: `COMMON_GENDER_${owner.gender}` } - }); - result.BPA[0].owners = { ...owner, owners: result?.BPA?.[0]?.landInfo?.owners, ownershipCategory: ownershipCategory }; - result.BPA[0].address = result?.BPA?.[0]?.landInfo?.address; - result.BPA[0].address.city = formData.address.city; - result.BPA[0].address.locality = formData.address.locality; - result.BPA[0].placeName = formData?.address?.placeName; - result.BPA[0].data = formData.data; - result.BPA[0].BlockIds = getBlockIds(result.BPA[0].landInfo.unit); - result.BPA[0].subOccupancy= formData?.subOccupancy; - result.BPA[0].uiFlow = formData?.uiFlow; - setIsDisable(false); - onSelect("", result.BPA[0], "", true); - } - }) - .catch((e) => { - setIsDisable(false); - setShowToast({ key: "true", error: true, message: e?.response?.data?.Errors[0]?.message }); - }); - } - } else { - onSelect(config.key, ownerStep); - } + onSelect(config.key, ownerStep); } + } }; const onSkip = () => onSelect(); @@ -542,7 +409,7 @@ const OwnerDetails = ({ t, config, onSelect, userType, formData }) => { value={field.emailId} onChange={(e) => setOwnerEmail(index, e)} {...(validation = { - isRequired: true, + //isRequired: true, pattern: "[A-Za-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$", type: "emailId", title: t("TL_EMAIL_ID_ERROR_MESSAGE"), 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 92f50732747..443ea2e0ba4 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 @@ -11,7 +11,13 @@ const PlotDetails = ({ formData, onSelect, config }) => { const tenantId = Digit.ULBService.getCurrentTenantId(); const checkingFlow = formData?.uiFlow?.flow; const state = Digit.ULBService.getStateId(); - let [isNextDisabled,setIsNextDisabled] =useState(true); + let [isNextDisabled,setIsNextDisabled] =useState(false); + useEffect(() => { + if(checkingFlow==="BPA"){ + setIsNextDisabled(true); + } + }, [checkingFlow]); + const { data, isLoading } = Digit.Hooks.obps.useScrutinyDetails(state, formData?.data?.scrutinyNumber) const handleSubmit = (data) => { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/ScrutinyDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/ScrutinyDetails.js index 04e9f98dab7..e26c97ce201 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/ScrutinyDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/ScrutinyDetails.js @@ -162,7 +162,6 @@ const ScrutinyDetails = ({ onSelect, userType, formData, config }) => { // Additonal details payload.additionalDetails = {}; 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; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/CheckPage.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/CheckPage.js index f20f03d2cdb..c07b861e184 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/CheckPage.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/CheckPage.js @@ -330,6 +330,7 @@ console.log("mdmsData",mdmsData,mdmsData?.MalbaCharges?.BPA[1].rate,plotArea) style={{ width: "100px", display: "inline" }} onClick={() => routeTo(`${routeLink}/noc-details`)} /> + {nocDocuments && nocDocuments?.NocDetails.map((noc, index) => (
1 ?{ marginTop: "19px", background: "#FAFAFA", border: "1px solid #D6D5D4", borderRadius: "4px", padding: "8px", lineHeight: "19px", maxWidth: "960px", minWidth: "280px" } : {}}> {`${t(`BPA_${noc?.nocType}_HEADER`)}`} 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 1f691dc093b..935905fecee 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 @@ -116,7 +116,7 @@ export const newConfig1=[ { "route": "owner-details", "component": "OwnerDetails", - "nextStep": "document-details", + "nextStep": "noc-number", "key": "owners", "texts": { "headerCaption": "BPA_OWNER_AND_DOCUMENT_DETAILS_LABEL", @@ -124,6 +124,26 @@ export const newConfig1=[ "submitBarLabel": "CS_COMMON_NEXT" } }, + { + "route": "noc-number", + "component": "NOCNumber", + "nextStep": "document-details", + "key": "nocnumber", + "texts": { + "headerCaption": "BPA_NOC_NUMBER_DETAILS", + "header": "", + "submitBarLabel": "CS_COMMON_NEXT" + }, + "inputs": [ + { + "label": "BPA_NOC_NUMBER", + "type": "text", + "validation": {}, + "name": "nocNumber" + } + ] + + }, { "route": "document-details", "component": "DocumentDetails", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/OCBuildingPermit/CheckPage.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/OCBuildingPermit/CheckPage.js index 605b6bd526b..d18972130ba 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/OCBuildingPermit/CheckPage.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/OCBuildingPermit/CheckPage.js @@ -204,7 +204,6 @@ const CheckPage = ({ onSubmit, value }) => { - diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/OCSendBackToCitizen/CheckPage.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/OCSendBackToCitizen/CheckPage.js index 53df7823536..88d72582b90 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/OCSendBackToCitizen/CheckPage.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/OCSendBackToCitizen/CheckPage.js @@ -239,7 +239,6 @@ const CheckPage = ({ onSubmit, value }) => { - diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/OCSendToArchitect/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/OCSendToArchitect/index.js index f57f730a1e0..8c6cd0fbb62 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/OCSendToArchitect/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/OCSendToArchitect/index.js @@ -49,7 +49,6 @@ const getBPAEditDetails = async (data, APIScrutinyDetails,mdmsData,nocdata,t,OCD applicationDate: data?.auditDetails?.createdTime, applicationType: APIScrutinyDetails?.appliactionType, holdingNumber: data?.additionalDetails?.holdingNo, - boundaryWallLength: data?.additionalDetails?.boundaryWallLength, bpaData:OCData, occupancyType: APIScrutinyDetails?.planDetail?.planInformation?.occupancy, registrationDetails: data?.additionalDetails?.registrationDetails,