Skip to content

Commit

Permalink
Merge pull request #1270 from ShivankShuklaa/Dev-2.0
Browse files Browse the repository at this point in the history 
Additional Colony Details added Employee side as well as core area value corrected
  • Loading branch information
@deepikaarora88
deepikaarora88 authored Aug 20, 2024
2 parents bded383 + 3825b2c commit 40837c8
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 12 deletions.
44 changes: 40 additions & 4 deletions frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/OBPS.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ export const OBPSService = {
})
});


let fileDetails = {};
if (appDocumentFileStoreIds?.length > 0) {
fileDetails = await UploadServices.Filefetch(appDocumentFileStoreIds, Digit.ULBService.getStateId());
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/getBPAAcknowledgement.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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"
},
]
},
Expand Down
10 changes: 5 additions & 5 deletions ...micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/CheckPage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 };

Expand Down Expand Up @@ -455,7 +456,6 @@ function selectfile(e) {
<Row className="border-none" textStyle={{paddingLeft:"12px"}} label={t(`BPA_BOUNDARY_PLOT_AREA_LABEL`)} text={datafromAPI?.planDetail?.planInformation?.plotArea ? `${datafromAPI?.planDetail?.planInformation?.plotArea} ${t(`BPA_SQ_MTRS_LABEL`)}` : t("CS_NA")} />
<Row className="border-none" label={t(`BPA_PLOT_NUMBER_LABEL`)} text={datafromAPI?.planDetail?.planInformation?.plotNo || t("CS_NA")} />
<Row className="border-none" label={t(`BPA_KHATHA_NUMBER_LABEL`)} text={datafromAPI?.planDetail?.planInformation?.khataNo || t("CS_NA")}/>
<Row className="border-none" label={t(`BPA_HOLDING_NUMBER_LABEL`)} text={data?.holdingNumber || t("CS_NA")} />
<Row className="border-none" label={t(`BPA_BOUNDARY_LAND_REG_DETAIL_LABEL`)} text={data?.registrationDetails || t("CS_NA")} />
<Row className="border-none" label={t(`BPA_BOUNDARY_WALL_LENGTH_LABEL`)} text={data?.boundaryWallLength|| t("CS_NA")} />
<Row className="border-none" label={t(`BPA_KHASRA_NUMBER_LABEL`)} text={data?.khasraNumber|| value?.additionalDetails?.khasraNumber|| t("CS_NA")} />
Expand Down Expand Up @@ -563,14 +563,14 @@ function selectfile(e) {
<Card style={{paddingRight:"16px"}}>
<StatusTable>
<CardHeader>{t("BPA_ADDITIONAL_BUILDING_DETAILS")}</CardHeader>
<Row className="border-none" label={t(`BPA_APPROVED_COLONY_LABEL`)} text={owners?.approvedColony?.value || value?.additionalDetails?.approvedColony || t("CS_NA")} />
<Row className="border-none" label={t(`BPA_APPROVED_COLONY_LABEL`)} text={owners?.approvedColony?.i18nKey || value?.additionalDetails?.approvedColony || t("CS_NA")} />
<Row className="border-none" label={t(`BPA_ULB_TYPE_LABEL`)} text={owners?.Ulblisttype?.value || value?.additionalDetails?.Ulblisttype || t("CS_NA")} />
<Row className="border-none" label={t(`BPA_ULB_NAME_LABEL`)} text={owners?.UlbName?.code || value?.additionalDetails?.UlbName || t("CS_NA")} />
<Row className="border-none" label={t(`BPA_DISTRICT_LABEL`)} text={owners?.District?.code || value?.additionalDetails?.District || t("CS_NA")} />
<Row className="border-none" label={t(`BPA_BUILDING_STATUS_LABEL`)} text={owners?.buildingStatus?.code || value?.additionalDetails?.buildingStatus || t("CS_NA")} />
<Row className="border-none" label={t(`BPA_CORE_AREA_LABEL`)} text={owners?.coreArea?.code || value?.additionalDetails?.coreArea || t("CS_NA")} />
<Row className="border-none" label={t(`BPA_CORE_AREA_LABEL`)} text={datafromAPI?.planDetail?.coreArea || value?.additionalDetails?.coreArea || t("CS_NA")} />
<Row className="border-none" label={t(`BPA_PROPOSED_SITE_LABEL`)} text={owners?.proposedSite?.code || value?.additionalDetails?.proposedSite || t("CS_NA")} />
<Row className="border-none" label={t(`BPA_SCHEME_TYPE_LABEL`)} text={owners?.schemesselection?.code || value?.additionalDetails?.schemesselection || t("CS_NA")} />
<Row className="border-none" label={t(`BPA_SCHEME_TYPE_LABEL`)} text={owners?.schemesselection?.value || value?.additionalDetails?.schemesselection || t("CS_NA")} />
<Row className="border-none" label={t(`BPA_SCHEME_NAME_LABEL`)} text={owners?.schemeName || value?.additionalDetails?.schemeName || t("CS_NA")} />
<Row className="border-none" label={t(`BPA_TRANFERRED_SCHEME_LABEL`)} text={owners?.transferredscheme || value?.additionalDetails?.transferredscheme || t("CS_NA")} />
<Row className="border-none" label={t(`BPA_PURCHASED_FAR_LABEL`)} text={owners?.purchasedFAR?.code || value?.additionalDetails?.purchasedFAR || t("CS_NA")} />
Expand Down
1 change: 0 additions & 1 deletion .../micro-ui-internals/packages/modules/obps/src/pages/citizen/OCBuildingPermit/CheckPage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@ const CheckPage = ({ onSubmit, value }) => {
<Row className="border-none" label={`${t(`BPA_BOUNDARY_PLOT_AREA_LABEL`)}`} text={datafromAPI?.planDetail?.planInformation?.plotArea ? `${datafromAPI?.planDetail?.planInformation?.plotArea} ${t(`BPA_SQ_MTRS_LABEL`)}` : t("CS_NA")} textStyle={{paddingLeft:"12px"}}/>
<Row className="border-none" label={`${t(`BPA_PLOT_NUMBER_LABEL`)}`} text={datafromAPI?.planDetail?.planInformation?.plotNo || t("CS_NA")} />
<Row className="border-none" label={`${t(`BPA_KHATHA_NUMBER_LABEL`)}`} text={datafromAPI?.planDetail?.planInformation?.khataNo || t("CS_NA")} />
<Row className="border-none" label={`${t(`BPA_HOLDING_NUMBER_LABEL`)}`} text={data?.holdingNumber || t("CS_NA")} />
<Row className="border-none" label={`${t(`BPA_BOUNDARY_LAND_REG_DETAIL_LABEL`)}`} text={data?.registrationDetails || t("CS_NA")} />
</StatusTable>
</Card>
Expand Down

0 comments on commit 40837c8

Please sign in to comment.