From dc36e912a3c0e556e070b4d1ac7f5473a335c3bf Mon Sep 17 00:00:00 2001 From: Shivankshuklaa Date: Tue, 20 Aug 2024 13:02:54 +0530 Subject: [PATCH] Additional Colony Details added Employee side as well as core area value corrected --- .../libraries/src/services/elements/OBPS.js | 44 +++++++++++++++++-- .../modules/obps/getBPAAcknowledgement.js | 4 +- .../citizen/NewBuildingPermit/CheckPage.js | 10 ++--- .../citizen/OCBuildingPermit/CheckPage.js | 1 - 4 files changed, 47 insertions(+), 12 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/OBPS.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/OBPS.js index 1e3d14613b4..07d9f330cf1 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/OBPS.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/OBPS.js @@ -299,6 +299,7 @@ export const OBPSService = { }) }); + let fileDetails = {}; if (appDocumentFileStoreIds?.length > 0) { fileDetails = await UploadServices.Filefetch(appDocumentFileStoreIds, Digit.ULBService.getStateId()); @@ -535,12 +536,47 @@ export const OBPSService = { { title: "BPA_BOUNDARY_PLOT_AREA_LABEL", value: `${edcr?.planDetail?.planInformation?.plotArea}`, isNotTranslated: true, isUnit: "BPA_SQ_MTRS_LABEL" }, { title: "BPA_PLOT_NUMBER_LABEL", value: edcr?.planDetail?.planInformation?.plotNo || "NA", isNotTranslated: true }, { title: "BPA_KHATHA_NUMBER_LABEL", value: edcr?.planDetail?.planInformation?.khataNo || "NA", isNotTranslated: true }, - { title: "BPA_HOLDING_NUMBER_LABEL", value: BPA?.additionalDetails?.holdingNo || "NA", isNotTranslated: true }, { title: "BPA_BOUNDARY_LAND_REG_DETAIL_LABEL", value: BPA?.additionalDetails?.registrationDetails || "NA", isNotTranslated: true }, - { title: "BPA_BOUNDARY_WALL_LENGTH_LABEL", value: BPA?.additionalDetails?.boundaryWallLength || "NA", isNotTranslated: true } + { title: "BPA_BOUNDARY_WALL_LENGTH_LABEL", value: BPA?.additionalDetails?.boundaryWallLength || "NA", isNotTranslated: true }, + { title: "BPA_KHASRA_NUMBER_LABEL", value: BPA?.additionalDetails?.khasraNumber || "NA", isNotTranslated: true }, + { title: "BPA_WARD_NUMBER_LABEL", value: BPA?.additionalDetails?.wardnumber || "NA", isNotTranslated: true } + ] + }; + + const additionalPlotDetails = { + title: "BPA_ADDITIONAL_BUILDING_DETAILS", + asSectionHeader: true, + isCommon: true, + values: [ + { title: "BPA_APPROVED_COLONY_LABEL", value: BPA?.additionalDetails?.approvedColony, isNotTranslated: true }, + { title: "BPA_ULB_TYPE_LABEL", value: BPA?.additionalDetails?.Ulblisttype || "NA", isNotTranslated: true }, + { title: "BPA_ULB_NAME_LABEL", value: BPA?.additionalDetails?.UlbName || "NA", isNotTranslated: true }, + { title: "BPA_DISTRICT_LABEL", value: BPA?.additionalDetails?.District || "NA", isNotTranslated: true }, + { title: "BPA_BUILDING_STATUS_LABEL", value: BPA?.additionalDetails?.buildingStatus || "NA", isNotTranslated: true }, + { title: "BPA_CORE_AREA_LABEL", value: edcr?.planDetail?.coreArea || "NA", isNotTranslated: true }, + { title: "BPA_PROPOSED_SITE_LABEL", value: BPA?.additionalDetails?.proposedSite, isNotTranslated: true}, + { title: "BPA_SCHEME_TYPE_LABEL", value: BPA?.additionalDetails?.schemesselection || "NA", isNotTranslated: true }, + { title: "BPA_SCHEME_NAME_LABEL", value: BPA?.additionalDetails?.schemeName || "NA", isNotTranslated: true }, + { title: "BPA_TRANFERRED_SCHEME_LABEL", value: BPA?.additionalDetails?.transferredscheme || "NA", isNotTranslated: true }, + { title: "BPA_PURCHASED_FAR_LABEL", value: BPA?.additionalDetails?.purchasedFAR || "NA", isNotTranslated: true }, + { title: "BPA_MASTER_PLAN_LABEL", value: BPA?.additionalDetails?.masterPlan || "NA", isNotTranslated: true }, + { title: "BPA_GREEN_BUILDING_LABEL", value: BPA?.additionalDetails?.greenbuilding || "NA", isNotTranslated: true } ] }; + const architectDetails = { + title: "BPA_ARCHITECT_DETAILS", + asSectionHeader: true, + isCommon: true, + values: [ + { title: "BPA_ARCHITECT_NAME", value: BPA?.additionalDetails?.architectName, isNotTranslated: true }, + { title: "BPA_ARCHITECT_MOBILE_NUMBER", value: BPA?.additionalDetails?.architectMobileNumber || "NA", isNotTranslated: true }, + { title: "BPA_ARCHITECT_ID", value: BPA?.additionalDetails?.architectid || "NA", isNotTranslated: true }, + { title: "BPA_ARCHITECT_TYPE", value: BPA?.additionalDetails?.typeOfArchitect || "NA", isNotTranslated: true }, + + ] + } + const scrutinyDetails = { title: "BPA_STEPPER_SCRUTINY_DETAILS_HEADER", isScrutinyDetails: true, @@ -721,9 +757,9 @@ export const OBPSService = { } if(BPA?.businessService !== "BPA_OC") { - details = [...details, applicationDetailsInfo, basicDetails, plotDetails, scrutinyDetails, buildingExtractionDetails, subOccupancyTableDetails, demolitionAreaDetails,addressDetails, ownerDetails, documentDetails, fiReports, ...nocDetails, approvalChecksDetails, PermitConditions] + details = [...details, applicationDetailsInfo, basicDetails, plotDetails,additionalPlotDetails, architectDetails, scrutinyDetails, buildingExtractionDetails, subOccupancyTableDetails, demolitionAreaDetails,addressDetails, ownerDetails, documentDetails, fiReports, ...nocDetails, approvalChecksDetails, PermitConditions] } else { - details = [...details, applicationDetailsInfo, basicDetails, plotDetails, scrutinyDetails, buildingExtractionDetails, subOccupancyTableDetails, demolitionAreaDetails, documentDetails, fiReports, ...nocDetails, PermitConditions] + details = [...details, applicationDetailsInfo, basicDetails, plotDetails, additionalPlotDetails, architectDetails, scrutinyDetails, buildingExtractionDetails, subOccupancyTableDetails, demolitionAreaDetails, documentDetails, fiReports, ...nocDetails, PermitConditions] } if (billDetails?.additionalDetails?.values?.length) { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/getBPAAcknowledgement.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/getBPAAcknowledgement.js index 9cb1d31b1ef..058915da861 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/getBPAAcknowledgement.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/getBPAAcknowledgement.js @@ -46,7 +46,7 @@ const getMohallaLocale = (value = "", tenantId = "") => { const getBPAAcknowledgement=async(application,tenantInfo,t)=>{ const user = Digit.UserService.getUser(); - + console.log("application",application); const owner=application?.landInfo?.owners return{ t: t, @@ -261,7 +261,7 @@ const getMohallaLocale = (value = "", tenantId = "") => { }, { title: t("BPA_CORE_AREA"), - value: application?.additionalDetails?.coreArea || "NA" + value: application?.data?.edcrDetails?.planDetail?.coreArea || "NA" }, ] }, 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 031fd697e45..2256265193f 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 @@ -48,7 +48,6 @@ import { const { data, address, owners, nocDocuments, documents, additionalDetails, subOccupancy,PrevStateDocuments,PrevStateNocDocuments,applicationNo } = value; const isEditApplication = window.location.href.includes("editApplication"); - const [agree, setAgree] = useState(false); const setdeclarationhandler = () => { setAgree(!agree); @@ -251,6 +250,8 @@ setWaterCharges(Malbafees/2) const { data:datafromAPI, isLoading, refetch } = Digit.Hooks.obps.useScrutinyDetails(tenantId,value?.data?.scrutinyNumber, { enabled: value?.data?.scrutinyNumber?true:false, }) + + let consumerCode=value?.applicationNo; const fetchBillParams = { consumerCode }; @@ -455,7 +456,6 @@ function selectfile(e) { - @@ -563,14 +563,14 @@ function selectfile(e) { {t("BPA_ADDITIONAL_BUILDING_DETAILS")} - + - + - + 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 660c9c069de..abfd79e5f0b 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 @@ -202,7 +202,6 @@ const CheckPage = ({ onSubmit, value }) => { -